Author: Lars Michelsen <[email protected]>
Date: Sun Aug 14 00:49:31 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sun Aug 14 00:49:31 2011 +0200
Bugfix: Fixed 100% sidebar height
---
ChangeLog | 1 +
share/frontend/nagvis-js/js/nagvis.js | 7 +++++++
share/userfiles/templates/default.automap.html | 3 ++-
share/userfiles/templates/default.css | 4 ++--
share/userfiles/templates/default.index.html | 5 +++--
share/userfiles/templates/default.map.html | 5 +++--
share/userfiles/templates/default.overview.html | 3 ++-
share/userfiles/templates/default.url.html | 3 ++-
8 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f3c8ad1..7a85464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Core
Frontend
* Bugfix: Fixed several umlauts in edit mode warning messages
+ * Bugfix: Fixed 100% sidebar height
Automap
* Bugfix: Made the problem automap work again
diff --git a/share/frontend/nagvis-js/js/nagvis.js
b/share/frontend/nagvis-js/js/nagvis.js
index 71fff48..806aa15 100644
--- a/share/frontend/nagvis-js/js/nagvis.js
+++ b/share/frontend/nagvis-js/js/nagvis.js
@@ -1139,4 +1139,11 @@ function scaleView() {
}
header = null;
}
+
+ // The sidebar should fill the whole screen all the time
+ var sidebar = document.getElementById('sidebar');
+ if(sidebar && sidebarOpen()) {
+ sidebar.style.height = (pageHeight() + getScrollTop()) + 'px';
+ }
+ sidebar = null;
}
diff --git a/share/userfiles/templates/default.automap.html
b/share/userfiles/templates/default.automap.html
index f55e401..82447d6 100644
--- a/share/userfiles/templates/default.automap.html
+++ b/share/userfiles/templates/default.automap.html
@@ -17,4 +17,5 @@ addDOMLoadEvent(function()\{runWorker(0, 'automap',
'{$mapName}');});
// This disables the context menu when someone clicked anywhere on the map
document.onmousedown = contextMouseDown;
window.onresize = function() { scaleView(); }
-</script>
\ No newline at end of file
+window.onscroll = function() { scaleView(); };
+</script>
diff --git a/share/userfiles/templates/default.css
b/share/userfiles/templates/default.css
index 749deef..96c288b 100644
--- a/share/userfiles/templates/default.css
+++ b/share/userfiles/templates/default.css
@@ -35,7 +35,7 @@ body, table, th, td {
font-size: 12pt;
}
-html, body {height:100%}
+html,body{height:100%;}
table {width:100%}
div {margin:0;padding:0}
@@ -602,7 +602,7 @@ td#popupWindowContent a:hover
{color:#779D2A;text-decoration:underline}
.subdropdown .underline {border-bottom:1px solid #a4a4a4}
/* Styling for the sidebar */
-#sidebar
{position:relative;top:0;left:0;float:left;height:100%;width:200px;z-index:99;display:none;background-color:#eaf0f2;text-decoration:none;font-size:0.6em;padding-top:10px;border-right:1px
solid #a4a4a4;padding-top:32px;}
+#sidebar
{position:relative;top:0;left:0;float:left;min-height:100%;width:200px;z-index:99;display:none;background-color:#eaf0f2;text-decoration:none;font-size:0.6em;padding-top:10px;border-right:1px
solid #a4a4a4;padding-top:32px;}
#sidebar ul {margin:0;padding:0;display:block;list-style:none}
#sidebar li {margin:0;padding:0;line-height:25px;}
#sidebar li.spacerbottom {border-bottom:1px dotted #a4a4a4}
diff --git a/share/userfiles/templates/default.index.html
b/share/userfiles/templates/default.index.html
index 571d1a9..0ce7498 100644
--- a/share/userfiles/templates/default.index.html
+++ b/share/userfiles/templates/default.index.html
@@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; dir="ltr" lang="en-US">
<head>
<link rel="shortcut icon"
href="{$htmlBase}/frontend/nagvis-js/images/internal/favicon.png" />
@@ -57,4 +58,4 @@
{$content}
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/share/userfiles/templates/default.map.html
b/share/userfiles/templates/default.map.html
index 7ab3018..e296c6c 100644
--- a/share/userfiles/templates/default.map.html
+++ b/share/userfiles/templates/default.map.html
@@ -16,5 +16,6 @@ gridParse();
// This disables the context menu when someone clicked anywhere on the map
document.onmousedown = contextMouseDown;
-window.onresize = function() { scaleView(); }
-</script>
\ No newline at end of file
+window.onresize = function() { scaleView(); };
+window.onscroll = function() { scaleView(); };
+</script>
diff --git a/share/userfiles/templates/default.overview.html
b/share/userfiles/templates/default.overview.html
index b790d85..9160c14 100644
--- a/share/userfiles/templates/default.overview.html
+++ b/share/userfiles/templates/default.overview.html
@@ -22,4 +22,5 @@ addDOMLoadEvent(function()\{runWorker(0, 'overview');});
// This disables the context menu when someone clicked anywhere on the map
document.onmousedown = contextMouseDown;
window.onresize = function() { scaleView(); }
-</script>
\ No newline at end of file
+window.onscroll = function() { scaleView(); };
+</script>
diff --git a/share/userfiles/templates/default.url.html
b/share/userfiles/templates/default.url.html
index 3c9bfc2..07e9f39 100644
--- a/share/userfiles/templates/default.url.html
+++ b/share/userfiles/templates/default.url.html
@@ -7,4 +7,5 @@ oRotationProperties = {$rotationProperties};
// Kick of the worker
addDOMLoadEvent(function()\{runWorker(0, 'url', '{$url}');});
window.onresize = function() { scaleView(); }
-</script>
\ No newline at end of file
+window.onscroll = function() { scaleView(); };
+</script>
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
