[icinga-checkins] icinga.org: icinga-web/mfriedrich/fixes: * Rewritten login teaser to simple version, not final (ref #1946)

git at icinga.org git at icinga.org
Mon Dec 12 23:40:58 CET 2011


Module: icinga-web
Branch: mfriedrich/fixes
Commit: 263ff2776eecaa48426d25799dd81543a662e7f9
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=263ff2776eecaa48426d25799dd81543a662e7f9

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Nov 30 11:05:54 2011 +0100

* Rewritten login teaser to simple version, not final (ref #1946)

---

 app/modules/AppKit/config/module.xml.in            |    1 +
 .../AppKit/templates/Login/AjaxLoginSuccess.php    |   40 ++++++++------
 pub/images/icinga/icinga-login-teaser.png          |  Bin 99825 -> 0 bytes
 pub/images/icinga/icinga-logo-big.png              |  Bin 0 -> 407092 bytes
 pub/styles/icinga.css                              |   55 ++------------------
 5 files changed, 28 insertions(+), 68 deletions(-)

diff --git a/app/modules/AppKit/config/module.xml.in b/app/modules/AppKit/config/module.xml.in
index 7d35167..3d88994 100755
--- a/app/modules/AppKit/config/module.xml.in
+++ b/app/modules/AppKit/config/module.xml.in
@@ -62,6 +62,7 @@
                     <ae:parameter name="org.icinga.version.extension"></ae:parameter>
                     <ae:parameter name="org.icinga.version.releasedate"></ae:parameter>
                     <ae:parameter name="org.icinga.version.name"></ae:parameter>
+                    <ae:parameter name="org.icinga.version.release"></ae:parameter>
                 </setting>
                 
                 <!-- Ajax default request timeout (ms), 4 minutes == 240000 -->
diff --git a/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php b/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php
index d6f2fa7..6a057cf 100755
--- a/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php
+++ b/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php
@@ -1,6 +1,7 @@
 <?php
 	$message = $t['message'];
 	$username = isset($t['username']) ? $t['username'] : '';
+	$app_string = AgaviConfig::get('org.icinga.version.release');
 ?>
 <script pe="text/javascript">
 Ext.onReady(function() {
@@ -52,19 +53,18 @@ Ext.onReady(function() {
 					
 					Ext.getCmp('menu').destroy();
 					
-					var v = Ext.getCmp('viewport-center');
-					Ext.DomHelper.append(Ext.getBody(), {
+					// Disable some borders
+					Ext.getCmp('viewport-center').getEl().addClass('login-page');
+					
+					var ele = Ext.DomHelper.append(Ext.getBody(), {
 						tag : 'div',
 						style : 'position: absolute;'
-						+ ' top: 0; left: 0;'
-						+ ' right: 0;'
-						+ ' height: 300px;'
-						+ ' background-color: #fff',
-						html : '',
-						children : [{
-							tag : 'img',
-							src : String.format('{0}/images/icinga/icinga-login-teaser.png', AppKit.util.Config.get('path'))
-						}]
+                        + ' top: 20px; left: 100px;'
+                        + ' height: 170px;'
+                        + ' width : 500px;'
+                        + String.format(' background-image: url(\'{0}/images/icinga/icinga-logo-big.png\');', AppKit.util.Config.get('path'))
+                        + ' background-color: #fff',
+						html : ' '
 					});
 				}
 			},
@@ -83,17 +83,23 @@ Ext.onReady(function() {
 
 		var oBox = new Ext.Panel({
 			id: 'login-dialog',
-			baseCls: 'x-box',
-			frame: true,
+			title : String.format(_('Login ({0})'), '<?php echo $app_string; ?>'),
+			width : 400,
+			frame : true,
+			border : true,
 			defaults: { border: false },
-			items: [ { bodyCfg: { tag: 'h1', html: _('Login') } }, oFormPanel ]
+			items: [ oFormPanel ]
 		});
 
 		var oContainer = new Ext.Panel({
-			width: 400,
-			style: { margin: '280px 70px', padding: '10px 0 0 0' },
+			width: 420,
+			height : 170,
+			style: {
+			    margin: '200px 140px', 
+                padding: '10px 0 0 0'
+			},
 			items: oBox,
-			border: false,
+			border: true,
 			id: 'login-container'
 		});
 
diff --git a/pub/images/icinga/icinga-login-teaser.png b/pub/images/icinga/icinga-login-teaser.png
deleted file mode 100644
index be57dce..0000000
Binary files a/pub/images/icinga/icinga-login-teaser.png and /dev/null differ
diff --git a/pub/images/icinga/icinga-logo-big.png b/pub/images/icinga/icinga-logo-big.png
new file mode 100644
index 0000000..aceb0b7
Binary files /dev/null and b/pub/images/icinga/icinga-logo-big.png differ
diff --git a/pub/styles/icinga.css b/pub/styles/icinga.css
index ed0a800..95cb7cb 100644
--- a/pub/styles/icinga.css
+++ b/pub/styles/icinga.css
@@ -847,57 +847,6 @@ div.icinga-monitor-performance-container-50 {
 	-o-box-shadow:1px -1px 50px red;
 }
 
-/* EOF */
-/*MODULE[CRONK_BP]*/
-div.bp_cfgPanel {
-    width:75px;
-    height:75px;
-    border:1px solid #ababab;
-    -moz-border-radius:5px;
-	border-radius:5px;
-
-    -webkit-border-radius:5px;
-    -moz-box-shadow:2px 2px 5px #888;
-	box-shadow:2px 2px 5px #888;
-
-    -webkit-box-shadow:2px 2px 5px #888;
-    text-align:center;
-    float:left;
-    margin:5px;
-    cursor:pointer;
-}
-
-div.bp_cfgPanel * {
-    cursor:pointer;    cursor:pointer;
-}
-
-div.bp_thumb {
-    width:32px;
-    height:32px;
-    margin:auto;
-    margin-top:5px;
-    margin-bottom:5px;
-    background-image:url('../images/cronks/default.png');
-    background-repeat:no-repeat;
-}
-
-div.bp_cfgPanel {
-    width:100px;
-    border:1px solid #dedede;
-    text-align:center;
-    margin:auto;
-    margin-top:5px;
-    padding:5px;
-}
-
-div.bp_cfgPanel.x-over {
-    background-color:#dedede;
-}
-
-tr.bp_serviceRow {
-    background-color:#dedede;
-}
-
 .icinga-icon-chart-organisation { background-image: url(../images/famfamfam/chart_organisation.png) !important; background-repeat: no-repeat; }
 .icinga-icon-sitemap { background-image: url(../images/famfamfam/sitemap.png) !important; background-repeat: no-repeat; }
 
@@ -1049,3 +998,7 @@ div.icinga-row-downtime {
         border-radius:5px;
         -webkit-border-radius:5px;
 }
+
+.login-page .x-panel-body {
+    border: none;
+}





More information about the icinga-checkins mailing list