[icinga-checkins] icinga.org: icinga-web/master: * New login teaser (fixes #1946)

git at icinga.org git at icinga.org
Tue Nov 29 16:39:59 CET 2011


Module: icinga-web
Branch: master
Commit: e0c242676438c6e91a16727ab8701faba796293f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=e0c242676438c6e91a16727ab8701faba796293f

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Nov 29 16:38:51 2011 +0100

* New login teaser (fixes #1946)

---

 .../Api/models/Relation/DataModelModel.class.php   |   12 -----------
 .../AppKit/templates/Login/AjaxLoginSuccess.php    |   21 ++++++++++++++++++-
 doc/AUTHORS                                        |    1 +
 pub/images/icinga/icinga-login-teaser.png          |  Bin 0 -> 99825 bytes
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/modules/Api/models/Relation/DataModelModel.class.php b/app/modules/Api/models/Relation/DataModelModel.class.php
index 8efdd0b..e383bd9 100644
--- a/app/modules/Api/models/Relation/DataModelModel.class.php
+++ b/app/modules/Api/models/Relation/DataModelModel.class.php
@@ -98,18 +98,6 @@ class Api_Relation_DataModelModel extends IcingaApiBaseModel {
         return $out;
     }
     
-    public function getServiceContactDetails($objectId) {
-        $records = IcingaDoctrine_Query::create()
-        ->select('c.alias, co.name1 as name1, co.object_id as contact_object_id, NULL as group')
-        ->from('IcingaContacts c')
-        ->innerJoin('c.object co')
-        ->innerJoin('c.services h WITH h.service_object_id=?', $objectId)
-        ->execute(null, Doctrine::HYDRATE_ARRAY);
-        
-        var_dump($records);
-        die;
-    }
-    
     public function getObjectData($objectId) {
         $record = IcingaDoctrine_Query::create()
         ->from('IcingaObjects o')
diff --git a/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php b/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php
index 5b80a7a..d6f2fa7 100755
--- a/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php
+++ b/app/modules/AppKit/templates/Login/AjaxLoginSuccess.php
@@ -36,7 +36,7 @@ Ext.onReady(function() {
 				fieldLabel: '<?php echo $tm->_("User"); ?>',
 				name: 'username',
 				id: 'username',
-				allowBlank: false 
+				allowBlank: false
 			}, {
 				fieldLabel: '<?php echo $tm->_("Password"); ?>',
 				inputType: 'password',
@@ -49,6 +49,23 @@ Ext.onReady(function() {
 				afterrender: function(p) {
 					pub.resetForm(true);
 					oFormPanel.getForm().findField('username').setValue('<?php echo $username; ?>');
+					
+					Ext.getCmp('menu').destroy();
+					
+					var v = Ext.getCmp('viewport-center');
+					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'))
+						}]
+					});
 				}
 			},
 			
@@ -74,7 +91,7 @@ Ext.onReady(function() {
 
 		var oContainer = new Ext.Panel({
 			width: 400,
-			style: { margin: '120px auto', padding: '10px 0 0 0' },
+			style: { margin: '280px 70px', padding: '10px 0 0 0' },
 			items: oBox,
 			border: false,
 			id: 'login-container'
diff --git a/doc/AUTHORS b/doc/AUTHORS
index 6c20d1c..ef3880e 100644
--- a/doc/AUTHORS
+++ b/doc/AUTHORS
@@ -1,4 +1,5 @@
 Icinga Developer Team   info at icinga.org
+
 Marius Hein             marius.hein at netways.de
 Christian Doebler       christian.doebler at netways.de
 Michael Luebben         michael_luebben at web.de
diff --git a/pub/images/icinga/icinga-login-teaser.png b/pub/images/icinga/icinga-login-teaser.png
new file mode 100644
index 0000000..be57dce
Binary files /dev/null and b/pub/images/icinga/icinga-login-teaser.png differ





More information about the icinga-checkins mailing list