summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/js
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules/js')
-rw-r--r--sca-cpp/trunk/modules/js/htdocs/ui.css86
-rw-r--r--sca-cpp/trunk/modules/js/htdocs/ui.js75
-rwxr-xr-xsca-cpp/trunk/modules/js/js-conf20
3 files changed, 117 insertions, 64 deletions
diff --git a/sca-cpp/trunk/modules/js/htdocs/ui.css b/sca-cpp/trunk/modules/js/htdocs/ui.css
index 3dde10a2c0..ddc21b2095 100644
--- a/sca-cpp/trunk/modules/js/htdocs/ui.css
+++ b/sca-cpp/trunk/modules/js/htdocs/ui.css
@@ -34,7 +34,7 @@ visibility: hidden;
}
.fixed {
-position: absolute;
+position: fixed;
}
.devicewidth {
@@ -175,13 +175,95 @@ overflow: hidden;
.viewheadbackground {
position: absolute; left: 0px; top: 35px; height: 35px; line-height: 35px; width: 2500px; z-index: 7;
-font-size: 110%; font-weight: bold; background-color: #f1f1f1; color: #000000;
+background-color: #f1f1f1;
border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #e5e5e5;
overflow: hidden;
-webkit-backface-visibility: hidden;
}
+.viewfoot {
+position: absolute; left: 0px; bottom: 0px; height: 25px; line-height: 25px; width: 100%; z-index: 8;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-backface-visibility: hidden;
+}
+
+.status {
+position: absolute; left: 0px; bottom: 0px; height: 35px; line-height: 35px; width: 100%; z-index: 9;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 0px; border-bottom: 0px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-transform: translate(0px, 0px);
+-moz-transform: translate(0px, 0px);
+-ms-transform: translate(0px, 0px);
+-o-transform: translate(0px, 0px);
+transform: translate(0px, 0px);
+-webkit-backface-visibility: hidden;
+}
+
+.statusout3 {
+position: absolute; left: 0px; bottom: 0px; height: 35px; line-height: 35px; width: 100%; z-index: 9;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 0px; border-bottom: 0px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-transition: -webkit-transform 0.4s ease-in-out 3s;
+-moz-transition: -moz-transform 0.4s ease-in-out 3s;
+-ms-transition: -ms-transform 0.4s ease-in-out 3s;
+-o-transition: -o-transform 0.4s ease-in-out 3s;
+transition: transform 0.4s ease-in-out 3s;
+-webkit-transform: translate(0px, 35px);
+-moz-transform: translate(0px, 35px);
+-ms-transform: translate(0px, 35px);
+-o-transform: translate(0px, 35px);
+transform: translate(0px, 35px);
+-webkit-backface-visibility: hidden;
+}
+
+.statusout1 {
+position: absolute; left: 0px; bottom: 0px; height: 35px; line-height: 35px; width: 100%; z-index: 9;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 0px; border-bottom: 0px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-transition: -webkit-transform 0.4s ease-in-out 1s;
+-moz-transition: -moz-transform 0.4s ease-in-out 1s;
+-ms-transition: -ms-transform 0.4s ease-in-out 1s;
+-o-transition: -o-transform 0.4s ease-in-out 1s;
+transition: transform 0.4s ease-in-out 1s;
+-webkit-transform: translate(0px, 35px);
+-moz-transform: translate(0px, 35px);
+-ms-transform: translate(0px, 35px);
+-o-transform: translate(0px, 35px);
+transform: translate(0px, 35px);
+-webkit-backface-visibility: hidden;
+}
+
+.okstatus {
+font-size: 110%; font-weight: bold; padding-left: 6px; padding-right: 6px; white-space: nowrap; text-decoration: none;
+background-color: #f1f1f1; color: #000000;
+width: 100%; margin-left: auto; margin-right: auto; text-align: center; float: right;
+}
+
+.errorstatus {
+font-size: 110%; font-weight: bold; padding-left: 6px; padding-right: 6px; white-space: nowrap; text-decoration: none;
+background-color: #d14836; color: #ffffff;
+width: 100%; margin-left: auto; margin-right: auto; text-align: center; float: right;
+}
+
+.viewfootbackground {
+position: absolute; left: 0px; bottom: 0px; height: 25px; line-height: 25px; width: 2500px; z-index: 7;
+background-color: #ffffff;
+border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-backface-visibility: hidden;
+}
+
.viewcontent {
position: absolute; left: 0px; top: 38px; width: 100%;
-webkit-backface-visibility: hidden;
diff --git a/sca-cpp/trunk/modules/js/htdocs/ui.js b/sca-cpp/trunk/modules/js/htdocs/ui.js
index f200321ccd..fb53598390 100644
--- a/sca-cpp/trunk/modules/js/htdocs/ui.js
+++ b/sca-cpp/trunk/modules/js/htdocs/ui.js
@@ -178,28 +178,6 @@ ui.isMobile = function() {
};
/**
- * Convert a host name to a home page title.
- */
-ui.hometitle = function(host) {
- if (!isNil(window.top.config.hometitle))
- return window.top.config.hometitle;
- var h = reverse(host.split('.'));
- var d = isNil(cdr(h))? car(h) : cadr(h);
- return d.substr(0, 1).toUpperCase() + d.substr(1);
-};
-
-/**
- * Convert a host name to a window title.
- */
-ui.windowtitle = function(host) {
- if (!isNil(window.top.config.windowtitle))
- return window.top.config.windowtitle;
- var h = reverse(host.split('.'));
- var d = isNil(cdr(h))? car(h) : cadr(h);
- return d.substr(0, 1).toUpperCase() + d.substr(1);
-};
-
-/**
* Convert a CSS position to a numeric position.
*/
ui.numpos = function(p) {
@@ -264,62 +242,75 @@ ui.navigate = function(url, win) {
//log('navigate', url, win);
// Open a new window
- if (win == '_blank')
- return window.top.open(url, win);
+ if (win == '_blank') {
+ window.top.open(url, win);
+ return false;
+ }
// Open a new document in the current window
- if (win == '_self')
- return window.top.open(url, win);
+ if (win == '_self') {
+ window.top.open(url, win);
+ return false;
+ }
// Reload the current window
if (win == '_reload') {
window.top.location = url;
- return window.top.location.reload();
+ window.top.location.reload();
+ return false;
}
// Let the current top window handle the navigation
if (win == '_view') {
if (!window.top.onnavigate)
return window.top.open(url, '_self');
- return window.top.onnavigate(url);
+ window.top.onnavigate(url);
+ return false;
}
- return window.top.open(url, win);
+ window.top.open(url, win);
+ return false;
}
/**
* Build a portable <a href> tag.
*/
-ui.ahref = function(loc, target, html) {
+ui.href = function(id, loc, target, html) {
if (target == '_blank')
- return '<a href="' + loc + '" target="_blank">' + html + '</a>';
- return '<a href="javascript:void(0)" onclick="ui.navigate(\'' + loc + '\', \'' + target + '\');">' + html + '</a>';
+ return '<a id="' + id + '" href="' + loc + '" target="_blank">' + html + '</a>';
+ return '<a id="' + id + '" href="' + loc + '" onclick="return ui.navigate(\'' + loc + '\', \'' + target + '\');">' + html + '</a>';
};
/**
* Build a menu bar.
*/
-ui.menu = function(name, href, target, hilight) {
+ui.menu = function(id, name, href, target, hilight) {
function Menu() {
this.content = function() {
- if (hilight)
- return ui.ahref(href, target, '<span class="tbarsmenu">' + name + '</span>');
- return ui.ahref(href, target, '<span class="tbaramenu">' + name + '</span>');
+ if (hilight == true)
+ return ui.href(id, href, target, '<span class="tbarsmenu">' + name + '</span>');
+ else if (hilight == false)
+ return ui.href(id, href, target, '<span class="tbaramenu">' + name + '</span>');
+ else
+ return ui.href(id, href, target, '<span class="' + hilight + '">' + name + '</span>');
};
}
return new Menu();
};
-ui.menufunc = function(name, fun, hilight) {
+ui.menufunc = function(id, name, fun, hilight) {
function Menu() {
this.content = function() {
- function href(fun, html) {
- return '<a href="javascript:void(0)" onclick="' + fun + '">' + html + '</a>';
+ function href(id, fun, html) {
+ return '<a id="' + id + '" href="/" onclick="' + fun + '">' + html + '</a>';
}
- if (hilight)
- return href(fun, '<span class="tbarsmenu">' + name + '</span>');
- return href(fun, '<span class="tbaramenu">' + name + '</span>');
+ if (hilight == true)
+ return href(id, fun, '<span class="tbarsmenu">' + name + '</span>');
+ else if (hilight == false)
+ return href(id, fun, '<span class="tbaramenu">' + name + '</span>');
+ else
+ return href(id, fun, '<span class="' + hilight + '">' + name + '</span>');
};
}
return new Menu();
diff --git a/sca-cpp/trunk/modules/js/js-conf b/sca-cpp/trunk/modules/js/js-conf
index 09289a1899..aa29920619 100755
--- a/sca-cpp/trunk/modules/js/js-conf
+++ b/sca-cpp/trunk/modules/js/js-conf
@@ -25,47 +25,27 @@ root=`echo "import os; print os.path.realpath('$1')" | python`
cat >>$root/conf/httpd.conf <<EOF
# Generated by: js-conf $*
# Serve JavaScript scripts and CSS
-Alias /ui.css $here/htdocs/ui.css
Alias /ui-min.css $here/htdocs/ui-min.css
-Alias /all.js $here/htdocs/all.js
Alias /all-min.js $here/htdocs/all-min.js
-Alias /proxy/ui.css $here/htdocs/ui.css
Alias /proxy/ui-min.css $here/htdocs/ui-min.css
-Alias /proxy/all.js $here/htdocs/all.js
Alias /proxy/all-min.js $here/htdocs/all-min.js
EOF
cat >>$root/conf/pubauth.conf <<EOF
# Generated by: js-conf $*
-<Location /ui.css>
-AuthType None
-Require all granted
-</Location>
<Location /ui-min.css>
AuthType None
Require all granted
</Location>
-<Location /all.js>
-AuthType None
-Require all granted
-</Location>
<Location /all-min.js>
AuthType None
Require all granted
</Location>
-<Location /proxy/ui.css>
-AuthType None
-Require all granted
-</Location>
<Location /proxy/ui-min.css>
AuthType None
Require all granted
</Location>
-<Location /proxy/all.js>
-AuthType None
-Require all granted
-</Location>
<Location /proxy/all-min.js>
AuthType None
Require all granted
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 21:16:13 +0000