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

Frescha frescha at unitedseed.de
Tue Feb 28 22:08:32 UTC 2012


The following commit has been merged in the debian/master branch:
commit b23f71ad0ff31cd91235649262da63aee9786c8b
Author: Frescha <frescha at unitedseed.de>
Date:   Tue Dec 13 19:20:59 2011 +0100

    enh: new navigation mockup

diff --git a/shinken/webui/htdocs/css/navigation.css b/shinken/webui/htdocs/css/navigation.css
index 4d15e07..18c56c9 100644
--- a/shinken/webui/htdocs/css/navigation.css
+++ b/shinken/webui/htdocs/css/navigation.css
@@ -9,6 +9,41 @@
     padding-bottom: 1px
 }
 
+.tac_col1 {
+	width: 20px;
+}
+
+.tac_  {
+	margin-bottom:20px;
+	background-color: #CCCCCC;
+    border-radius: 5px 5px 5px 5px;
+	list-style: none;
+	position: relative;
+	width: auto;
+}
+
+.tac_  li {
+
+	border-left: 1px solid;
+    float: left !important;
+    list-style: none outside none;
+    overflow: hidden;
+    padding-bottom: 2px;
+    text-align: center !important;
+	display: inline;
+	margin-right: 5px !important;
+}
+
+.tac_ li span {
+    background-color: #DDDDDD;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    display: block;
+    font-size: 200%;
+    line-height: 145%;
+    padding: 2px;
+}
+
 #navigation {
 	height:40px;
 	background: #222222;
@@ -94,11 +129,12 @@
 	padding:10px 5px 10px 5px;
 	border:1px solid #777777;
 	border-top:none;
-
+	
+	background: #FAFAFA;
 	/* Gradient background */
-	background:#F4F4F4;
+	/*background:#F4F4F4;
 	background: -moz-linear-gradient(top, #EEEEEE, #BBBBBB);
-	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EEEEEE), to(#BBBBBB));
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EEEEEE), to(#BBBBBB));*/
 
 	/* Rounded Corners */
 	-moz-border-radius: 0px 5px 5px 5px;
@@ -160,22 +196,21 @@
 
 /* Drop Down Content Stylings */
 
-#menu p, #menu h2, #menu h3, #menu ul li {
-	font-family:Arial, Helvetica, sans-serif;
-	line-height:21px;
+#dropmenu p, #dropmenu h2, #dropmenu h3, #dropmenu ul li {
+	/*line-height:21px;*/
 	font-size:12px;
 	text-align:left;
 	text-shadow: 1px 1px 1px #FFFFFF;
 }
-#menu h2 {
-	font-size:21px;
+#dropmenu h2 {
+	font-size:14px;
 	font-weight:400;
 	letter-spacing:-1px;
 	margin:7px 0 14px 0;
-	padding-bottom:14px;
+	
 	border-bottom:1px solid #666666;
 }
-#menu h3 {
+#dropmenu h3 {
 	font-size:14px;
 	margin:7px 0 14px 0;
 	padding-bottom:7px;
@@ -224,29 +259,30 @@
 	-moz-box-shadow:inset 0 0 3px #000000;
 	box-shadow:inset 0 0 3px #000000;
 }
-#menu li ul {
+#dropmenu li ul {
 	list-style:none;
 	padding:0;
 	margin:0 0 12px 0;
 }
-#menu li ul li {
+
+#dropmenu li ul li {
 	font-size:12px;
 	line-height:24px;
 	position:relative;
-	text-shadow: 1px 1px 1px #ffffff;
+/*	text-shadow: 1px 1px 1px #ffffff;*/
 	padding:0;
 	margin:0;
 	float:none;
 	text-align:left;
-	width:130px;
+/*	width:130px;*/
 }
-#menu li ul li:hover {
+#dropmenu li ul li:hover {
 	background:none;
 	border:none;
 	padding:0;
 	margin:0;
 }
