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

[Frescha]

The following commit has been merged in the debian/master branch:
commit 4dd6b9fa48de4d0b4d9d5ab4efbdd211f197583f
Author: Frescha <frescha at unitedseed.de>
Date:   Sat Jan 14 17:17:06 2012 +0100

    Add: New main navigation (pure CSS3, yeah)

diff --git a/shinken/webui/views/layout.tpl b/shinken/webui/views/layout.tpl
index 35fb382..c460284 100644
--- a/shinken/webui/views/layout.tpl
+++ b/shinken/webui/views/layout.tpl
@@ -23,7 +23,7 @@
 
       <title>{{title or 'No title'}}</title>
       
-      <link rel="stylesheet" type="text/css" href="/static/css/nav.css"/>
+      <link rel="stylesheet" type="text/css" href="/static/css/navigation.css" media="screen"/>
       <link rel="stylesheet" type="text/css" href="/static/css/reset.css" media="screen"/>
       <link rel="stylesheet" type="text/css" href="/static/css/text.css" media="screen"/>
       <link rel="stylesheet" type="text/css" href="/static/css/grid.css" media="screen"/>
@@ -45,7 +45,7 @@
       <script type="text/javascript" src="/static/js/mootools-more.js"></script>
       <script type="text/javascript" src="/static/js/mootools-message.js"></script>
       
-      <script type="text/javascript" src="/static/js/UvumiDropdown.js"></script>
+      <script type="text/javascript" src="/static/js/simpletreemenu.js"></script>
       <script type="text/javascript" src="/static/js/rotater.js"></script>
       <script type="text/javascript" src="/static/js/tabs.js"></script>
       <script type="text/javascript" src="/static/js/top_right_banner.js"></script>
@@ -98,7 +98,7 @@
 			%include header_element globals()
 		%end
 		%if print_menu:
-			%include nav_element globals()
+			%include navigation_element globals()
 		%end
 		<div id="main_container" class="grid_16">
 			%include
diff --git a/shinken/webui/views/navigation_element.tpl b/shinken/webui/views/navigation_element.tpl
index 66d6078..40ef3d1 100644
--- a/shinken/webui/views/navigation_element.tpl
+++ b/shinken/webui/views/navigation_element.tpl
@@ -11,7 +11,7 @@
 			    %end
 	        %end
 	</ul>
-
+<!--
 <ul id="dropmenu" class="grid_4 right">
     <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 -->
@@ -41,5 +41,6 @@
     </li><!-- End 3 columns Item -->
 
 </ul>
+-->
 </div>
 <div class="clear"></div>
\ No newline at end of file

-- 
UNNAMED PROJECT