[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Frescha]

The following commit has been merged in the debian/master branch:
commit 4949fd2190ac935b11113ae5bb7b26133b3a01cc
Author: Frescha <frescha at unitedseed.de>
Date:   Wed Dec 7 19:45:09 2011 +0100

    Update navigation element

diff --git a/shinken/webui/htdocs/css/navigation.css b/shinken/webui/htdocs/css/navigation.css
index 873154f..31b1f70 100644
--- a/shinken/webui/htdocs/css/navigation.css
+++ b/shinken/webui/htdocs/css/navigation.css
@@ -8,15 +8,15 @@
     padding-bottom: 1px
 }
 
-#menu {
+#menu, #dropmenu {
 	list-style:none;
 	margin:0px auto 0px auto;
 	height:43px;
-	padding:0px 20px 0px 20px;
+	padding:0px;
 	background: #222222;
 }
 
-#menu li {
+#menu li, #dropmenu li {
 	float:left;
 	text-align:center;
 	position:relative;
@@ -25,8 +25,11 @@
 	margin-top:7px;
 	border:none;
 }
-
-#menu li:hover  {
+#menu li a:hover, #menu li .selected{
+	color: white;
+	background: transparent url(/static/images/pointer.gif) bottom center no-repeat;
+}
+#dropmenu li:hover  {
 	border: 1px solid #777777;
 	padding: 4px 9px 4px 9px;
 	
@@ -43,8 +46,7 @@
 	border-radius: 5px 5px 0px 0px;
 }
 
-#menu li a {
-	font-family:Arial, Helvetica, sans-serif;
+#menu li a, #dropmenu li a {
 	font-size:14px;
 	color: #EEEEEE;
 	display:block;
@@ -52,15 +54,15 @@
 	text-decoration:none;
 }
 
-#menu li:hover a {
+#dropmenu li:hover a {
 	color:#161616;
 	text-shadow: 1px 1px 1px #FFFFFF;
 }
-#menu li .drop {
+#dropmenu li .drop {
 	padding-right:21px;
 	background:url("/static/images/icons/drop2.png") no-repeat right 8px;
 }
-#menu li:hover .drop {
+#dropmenu li:hover .drop {
 	background:url("/static/images/icons/drop.png") no-repeat right 7px;
 }
 
@@ -97,11 +99,11 @@
 .dropdown_4columns {width: 560px;}
 .dropdown_5columns {width: 700px;}
 
-#menu li:hover .dropdown_1column,
-#menu li:hover .dropdown_2columns,
-#menu li:hover .dropdown_3columns,
-#menu li:hover .dropdown_4columns,
-#menu li:hover .dropdown_5columns {
+#dropmenu li:hover .dropdown_1column,
+#dropmenu li:hover .dropdown_2columns,
+#dropmenu li:hover .dropdown_3columns,
+#dropmenu li:hover .dropdown_4columns,
+#dropmenu li:hover .dropdown_5columns {
 	left:-1px;
     top:auto;
 }
@@ -127,17 +129,17 @@
 
 /* Right alignment */
 
-#menu .menu_right {
+#dropmenu .menu_right {
 	float:right;
 	margin-right:0px;
 }
-#menu li .align_right {
+#dropmenu li .align_right {
 	/* Rounded Corners */
 	-moz-border-radius: 5px 0px 5px 5px;
     -webkit-border-radius: 5px 0px 5px 5px;
     border-radius: 5px 0px 5px 5px;
 }
-#menu li:hover .align_right {
+#dropmenu li:hover .align_right {
 	left:auto;
 	right:-1px;
 	top:auto;
diff --git a/shinken/webui/htdocs/images/icons/drop.png b/shinken/webui/htdocs/images/icons/drop.png
new file mode 100644
index 0000000..ac0b60a
Binary files /dev/null and b/shinken/webui/htdocs/images/icons/drop.png differ
diff --git a/shinken/webui/htdocs/images/icons/drop2.png b/shinken/webui/htdocs/images/icons/drop2.png
new file mode 100644
index 0000000..cd50b87
Binary files /dev/null and b/shinken/webui/htdocs/images/icons/drop2.png differ
diff --git a/shinken/webui/views/navigation_element.tpl b/shinken/webui/views/navigation_element.tpl
index 437fb37..0af1754 100644
--- a/shinken/webui/views/navigation_element.tpl
+++ b/shinken/webui/views/navigation_element.tpl
@@ -1,20 +1,18 @@
 %if not 'app' in locals() : app = None
-
-<ul id="menu">
-
-                %menu = [ ('/', 'Dashboard'), ('/impacts','Impacts'), ('/problems','IT problems'), ('/all', 'All'), ('/system', 'System') ]
-                %for (key, value) in menu:
-
-                            %# Check for the selected element, if there is one
-                                %if menu_part == key:
-                                        <li><a href="{{key}}" id="selected">{{value}}</a></li>
-                                        %else:
-                                                <li class="normal"><a href="{{key}}">{{value}}</a></li>
-                                        %end
-                                %end
-
-
-
+<div id="navigation">
+	<ul id="menu" class="grid_12">
+		%menu = [ ('/', 'Dashboard'), ('/impacts','Impacts'), ('/problems','IT problems'), ('/all', 'All'), ('/system', 'System') ]
+	    	%for (key, value) in menu:
+	        %# Check for the selected element, if there is one
+		        %if menu_part == key:
+				 	<li><a href="{{key}}" id="selected">{{value}}</a></li>
+			     %else:
+			        <li class="normal"><a href="{{key}}">{{value}}</a></li>
+			    %end
+	        %end
+	</ul>
+
+<ul id="dropmenu" class="grid_4">
     <li class="menu_right"><a href="#" class="drop">Impacts <span class="tac_impacts">1 / 2 /3</span></a><!-- Begin 3 columns Item -->
 
         <div class="dropdown_3columns align_right"><!-- Begin 3 columns container -->
@@ -76,4 +74,5 @@
     </li><!-- End 3 columns Item -->
 
 </ul>
+</div>
 <div class="clear"></div>
\ No newline at end of file

-- 
UNNAMED PROJECT