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

[Naparuba]

The following commit has been merged in the debian/master branch:
commit 1f9df6d7eb55660896a6da78c90c93e9696c7291
Author: Naparuba <naparuba at gmail.com>
Date:   Mon Jan 30 13:56:45 2012 +0100

    Add : shinken logo instea of robot red.

diff --git a/shinken/webui/htdocs/images/logo.png b/shinken/webui/htdocs/images/logo.png
new file mode 100644
index 0000000..290e026
Binary files /dev/null and b/shinken/webui/htdocs/images/logo.png differ
diff --git a/shinken/webui/plugins/login/htdocs/css/login.css b/shinken/webui/plugins/login/htdocs/css/login.css
new file mode 100644
index 0000000..5c04286
--- /dev/null
+++ b/shinken/webui/plugins/login/htdocs/css/login.css
@@ -0,0 +1,9 @@
+.img_logo {
+    /*height: 75%;*/
+    width: 100%;
+}
+
+
+.div_logo {
+    margin-top : 10%;
+}
\ No newline at end of file
diff --git a/shinken/webui/plugins/login/views/login.tpl b/shinken/webui/plugins/login/views/login.tpl
index 06df389..0de143f 100644
--- a/shinken/webui/plugins/login/views/login.tpl
+++ b/shinken/webui/plugins/login/views/login.tpl
@@ -1,4 +1,4 @@
-%rebase layout title='Shinken UI login', print_menu=False, js=['login/js/pass_shark.js']
+%rebase layout title='Shinken UI login', print_menu=False, js=['login/js/pass_shark.js'], css=['login/css/login.css']
 
 <script type="text/javascript">
 	function submitform() {
@@ -8,6 +8,7 @@
 	/* Catch the key ENTER and launch the form 
 	 Will be link in the password field
 	*/
+	
 	function submitenter(myfield,e) {
 	  var keycode;
 	  if (window.event) keycode = window.event.keyCode;
@@ -38,8 +39,8 @@
 %if login_text:
 <p><span id="login-text"> {{login_text}}</span></p>
 %end
-	<div class="grid_8">
-		<img src="/static/images/robot_rouge_alpha.png" alt="Shinken Login">
+	<div class="div_logo grid_8">
+		<img class='img_logo' src="/static/images/logo.png" alt="Shinken Login">
 	</div>
 
 	<div id="login-form" class="grid_7">

-- 
UNNAMED PROJECT