[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a
Frescha
frescha at unitedseed.de
Tue Feb 28 22:09:32 UTC 2012
The following commit has been merged in the debian/master branch:
commit a83b2d479380575cf3bc80971623167e8b54381c
Author: Frescha <frescha at unitedseed.de>
Date: Mon Dec 26 12:39:48 2011 +0100
New slider images for the eltdetail mockup
diff --git a/shinken/webui/htdocs/images/icons/alert.png b/shinken/webui/htdocs/images/slider-off.png
old mode 100755
new mode 100644
similarity index 65%
copy from shinken/webui/htdocs/images/icons/alert.png
copy to shinken/webui/htdocs/images/slider-off.png
index 414987a..c9a0180
Binary files a/shinken/webui/htdocs/images/icons/alert.png and b/shinken/webui/htdocs/images/slider-off.png differ
diff --git a/shinken/webui/htdocs/images/icons/alert.png b/shinken/webui/htdocs/images/slider-on.png
similarity index 65%
copy from shinken/webui/htdocs/images/icons/alert.png
copy to shinken/webui/htdocs/images/slider-on.png
index 414987a..2a81919 100755
Binary files a/shinken/webui/htdocs/images/icons/alert.png and b/shinken/webui/htdocs/images/slider-on.png differ
diff --git a/shinken/webui/htdocs/images/icons/alert.png b/shinken/webui/htdocs/images/slider.png
old mode 100755
new mode 100644
similarity index 86%
copy from shinken/webui/htdocs/images/icons/alert.png
copy to shinken/webui/htdocs/images/slider.png
index 414987a..1bb128d
Binary files a/shinken/webui/htdocs/images/icons/alert.png and b/shinken/webui/htdocs/images/slider.png differ
diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
index 7cf07c1..90c4c97 100755
--- a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
@@ -320,4 +320,13 @@ div.content {
/*float: left;*/
line-height: 27px;
margin-left: 5px;
-}
\ No newline at end of file
+}
+
+.iPhoneCheckContainer{ position:relative; width:85px; height:27px; cursor:pointer; overflow:hidden; }
+.iPhoneCheckContainer input{ position:absolute; top:5px; left:30px; }
+.iPhoneCheckHandle{ display:block; height:27px; width:39px; cursor:pointer; position:absolute; top:0; left:0; }
+.iPhoneCheckHandle .iPhoneCheckHandleBG{ position:absolute; width:5px; height:100%; top:0; left:0; z-index:1; }
+.iPhoneCheckHandle .iPhoneCheckHandleSlider{ position:absolute; top:0; left:0; height:27px; width:39px; background:url(/static/images/slider.png) no-repeat; z-index:2; }
+label.iPhoneCheckLabelOn,label.iPhoneCheckLabelOff{ font-size:17px; line-height:17px; font-weight:bold; font-family:Helvetica Neue,Arial,Helvetica,sans-serif; text-transform:uppercase; cursor:pointer; display:block; height:22px; position:absolute; width:52px; top:0; }
+label.iPhoneCheckLabelOn{ color:#fff; background:url(/static/images/slider-on.png) no-repeat; /*text-shadow:0px 0px 2px rgba(0,0,0,0.6)*/; left:0; padding:5px 0 0 8px; }
+label.iPhoneCheckLabelOff{ color:#FFF; background:url(/static/images/slider-off.png) no-repeat right 0;/* text-shadow:0px 0px 2px rgba(255,255,255,0.6)*/; text-align:right; right:0; padding:5px 8px 0 0; }
\ No newline at end of file
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index bffe6e8..bee365b 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -19,7 +19,7 @@ Invalid element name
%top_right_banner_state = datamgr.get_overall_state()
-%rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(), js=['eltdetail/js/graphs.js', 'eltdetail/js/dollar.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js', 'eltdetail/js/hide.js', 'eltdetail/js/switchbuttons.js', 'eltdetail/js/multi.js'], css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/switchbuttons.css', 'eltdetail/css/hide.css', 'eltdetail/css/gesture.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
+%rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(), js=['eltdetail/js/graphs.js', 'eltdetail/js/dollar.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js', 'eltdetail/js/hide.js', 'eltdetail/js/switchbuttons.js', 'eltdetail/js/multi.js'], css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/hide.css', 'eltdetail/css/gesture.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
%# " We will save our element name so gesture functions will be able to call for the good elements."
<script type="text/javascript">var elt_name = '{{elt.get_full_name()}}';</script>
--
UNNAMED PROJECT
More information about the Pkg-nagios-changes
mailing list