Author: jsdelfino Date: Mon May 2 05:58:26 2011 New Revision: 1098489 URL: http://svn.apache.org/viewvc?rev=1098489&view=rev Log: Simplify HTML and Javascript to improve UI and performance on iOS devices. Fix offline cache manifest. Add an app clone page. Added: tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/ tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/create/ tuscany/sca-cpp/trunk/modules/edit/htdocs/create/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/menu.js tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.png tuscany/sca-cpp/trunk/modules/edit/htdocs/public/delete.xcf tuscany/sca-cpp/trunk/modules/edit/htdocs/stats/ tuscany/sca-cpp/trunk/modules/edit/htdocs/stats/index.html tuscany/sca-cpp/trunk/modules/js/htdocs/all-min.js tuscany/sca-cpp/trunk/modules/js/htdocs/ui-min.css Removed: tuscany/sca-cpp/trunk/modules/edit/htdocs/dash/ tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html tuscany/sca-cpp/trunk/modules/edit/htdocs/main.html tuscany/sca-cpp/trunk/modules/edit/htdocs/menu.html tuscany/sca-cpp/trunk/modules/edit/htdocs/page/page.html tuscany/sca-cpp/trunk/modules/edit/htdocs/props/ tuscany/sca-cpp/trunk/modules/edit/htdocs/store/store.html Modified: tuscany/sca-cpp/trunk/.gitignore tuscany/sca-cpp/trunk/modules/edit/Makefile.am tuscany/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf tuscany/sca-cpp/trunk/modules/edit/htdocs/app/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf tuscany/sca-cpp/trunk/modules/edit/htdocs/data/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/login/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/logout/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/page/index.html tuscany/sca-cpp/trunk/modules/edit/htdocs/page/page.js tuscany/sca-cpp/trunk/modules/edit/htdocs/public/iframe.html tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notauth.html tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notfound.html tuscany/sca-cpp/trunk/modules/edit/htdocs/public/notyet.html tuscany/sca-cpp/trunk/modules/edit/htdocs/public/oops.html tuscany/sca-cpp/trunk/modules/edit/htdocs/store/index.html tuscany/sca-cpp/trunk/modules/edit/mkapplinks tuscany/sca-cpp/trunk/modules/edit/ssl-start tuscany/sca-cpp/trunk/modules/edit/start tuscany/sca-cpp/trunk/modules/js/Makefile.am tuscany/sca-cpp/trunk/modules/js/htdocs/ui.css tuscany/sca-cpp/trunk/modules/js/htdocs/ui.js tuscany/sca-cpp/trunk/modules/js/htdocs/uicyan.css tuscany/sca-cpp/trunk/modules/server/server-conf Modified: tuscany/sca-cpp/trunk/.gitignore URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/.gitignore?rev=1098489&r1=1098488&r2=1098489&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/.gitignore (original) +++ tuscany/sca-cpp/trunk/.gitignore Mon May 2 05:58:26 2011 @@ -56,6 +56,7 @@ config.guess config.sub config.status config.js +all.js depcomp install-sh ltmain.sh @@ -85,6 +86,8 @@ doxygen *.stamp *.jar *.prefix +*.crt +*.patch index.yaml core gen-cpp/ @@ -133,7 +136,6 @@ json-value value-json element-value value-element -modules/edit/apps/*/htdocs modules/edit/apps/*/nuvem modules/edit/apps/*/lib chat-send Modified: tuscany/sca-cpp/trunk/modules/edit/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/Makefile.am?rev=1098489&r1=1098488&r2=1098489&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/edit/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/edit/Makefile.am Mon May 2 05:58:26 2011 @@ -20,7 +20,7 @@ if WANT_PYTHON moddir = $(prefix)/modules/edit dist_mod_SCRIPTS = start stop ssl-start mkapplinks -nobase_dist_mod_DATA = edit.composite *.py htdocs/*.html htdocs/dash/*.html htdocs/data/*.html htdocs/app/*.html htdocs/store/*.html htdocs/props/*.html htdocs/graph/*.html htdocs/graph/*.js htdocs/page/*.html htdocs/page/*.js htdocs/login/*.html htdocs/logout/*.html palettes/*/palette.composite apps/*/app.composite apps/*/app.html dashboards/* store/* -EXTRA_DIST = edit.composite *.py htdocs/*.html htdocs/dash/*.html htdocs/data/*.html htdocs/app/*.html htdocs/store/*.html htdocs/props/*.html htdocs/graph/*.html htdocs/graph/*.js htdocs/page/*.html htdocs/page/*.js htdocs/login/*.html htdocs/logout/*.html palettes/*/palette.composite apps/*/app.composite apps/*/app.html dashboards/* store/* +nobase_dist_mod_DATA = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/create/*.html htdocs/data/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/graph/*.js htdocs/page/*.html htdocs/page/*.js htdocs/login/*.html htdocs/logout/*.html palettes/*/palette.composite apps/*/app.composite apps/*/htdocs/app.html dashboards/* store/* +EXTRA_DIST = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/create/*.html htdocs/data/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/graph/*.js htdocs/page/*.html htdocs/page/*.js htdocs/login/*.html htdocs/logout/*.html palettes/*/palette.composite apps/*/app.composite apps/*/htdocs/app.html dashboards/* store/* endif Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf?rev=1098489&r1=1098488&r2=1098489&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf (original) +++ tuscany/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf Mon May 2 05:58:26 2011 @@ -1,26 +1,16 @@ -CACHE-MANIFEST +CACHE MANIFEST # Common resources -atomutil.js -component.js -elemutil.js -jsconfig.js -jsonutil.js -scdl.js -ui.css -ui.js -util.js -xmlutil.js +all-min.js +config.js +ui-min.css # App resources app.html data/index.html -index.html favicon.ico -login/index.html -logout/index.html +index.html public/app.png -public/grid72.png public/iframe.html public/img.png public/notauth.html @@ -30,3 +20,6 @@ public/oops.html public/touchicon.png robots.txt +NETWORK: +* + Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/app/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/app/index.html?rev=1098489&r1=1098488&r2=1098489&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/edit/htdocs/app/index.html (original) +++ tuscany/sca-cpp/trunk/modules/edit/htdocs/app/index.html Mon May 2 05:58:26 2011 @@ -1,3 +1,4 @@ + - + App @@ -26,20 +27,13 @@ document.title = window.location.hostname.split('.')[0]; - + - - - - - - - - + - + -
+
@@ -51,11 +45,11 @@ document.title = window.location.hostnam if (ui.isIE()) $('bodydiv').style.right = -20; /** - * Page, every and location components. + * Start, stop, timer and geolocation components. */ -var appstartcomp = sca.httpclient('appstart', '/appstart'); -var appstopcomp = sca.httpclient('appstop', '/appstop'); -var everycomp = sca.httpclient('every', '/every'); +var startcomp = sca.httpclient('start', '/start'); +var stopcomp = sca.httpclient('stop', '/stop'); +var timercomp = sca.httpclient('timer', '/timer'); var geolocationcomp = sca.httpclient('geolocation', '/geolocation'); /** @@ -255,11 +249,13 @@ function fixupwidget(e) { } if (e.className == 'list') { car(childElements(e)).innerHTML = ''; + e.style.width = '100%'; car(childElements(e)).style.width = '100%'; return e; } if (e.className == 'table') { car(childElements(e)).innerHTML = ''; + e.style.width = '100%'; car(childElements(e)).style.width = '100%'; return e; } @@ -300,26 +296,24 @@ function getpagedata() { } // Get the component app data - var doc = appstartcomp.get(window.location.search, function(doc) { - try { - $('app').innerHTML = $('appFrame').contentDocument.body.innerHTML; - - // Initial setup of the widgets - map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID($('app'), 'page').childNodes))); - - // Display data on the page - displaypage(doc); - - // Get and eval the optional timer and location watch setup scripts - everycomp.get('setup', evalcompinit); - geolocationcomp.get('setup', evalcompinit); - return true; + var doc = startcomp.get(window.location.search); + try { + $('app').innerHTML = $('appFrame').contentDocument.body.innerHTML; + + // Initial setup of the widgets + map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID($('app'), 'page').childNodes))); - } catch(e) { - log('exception on appstartcomp.get()', e); - } - }); + // Display data on the page + displaypage(doc); + // Get and eval the optional timer and location watch setup scripts + evalcompinit(timercomp.get('setup')); + evalcompinit(geolocationcomp.get('setup')); + return true; + + } catch(e) { + log('exception on startcomp.get()', e); + } } catch(e) { log('exception in getpagedata()', e); } @@ -330,10 +324,7 @@ function getpagedata() { * Get app data from a component. */ function getcompdata(comp, qs) { - var doc = comp.get(qs, function(doc) { - return displaydoc(doc); - }); - return true; + return displaydoc(comp.get(qs)); } /** @@ -377,7 +368,7 @@ function buttonClickHandler(id) { */ function intervalHandler() { try { - return getcompdata(everycomp, compquery()); + return getcompdata(timercomp, compquery()); } catch(e) { log('exception in intervalHandler()', e); } Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf?rev=1098489&r1=1098488&r2=1098489&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf (original) +++ tuscany/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf Mon May 2 05:58:26 2011 @@ -1,37 +1,24 @@ -CACHE-MANIFEST +CACHE MANIFEST # Common resources -atomutil.js -component.js -elemutil.js -jsconfig.js -jsonutil.js -scdl.js -ui.css -ui.js -util.js -xmlutil.js +all-min.js +config.js +ui-min.css # App resources app/index.html -dash/dashboard.html -dash/index.html +clone/index.html +data/index.html +create/index.html data/index.html favicon.ico -graph/graph.html graph/graph.js graph/index.html home.png index.html -login/index.html -logout/index.html -main.html -menu.html +menu.js page/index.html -page/page.html page/page.js -props/index.html -props/props.html public/app.png public/grid72.png public/iframe.html @@ -42,6 +29,9 @@ public/notyet.html public/oops.html public/touchicon.png robots.txt +stats/index.html store/index.html -store/store.html + +NETWORK: +* Added: tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/index.html?rev=1098489&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/index.html (added) +++ tuscany/sca-cpp/trunk/modules/edit/htdocs/clone/index.html Mon May 2 05:58:26 2011 @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + +
+ + + + + + + +

+ + + + + +
Clone this App
+ +
+ + + + + + + + + + + + +
New App Name:
 
App Icon:
Sharing:
Shared
App Title:
Description:
+ + +
+
+ +
+ + + + + + Added: tuscany/sca-cpp/trunk/modules/edit/htdocs/create/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/create/index.html?rev=1098489&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/modules/edit/htdocs/create/index.html (added) +++ tuscany/sca-cpp/trunk/modules/edit/htdocs/create/index.html Mon May 2 05:58:26 2011 @@ -0,0 +1,112 @@ + + + + +Create App + + + + + + + + + + +
+ + + + + +

+ + + + + +
Create an App
+ +
+ + + + + + + + + + + + +
App Name:
 
App Icon:
Sharing:
Shared
App Title:
Description:
+ + +
+
+ +
+ + + + + + Modified: tuscany/sca-cpp/trunk/modules/edit/htdocs/data/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/htdocs/data/index.html?rev=1098489&r1=1098488&r2=1098489&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/edit/htdocs/data/index.html (original) +++ tuscany/sca-cpp/trunk/modules/edit/htdocs/data/index.html Mon May 2 05:58:26 2011 @@ -1,3 +1,4 @@ +