diff options
Diffstat (limited to 'sca-cpp/trunk/modules/edit/htdocs')
20 files changed, 225 insertions, 164 deletions
diff --git a/sca-cpp/trunk/modules/edit/htdocs/account/index.html b/sca-cpp/trunk/modules/edit/htdocs/account/index.html index 8f23b8c59c..d83ca4562b 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/account/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/account/index.html @@ -25,13 +25,16 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> @@ -47,7 +50,7 @@ </tr> </table> -<form id="userForm" style="position: absolute; top: 90px; left: 0px; width: 100%"> +<form id="userForm"> <table style="width: 100%;"> <tr><tr><td><b>Photo:</b></td></tr> <tr><td><img src="/public/app.png" style="width: 50px; height: 50px; vertical-align: top;"></td></tr> @@ -93,8 +96,6 @@ </table> </form> -</div> - <script type="text/javascript"> // Init service references var editWidget = sca.component("EditWidget"); @@ -111,9 +112,6 @@ $('userNameHeader').innerHTML = username; // Load the menu bar displaymenu(); -// Show the page -ui.showbody(); - /** * The current account entry and corresponding saved XML content. */ @@ -219,9 +217,13 @@ $('userForm').onsubmit = function() { // Get the user's account getaccount(username); - </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off b/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off index bd44d87aa1..58371aa6b5 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off +++ b/sca-cpp/trunk/modules/edit/htdocs/app/cache-manifest.cmf.off @@ -2,7 +2,6 @@ CACHE MANIFEST # Common resources /all-min.js -/config.js /ui-min.css # App resources @@ -10,6 +9,9 @@ CACHE MANIFEST /app.html /data/index.html /favicon.ico +/footconfig.js +/frame.html +/headconfig.js /public/app.png /public/iframe.html /public/img.png diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/frame.html b/sca-cpp/trunk/modules/edit/htdocs/app/frame.html new file mode 100644 index 0000000000..7e313d2138 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/htdocs/app/frame.html @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<html> +<head> +<title></title> +<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> +<meta name="apple-mobile-web-app-capable" content="yes"/> +<meta name="apple-mobile-web-app-status-bar-style" content="black"/> +<link rel="stylesheet" type="text/css" href="/ui-min.css"/> +</head> +<body> +</body> +</html> + diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/index.html b/sca-cpp/trunk/modules/edit/htdocs/app/index.html index 570d1e00f1..8d0a3f7153 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/app/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/app/index.html @@ -19,7 +19,7 @@ --> <html> <head> -<title>App</title> +<title></title> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black"/> @@ -28,26 +28,29 @@ document.title = window.location.hostname.split('.')[0]; </script> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> - +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> -<div id="app"></div> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> -<span id="appbuffer"></span> -<span id="appebuffer"></span> +<div id="app"> +<iframe id="appframe" style="position: relative; height: 5000px; width: 100%;" scrolling="no" frameborder="0" src="/frame.html"></iframe> +</div> +<div id="appbuffer" style="visibility: hidden"> </div> <script type="text/javascript"> - /** * The main app div. */ var appdiv = $('app'); +var appframe = $('appframe'); +var appbody; /** * Start, stop, timer, animation and location components. @@ -214,7 +217,7 @@ function updatepage(l) { return e; } - map(updatewidget, filter(function(e) { return !isNil(e.id) && e.id.substring(0, 5) != 'page:'; }, nodeList(ui.elementByID(appdiv, 'page').childNodes))); + map(updatewidget, filter(function(e) { return !isNil(e.id) && e.id.substring(0, 5) != 'page:'; }, nodeList(ui.elementByID(appbody, 'page').childNodes))); return true; } @@ -317,9 +320,6 @@ function getpagedata() { // Display component data on the page function displaypage(doc) { updatepage(docdata(doc)); - - // Reveal the page - ui.showbody(); return true; } @@ -345,17 +345,13 @@ function getpagedata() { var doc = getdoc(startcomp, 'start', window.location.search); // Prepare app HTML page - var appFrame = $('appFrame'); - if (!isNil(appFrame.contentDocument.body)) { - appdiv.innerHTML = appFrame.contentDocument.body.innerHTML; - } else { - $('appebuffer').appendChild(appFrame.contentDocument.documentElement); - appdiv.innerHTML = appebuffer.innerHTML; - appebuffer.innerHTML = ''; - } + appbody = appframe.contentDocument.body; + var appbufferbody = $('appbufferframe').contentDocument.body; + appbody.innerHTML = appbufferbody.innerHTML; + appbufferbody.innerHTML = ''; // Setup the widgets - map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID(appdiv, 'page').childNodes))); + map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID(appbody, 'page').childNodes))); // Display data on the page displaypage(doc); @@ -385,7 +381,7 @@ function compquery() { return append(nodeList(n.childNodes), reduce(append, mklist(), map(childrenList, nodeList(n.childNodes)))); } - var args = map(queryarg, filter(function(e) { return !isNil(e.id) && !isNil(inputvalue(e)); }, childrenList(ui.elementByID(appdiv, 'page')))); + var args = map(queryarg, filter(function(e) { return !isNil(e.id) && !isNil(inputvalue(e)); }, childrenList(ui.elementByID(appbody, 'page')))); // Append current location properties if known if (!isNil(geoposition)) { @@ -550,9 +546,14 @@ function setupLocationHandler() { } // Load the app frame -$('appbuffer').innerHTML = '<iframe id="appFrame" class="widgetframe" src="app.html" onload="getpagedata()"></iframe>'; - +$('appbuffer').innerHTML = '<iframe id="appbufferframe" style="position: relative; height: 5000px; width: 100%;" scrolling="no" frameborder="0" src="app.html" onload="getpagedata()"></iframe>'; </script> + +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf b/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf index 3f331a4e5d..8e6e666844 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf +++ b/sca-cpp/trunk/modules/edit/htdocs/cache-manifest.cmf @@ -1,8 +1,9 @@ CACHE MANIFEST +# Version 2 + # Common resources /all-min.js -/config.js /ui-min.css # App resources @@ -12,10 +13,11 @@ CACHE MANIFEST /clone/ /data/ /create/ -/data/ /favicon.ico +/footconfig.js /graph/graph.js /graph/ +/headconfig.js /home.png /menu.js /page/ diff --git a/sca-cpp/trunk/modules/edit/htdocs/clone/index.html b/sca-cpp/trunk/modules/edit/htdocs/clone/index.html index 8613992806..5e3922a28e 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/clone/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/clone/index.html @@ -25,13 +25,16 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> @@ -46,7 +49,7 @@ </tr> </table> -<form id="cloneAppForm" style="position: absolute; top: 90px; left: 0px;"> +<form id="cloneAppForm"> <table style="width: 100%;"> <tr><td><b>New App Name:</b></td></tr> <tr><td><input type="text" id="appName" size="15" autocapitalize="off" placeholder="Your app name"/> <span id="appDomain"></span></td></tr> @@ -65,8 +68,6 @@ </table> </form> -</div> - <script type="text/javascript"> // Get the app name var appname = ui.queryParams()['app']; @@ -101,9 +102,6 @@ displaymenu(); // Init form $('appDomain').innerHTML = '.' + window.location.hostname; -// Show the page -ui.showbody(); - // Init service references var editWidget = sca.component("EditWidget"); var dashboards = sca.reference(editWidget, "dashboards"); @@ -159,9 +157,13 @@ $('cloneAppCancelButton').onclick = function() { // Get the current app getapp(appname); - </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/create/index.html b/sca-cpp/trunk/modules/edit/htdocs/create/index.html index 0195473ca5..8db9d04892 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/create/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/create/index.html @@ -25,13 +25,16 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> @@ -44,7 +47,7 @@ </tr> </table> -<form id="createAppForm" style="position: absolute; top: 90px; left: 0px;"> +<form id="createAppForm"> <table style="width: 100%;"> <tr><td><b>App Name:</b></td></tr> <tr><td><input type="text" id="appName" size="15" autocapitalize="off" placeholder="Your app name"/> <span id="appDomain"></span></td></tr> @@ -63,8 +66,6 @@ </table> </form> -</div> - <script type="text/javascript"> // Set page titles document.title = windowtitle(window.location.hostname) + ' - Create App'; @@ -76,9 +77,6 @@ displaymenu(); // Init form $('appDomain').innerHTML = '.' + window.location.hostname; -// Show the page -ui.showbody(); - // Init service references var editWidget = sca.component("EditWidget"); var dashboards = sca.reference(editWidget, "dashboards"); @@ -109,9 +107,13 @@ $('createAppForm').onsubmit = function() { $('createAppCancelButton').onclick = function() { return window.open('/store/', '_self'); }; - </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/data/index.html b/sca-cpp/trunk/modules/edit/htdocs/data/index.html index 6a9ee416c2..1f583adc3b 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/data/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/data/index.html @@ -29,10 +29,9 @@ document.title = 'View - ' + window.location.hostname.split('.')[0] + '/' + cn; <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" style="position: absolute; top: 0px; left: 0px; right: 0px;"> <div id="compLinkHeader" style="margin-top: 4px; margin-bottom: 4px;"></div> @@ -40,7 +39,6 @@ document.title = 'View - ' + window.location.hostname.split('.')[0] + '/' + cn; </div> <script type="text/javascript"> - // Get the component name var cname = ui.queryParams()['component']; @@ -54,8 +52,6 @@ var comp = sca.component(cname); */ function display(e) { $('datadiv').innerHTML = e; - - ui.showbody(); return true; } @@ -93,7 +89,10 @@ function getdata() { } getdata(); - </script> + +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js index 139d4600f9..9d38fe6c6d 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js +++ b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js @@ -112,16 +112,16 @@ graph.svgns='http://www.w3.org/2000/svg'; /** * Make an SVG graph. */ -graph.mkgraph = function(pos, cvalue, cadd, cdelete) { +graph.mkgraph = function(cdiv, pos, cvalue, cadd, cdelete) { // Create a div element to host the graph var div = document.createElement('div'); div.id = 'svgdiv'; div.style.position = 'absolute'; - div.style.left = ui.pixpos(pos.xpos()); - div.style.top = ui.pixpos(pos.ypos()); + div.style.left = ui.pixpos(pos.xpos() + cdiv.offsetLeft); + div.style.top = ui.pixpos(pos.ypos() + cdiv.offsetTop); div.style.overflow = 'hidden'; - document.body.appendChild(div); + cdiv.appendChild(div); // Create SVG element var svg = document.createElementNS(graph.svgns, 'svg'); diff --git a/sca-cpp/trunk/modules/edit/htdocs/graph/index.html b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html index b8370ec75a..aea21acf1e 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/graph/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html @@ -25,14 +25,17 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> <script type="text/javascript" src="graph.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> @@ -58,13 +61,12 @@ </tr> </table> -<div id="playdiv" style="position:absolute; top: 95px; left: 0px; right: 0px; height: 5000px; visibility: hidden"> +<div id="contentdiv" style="margin-top: 4px; width: 100%;"> +<div id="playdiv" style="position:relative; top: 0x; left: 0px; right: 0px; height: 5000px; visibility: hidden"> </div> - </div> <script type="text/javascript"> - // Get the app name var appname = ui.queryParams()['app']; var ispalette = false; @@ -118,9 +120,6 @@ function resizeFields() { resizeFields(); window.onresize = resizeFields; -// Show the page -ui.showbody(); - // Init componnent references var editWidget = sca.component("EditWidget"); var palettes = sca.reference(editWidget, "palettes"); @@ -143,8 +142,13 @@ var gdiv; var bg; var gvisible = true; var gcomp = null; +var cdiv = $('contentdiv'); var pdiv = $('playdiv'); +// Position play div inside the content div +pdiv.style.position = 'absolute'; +pdiv.style.top = cdiv.offsetTop + 'px'; + /** * Track the palettes. */ @@ -372,7 +376,7 @@ cplay.onclick = function() { } // Create editor graph area -g = graph.mkgraph(graph.mkpath().move(-2500,95), cvalue, cadd, cdelete); +g = graph.mkgraph(cdiv, graph.mkpath().move(-2500,0), cvalue, cadd, cdelete); gdiv = g.parentNode; bg = graph.mkgroup(graph.mkpath()); @@ -395,9 +399,13 @@ installpalette('python', pos.rmove(0, 35), g, bg, spalette, gpalettes); // Get and display the current app getapp(appname, g); - </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/index.html b/sca-cpp/trunk/modules/edit/htdocs/index.html index 612dd5868c..20ccc8f416 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/index.html @@ -25,17 +25,20 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> -<tr><td><h1><span id="h1"></span></h1></td></tr> +<tr><td><h2><span id="h1"></span></h2></td></tr> </table> <div style="margin-left: auto; margin-right: auto; text-align: center;"> @@ -52,8 +55,6 @@ </div> -</div> - <script type="text/javascript"> // Set page titles document.title = windowtitle(window.location.hostname); @@ -76,11 +77,12 @@ setInterval(function() { bgpos = 0; diagram.style.backgroundPosition = '0px ' + ui.pixpos(bgpos); }, 2000); - -// Show the page -ui.showbody(); - </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/login/index.html b/sca-cpp/trunk/modules/edit/htdocs/login/index.html index 22df9ce7ef..4c7c90cea1 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/login/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/login/index.html @@ -27,7 +27,7 @@ <link rel="stylesheet" type="text/css" href="/ui-min.css"/> <script type="text/javascript" src="/all-min.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> <h1>Sign in</h1> @@ -43,13 +43,7 @@ <input type="hidden" name="httpd_location" value="/"/> </form> -</div> - <script type="text/javascript"> - -// Show the page -ui.showbody(); - function queryParams() { qp = new Array(); qs = window.location.search.substring(1).split('&'); @@ -80,8 +74,8 @@ function submitSignin() { document.formSignin.httpd_location.value = oauthReferrer(); document.formSignin.submit(); } - </script> +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/logout/index.html b/sca-cpp/trunk/modules/edit/htdocs/logout/index.html index ee07c9bf15..1d6079354b 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/logout/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/logout/index.html @@ -27,7 +27,7 @@ <link rel="stylesheet" type="text/css" href="/ui-min.css"/> <script type="text/javascript" src="/all-min.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> <h1>Sign out</h1> @@ -36,21 +36,15 @@ <input type="submit" id="signOut" value="Sign out" class="greenbutton" style="font-weight: bold"/> </form> -</div> - <script type="text/javascript"> - -// Show the page -ui.showbody(); - function submitSignout() { var reset = 'TuscanyOpenAuth=;expires=' + new Date(1970,01,01).toGMTString() + ';domain=.' + domainname(window.location.hostname) + ';path=/;secure=TRUE'; document.cookie = reset; document.signout.submit(); return true; } - </script> +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/page/index.html b/sca-cpp/trunk/modules/edit/htdocs/page/index.html index 678491f220..0102f4edac 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/page/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/page/index.html @@ -25,14 +25,17 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> <script type="text/javascript" src="page.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> @@ -58,9 +61,10 @@ </tr> </table> -<div id="editdiv" style="position: absolute; top: 95px; left: -2500px; right: 0px; height: 5000px;"> +<div id="contentdiv" style="margin-top: 4px; width: 100%;"> +<div id="editdiv" style="visibility: visible; position: relative; top: 0px; left: -2500px; right: 0px; height: 5000px;"> -<div style="position: absolute; left: 2500px; top: 0px; right: 0px; height: 5000px; border:1px; border-style: solid; border-color: #a2bae7; background: url(/public/grid72.png);"></div> +<div style="position: relative; left: 2500px; top: 0px; right: 0px; height: 5000px; border:1px; border-style: solid; border-color: #a2bae7; background: url(/public/grid72.png);"></div> <div class="guide" style="position: absolute; left: 2500px; top: 0px; width: 320px; height: 460px;"></div> <div class="guide" style="position: absolute; left: 2500px; top: 0px; width: 480px; height: 300px;"></div> <div class="guide" style="position: absolute; left: 2500px; top: 0px; width: 768px; height: 911px;"></div> @@ -84,17 +88,15 @@ <span class="text" id="palette:text" style="position: absolute; left: 0px; top: 370px;"><span>text</span></span> <span class="iframe fakeframe" id="palette:iframe" style="position: absolute; left: 0px; top: 400px; width: 200px;"><a href="/public/iframe.html"><span class="fakeframe"><span>frame ...</span></span></a></span> <span class="img" id="palette:img" style="position: absolute; left: 0px; top: 430px;"><img src="/public/img.png"/></span> - </div> -<div id="playdiv" style="visibility: hidden; position: absolute; top: 95px; left: 0px; right: 0px; height: 5000px;"></div> - -<div id="buffer" style="visibility: hidden; position: absolute; top: 0px; left: 0px; width: 0px; height: 0px"></div> - +<div id="playdiv" style="visibility: hidden; position: absolute; top: 0px; left: 0px; right: 0px; height: 5000px;"> +</div> </div> -<script type="text/javascript"> +<div id="buffer" style="visibility: hidden; width: 0px; height: 0px"></div> +<script type="text/javascript"> // Get the app name var appname = ui.queryParams()['app']; if (isNil(appname)) @@ -124,6 +126,7 @@ displaymenu(); /** * Page editor area, widget value field, add, delete and play page buttons. */ +var cdiv = $('contentdiv'); var ediv = $('editdiv'); var evisible = true; var pdiv = $('playdiv'); @@ -132,6 +135,12 @@ var wadd = $('addWidgetButton'); var wdelete = $('deleteWidgetButton'); var pplay = $('playPageButton'); +// Position edit and play divs inside the content div +ediv.style.position = 'absolute'; +ediv.style.top = cdiv.offsetTop + 'px'; +pdiv.style.position = 'absolute'; +pdiv.style.top = cdiv.offsetTop + 'px'; + /** * Adjust fields sizes. */ @@ -144,9 +153,6 @@ function resizeFields() { resizeFields(); window.onresize = resizeFields; -// Show the page -ui.showbody(); - // Init component references var editWidget = sca.component("EditWidget"); var pages = sca.reference(editWidget, "pages"); @@ -364,7 +370,7 @@ function playpage() { ediv.style.visibility = 'hidden' evisible = false; pdiv.style.visibility = 'visible'; - pdiv.innerHTML = '<iframe id="appFrame" style="position: relative; height: 5000px; width: 100%; border: 0px;" scrolling="no" frameborder="0" src="' + + pdiv.innerHTML = '<iframe id="playappframe" style="position: relative; height: 5000px; width: 100%; border: 0px;" scrolling="no" frameborder="0" src="' + applink(appname) + '"></iframe>'; return true; } @@ -399,8 +405,13 @@ page.edit(ediv, wvalue, wadd, wdelete, onpagechange, onwidgetselect); // Get and display the current app page getpage(appname, ediv); - </script> + +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/public/notauth.html b/sca-cpp/trunk/modules/edit/htdocs/public/notauth.html index c4db51cfd3..f6daa1b8be 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/public/notauth.html +++ b/sca-cpp/trunk/modules/edit/htdocs/public/notauth.html @@ -24,26 +24,26 @@ <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> <tr><td><h1><span id="h1"></span></h1></td></tr> </table> -<br/> <div style="margin-left: auto; margin-right: auto; text-align: center;"> <div class="hd2">Sorry, you're not authorized to view this page.</div> </div> -</div> - <form name="signout" action="/public/notauth.html" method="GET"> </form> @@ -55,9 +55,6 @@ $('h1').innerHTML = hometitle(window.location.hostname); if (!issubdomain(window.location.hostname)) displaymenu(); -// Show the page -ui.showbody(); - // Sign out if (window.top.location.pathname != '/public/notauth.html') { function submitSignout() { @@ -71,5 +68,10 @@ if (window.top.location.pathname != '/public/notauth.html') { } </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/public/notfound.html b/sca-cpp/trunk/modules/edit/htdocs/public/notfound.html index 9721804eb2..ce9fd94e6e 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/public/notfound.html +++ b/sca-cpp/trunk/modules/edit/htdocs/public/notfound.html @@ -24,27 +24,27 @@ <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> <tr><td><h1><span id="h1"></span></h1></td></tr> </table> -<br/> <div style="margin-left: auto; margin-right: auto; text-align: center;"> <div class="hd2">Sorry, that page was not found.</div> <div>You may have clicked an expired link or mistyped the address.</div> </div> -</div> - <script type="text/javascript"> // Set page title $('h1').innerHTML = hometitle(window.location.hostname); @@ -52,10 +52,12 @@ $('h1').innerHTML = hometitle(window.location.hostname); // Load the menu bar if (!issubdomain(window.location.hostname)) displaymenu(); - -// Show the page -ui.showbody(); </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/public/notyet.html b/sca-cpp/trunk/modules/edit/htdocs/public/notyet.html index bec4731415..f6b8db1912 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/public/notyet.html +++ b/sca-cpp/trunk/modules/edit/htdocs/public/notyet.html @@ -24,27 +24,26 @@ <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> <div id="menu"></div> <table style="width: 100%;"> <tr><td><h1><span id="h1"></span></h1></td></tr> </table> -<br/> <div style="margin-left: auto; margin-right: auto; text-align: center;"> <div class="hd2">Sorry, that page is still under construction.</div> <div>Please check back later.</div> </div> -</div> - <script type="text/javascript"> // Set page title $('h1').innerHTML = hometitle(window.location.hostname); @@ -52,10 +51,12 @@ $('h1').innerHTML = hometitle(window.location.hostname); // Load the menu bar if (!issubdomain(window.location.hostname)) displaymenu(); - -// Show the page -ui.showbody(); </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/public/oops.html b/sca-cpp/trunk/modules/edit/htdocs/public/oops.html index 305e2c66e1..f8d7bb6747 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/public/oops.html +++ b/sca-cpp/trunk/modules/edit/htdocs/public/oops.html @@ -24,26 +24,26 @@ <meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> <tr><td><h1><span id="h1"></span></h1></td></tr> </table> -<br/> <div style="margin-left: auto; margin-right: auto; text-align: center;"> <div class="hd2">Oops, something went wrong...</div> </div> -</div> - <script type="text/javascript"> // Set page title $('h1').innerHTML = hometitle(window.location.hostname); @@ -51,10 +51,12 @@ $('h1').innerHTML = hometitle(window.location.hostname); // Load the menu bar if (!issubdomain(window.location.hostname)) displaymenu(); - -// Show the page -ui.showbody(); </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/stats/index.html b/sca-cpp/trunk/modules/edit/htdocs/stats/index.html index b676b4b38c..a40f8b7a32 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/stats/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/stats/index.html @@ -25,13 +25,16 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> @@ -51,7 +54,7 @@ </tr> </table> -<form id="appForm" style="position: absolute; top: 90px; left: 0px;"> +<form id="appForm"> <table style="width: 100%;"> <tr><tr><td><b>App Icon:</b></td></tr> <tr><td><img src="/public/app.png" style="width: 50px; height: 50px; vertical-align: top;"></td></tr> @@ -66,8 +69,6 @@ </table> </form> -</div> - <script type="text/javascript"> // Get the app name var appname = ui.queryParams()['app']; @@ -98,9 +99,6 @@ $('cloneApp').title = tclone + ' this app'; // Load the menu bar displaymenu(); -// Show the page -ui.showbody(); - // Init service references var editWidget = sca.component("EditWidget"); var dashboards = sca.reference(editWidget, "dashboards"); @@ -172,9 +170,13 @@ $('cloneApp').onclick = function() { // Get the current app getapp(appname); - </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> diff --git a/sca-cpp/trunk/modules/edit/htdocs/store/index.html b/sca-cpp/trunk/modules/edit/htdocs/store/index.html index 601a5905b9..ce8b9d1251 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/store/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/store/index.html @@ -25,25 +25,26 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"/> <link rel="apple-touch-icon" href="/public/touchicon.png"/> <link rel="stylesheet" type="text/css" href="/ui-min.css"/> -<script type="text/javascript" src="/config.js"></script> <script type="text/javascript" src="/all-min.js"></script> <script type="text/javascript" src="/menu.js"></script> </head> -<body class="delayed" onorientationchange="ui.reload();"> +<body class="delayed" onload="ui.onload();"> <div id="bodydiv" class="devicewidth"> +<div id="headdiv" class="hsection"> +<script type="text/javascript" src="/headconfig.js"></script> +</div> + <div id="menu"></div> <table style="width: 100%;"> -<tr><td><h1><span id="h1"></span></h1></td></tr> +<tr><td><h2><span id="h1"></span></h2></td></tr> </table> <div id="catmenu"></div> <div id="apps"></div> -</div> - <script type="text/javascript"> // Set page titles document.title = windowtitle(window.location.hostname) + ' - Store'; @@ -86,9 +87,6 @@ function catmenu() { // Build store menu bar $('catmenu').innerHTML = catmenu(); -// Show the page -ui.showbody(); - /** * Service references. */ @@ -177,9 +175,13 @@ function getapps(category) { // Get and display the list of apps getapps(category); - </script> +<div id="footdiv" class="fsection"> +<script type="text/javascript" src="/footconfig.js"></script> +</div> + +</div> </body> </html> |