-#menu li .greybox li {
+#dropmenu li .greybox li {
 	background:#F4F4F4;
 	border:1px solid #bbbbbb;
 	margin:0px 0px 4px 0px;
@@ -258,7 +294,7 @@
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
 }
-#menu li .greybox li:hover {
+#dropmenu li .greybox li:hover {
 	background:#ffffff;
 	border:1px solid #aaaaaa;
 	padding:4px 6px 4px 6px;
diff --git a/shinken/webui/views/navigation_element.tpl b/shinken/webui/views/navigation_element.tpl
index 18369ed..66d6078 100644
--- a/shinken/webui/views/navigation_element.tpl
+++ b/shinken/webui/views/navigation_element.tpl
@@ -14,63 +14,30 @@
 
 <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 -->
-
-            <div class="col_3">
-                <h2>Lists in Boxes</h2>
-            </div>
-
-            <div class="col_1">
-
-                <ul class="greybox">
-                    <li><a href="#">FreelanceSwitch</a></li>
-                    <li><a href="#">Creattica</a></li>
-                    <li><a href="#">WorkAwesome</a></li>
-                    <li><a href="#">Mac Apps</a></li>
-                    <li><a href="#">Web Apps</a></li>
-                </ul>   
-
-            </div>
-
-            <div class="col_1">
-
-                <ul class="greybox">
-                    <li><a href="#">ThemeForest</a></li>
-                    <li><a href="#">GraphicRiver</a></li>
-                    <li><a href="#">ActiveDen</a></li>
-                    <li><a href="#">VideoHive</a></li>
-                    <li><a href="#">3DOcean</a></li>
-                </ul>   
-
+            <div class="grid_16">
+				<h3>Host Overview</h3>
+				<ul class="grid_16 tac_">
+					<li class="grid_2"><span>0</span>Up</li>
+					<li class="grid_3"><span>0</span>Porblems</li>
+					<li class="grid_3"><span>0</span>Down</li>
+					<li class="grid_3"><span>0</span>Pending</li>
+					<li class="grid_3"><span>0</span>Unreachable</li>
+					<li class="grid_2"><span>0</span>Sum</li>
+				</ul>
             </div>
-
-            <div class="col_1">
-
-                <ul class="greybox">
-                    <li><a href="#">Design</a></li>
-                    <li><a href="#">Logo</a></li>
-                    <li><a href="#">Flash</a></li>
-                    <li><a href="#">Illustration</a></li>
-                    <li><a href="#">More...</a></li>
-                </ul>   
-
-            </div>
-
-            <div class="col_3">
-                <h2>Here are some image examples</h2>
+			<div>
+				<h3>Service Overview</h3>
+				<ul class="grid_16 tac_">
+					<li class="grid_2"><span>0</span>Up</li>
+					<li class="grid_3"><span>0</span>Porblems</li>
+					<li class="grid_3"><span>0</span>Down</li>
+					<li class="grid_3"><span>0</span>Pending</li>
+					<li class="grid_3"><span>0</span>Unreachable</li>
+					<li class="grid_2"><span>0</span>Sum</li>
+				</ul>
             </div>
-
-            <div class="col_3">
-                <img src="img/02.jpg" width="70" height="70" class="img_left imgshadow" alt="" />
-                <p>Maecenas eget eros lorem, nec pellentesque lacus. Aenean dui orci, rhoncus sit amet tristique eu, tristique sed odio. Praesent ut interdum elit. Maecenas imperdiet, nibh vitae rutrum vulputate, lorem sem condimentum.<a href="#">Read more...</a></p>
-
-                <img src="img/01.jpg" width="70" height="70" class="img_left imgshadow" alt="" />
-                <p>Aliquam elementum felis quis felis consequat scelerisque. Fusce sed lectus at arcu mollis accumsan at nec nisi. Aliquam pretium mollis fringilla. Vestibulum tempor facilisis malesuada. <a href="#">Read more...</a></p>
-            </div>
-
         </div><!-- End 3 columns container -->
-
     </li><!-- End 3 columns Item -->
 
 </ul>

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list