[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a
Frescha
frescha at unitedseed.de
Tue Feb 28 22:12:20 UTC 2012
The following commit has been merged in the debian/master branch:
commit 824f086e97f2496a7a4189bcd52ead31a5368a31
Author: Frescha <frescha at unitedseed.de>
Date: Sat Jan 7 18:23:24 2012 +0100
enh eltdetail mockup
diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
index 2f1d89b..e46d739 100755
--- a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
@@ -143,12 +143,26 @@ div.content {
color: #000000;
}
.divstate2, .divhstate1, .divstate2 a, .divhstate2 a {
- background-color: #FA5858;
color: #FFFFFF;
+ background-color: #e10000;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#e10000), to(#bd0000)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(top, #e10000, #bd0000); /* Chrome 10+, Saf5.1+, iOS 5+ */
+ background-image: -moz-linear-gradient(top, #e10000, #bd0000); /* FF3.6 */
+ background-image: -ms-linear-gradient(top, #e10000, #bd0000); /* IE10 */
+ background-image: -o-linear-gradient(top, #e10000, #bd0000); /* Opera 11.10+ */
+ background-image: linear-gradient(top, #e10000, #bd0000);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#e10000', EndColorStr='#bd0000'); /* IE6-IE9 */
}
.divstate3, .divhstate2, .divstate3 a, .divhstate2 a {
- background-color: #FF8800;
color: #FFFFFF;
+ background-color: #71DB65;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#FF9900), to(#ff5f00)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(top, #FF9900, #ff5f00); /* Chrome 10+, Saf5.1+, iOS 5+ */
+ background-image: -moz-linear-gradient(top, #FF9900, #ff5f00); /* FF3.6 */
+ background-image: -ms-linear-gradient(top, #FF9900, #ff5f00); /* IE10 */
+ background-image: -o-linear-gradient(top, #FF9900, #ff5f00); /* Opera 11.10+ */
+ background-image: linear-gradient(top, #FF9900, #ff5f00);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#FF9900', EndColorStr='#ff5f00'); /* IE6-IE9 */
}
.service {
border-bottom: 1px solid #EBEBEB;
@@ -406,11 +420,8 @@ label.iPhoneCheckLabelOff {
*
*/
-#vertical_slide {
- background: #D0C8C8;
+#gesture_slide {
color: #8A7575;
- padding: 10px;
- border: 5px solid #F3F1F1;
font-weight: bold;
}
diff --git a/shinken/webui/plugins/eltdetail/htdocs/js/functions.js b/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
index 5637702..c836141 100644
--- a/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
+++ b/shinken/webui/plugins/eltdetail/htdocs/js/functions.js
@@ -1,4 +1,4 @@
-/*Copyright (C) 2009-2011 :
+/*Copyright (C) 2009-2012 :
Gabes Jean, naparuba at gmail.com
Gerhard Lausser, Gerhard.Lausser at consol.de
Gregory Starck, g.starck at gmail.com
@@ -30,7 +30,7 @@ window.addEvent('domready', function() {
'false': 'close'
};
// -- vertical
- var myVerticalSlide = new Fx.Slide('vertical_slide').hide();
+ var myVerticalSlide = new Fx.Slide('gesture_slide').hide();
$('v_toggle').addEvent('click', function(event){
event.stop();
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index 6beeaab..4659ce7 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -34,24 +34,23 @@ Invalid element name
</div>
<div class="marginbottom">
- <a id="v_toggle" href="#">toggle</a> |
- <strong>status</strong>: <span id="vertical_status">open</span>
+ <a id="v_toggle" href="#">toggle</a>
</div>
- <div id="vertical_slide" class="opacity_hover">
+ <div id="gesture_slide" class="grid_16 opacity_hover">
%# "This is the background canvas for all gesture detection things "
%# " Don't ask me why, but the size must be included in the
%# canvas line here or we got problem!"
- <center><canvas id="canvas" width="200" height="200" style="border: 1px solid black;"></canvas></center>
- <div class="gesture_button">
+ <canvas id="canvas" class="grid_10" style="border: 1px solid black; width: 100%;"></canvas>
+ <li class="gesture_button">
<img title="By keeping a left click pressed and drawing a check, you will launch an acknowledgement." src="/static/eltdetail/images/gesture-check.png"/> Acknowledge
- </div>
- <div class="gesture_button">
+ </li>
+ <li class="gesture_button">
<img title="By keeping a left click pressed and drawing a check, you will launch an recheck." src="/static/eltdetail/images/gesture-circle.png"/> Recheck
- </div>
- <div class="gesture_button">
+ </li>
+ <li class="gesture_button">
<img title="By keeping a left click pressed and drawing a check, you will launch a try to fix command." src="/static/eltdetail/images/gesture-zigzag.png"/> Fix
- </div>
+ </li>
</div>
</div>
@@ -89,7 +88,7 @@ Invalid element name
%# End of the host only case, so now service
%else:
<dt>Host:</dt>
- <dd> {{elt.host.host_name}}</dd>
+ <dd><a href="/host/{{elt.host.host_name}}">{{elt.host.host_name}}</a></dd>
<dt>Members of:</dt>
%if len(elt.servicegroups) > 0:
<dd> {{','.join([sg.get_name() for sg in elt.servicegroups])}}</dd>
@@ -151,7 +150,9 @@ Invalid element name
<div id="demo" class="grid_16">
<ul class="tabs">
<li class="tab icon_summary"><span>Summary</span></li>
+ %if elt_type=='host':
<li class="tab icon_service"><span>Services</span></li>
+ %end
<li class="tab icon_comment"><span>Comments/Downtimes</span></li>
<li class="tab icon_dependency"><span>Dependency Cloud</span></li>
<li class="tab icon_graph"><span>Graphs</span></li>
@@ -212,13 +213,8 @@ Invalid element name
</div>
</div>
+ %if elt_type=='host':
<div class="content">
- %# Now print the dependencies if we got somes
- %if len(elt.parent_dependencies) > 0:
- <a id="togglelink-{{elt.get_dbg_name()}}" href="javascript:toggleBusinessElt('{{elt.get_dbg_name()}}')"> {{!helper.get_button('Show dependency tree', img='/static/images/expand.png')}}</a>
- {{!helper.print_business_rules(datamgr.get_business_parents(elt))}}
- %end
-
%# " Only print host service if elt is an host of course"
%# " If the host is a problem, services will be print in the impacts, so don't"
%# " print twice "
@@ -226,7 +222,8 @@ Invalid element name
%if elt_type=='host' and not elt.is_problem:
<hr>
- <div class='host-services'>
+ <!--<div class='host-services'>-->
+ <div>
<h3> Services </h3>
%nb = 0
%for s in helper.get_host_services_sorted(elt):
@@ -257,10 +254,12 @@ Invalid element name
%# End of this service
%end
</div>
- %end #of the only host part
+
+ %end #of the only host part
%if elt.is_problem and len(elt.impacts) != 0:
- <div class='host-services'>
+ <div>
+ <!--<div class='host-services'>-->
<h4 style="margin-bottom: 5px;"> Impacts </h4>
%nb = 0
%for i in helper.get_impacts_sorted(elt):
@@ -287,8 +286,8 @@ Invalid element name
</div>
%# end of the 'is problem' if
%end
-
</div>
+ %end
<div class="content">
<div class="tabcontent">
<h2 style="display: none"><a name="comment" id="comment">Comments</a></h2>
@@ -325,7 +324,11 @@ Invalid element name
</div>
</div>
<div class="content">
- Lorem Ipsum ....
+ %# Now print the dependencies if we got somes
+ %if len(elt.parent_dependencies) > 0:
+ <a id="togglelink-{{elt.get_dbg_name()}}" href="javascript:toggleBusinessElt('{{elt.get_dbg_name()}}')"> {{!helper.get_button('Show dependency tree', img='/static/images/expand.png')}}</a>
+ {{!helper.print_business_rules(datamgr.get_business_parents(elt))}}
+ %end
</div>
<div class="content">
<h2 style="display: none"><a name="graphs" id="graph">Graphs</a></h2>
--
UNNAMED PROJECT
More information about the Pkg-nagios-changes
mailing list