[icinga-checkins] icinga.org: icinga-web/cdoebler/default: * South frame

git at icinga.org git at icinga.org
Tue Oct 27 10:40:28 CET 2009


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Oct 26 15:10:52 2009 +0100

* South frame
* Login redirect
* Padding hello

---

 app/config/routing.xml                             |    2 +-
 .../Cronks/templates/System/CronkPortalSuccess.php |   12 ++++++------
 .../Cronks/templates/System/PortalHelloSuccess.php |   18 ++++++++++--------
 app/templates/ICINGAWireFrameMaster.php            |    2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/config/routing.xml b/app/config/routing.xml
index 9e010f0..8fd1e1c 100644
--- a/app/config/routing.xml
+++ b/app/config/routing.xml
@@ -4,7 +4,7 @@
 		<routes>
 		
 			<!-- INDEX -->
-			<route name="index_page" pattern="^/$" module="Web" action="Index" />
+			<route name="index_page" pattern="^/$" module="Web" action="Icinga.PortalView" />
 		
 			<!-- ICINGAAppKit routes -->
 			<route name="appkit" pattern="^/appkit" module="%actions.default_module%">
diff --git a/app/modules/Cronks/templates/System/CronkPortalSuccess.php b/app/modules/Cronks/templates/System/CronkPortalSuccess.php
index c3e2f59..ba1311a 100644
--- a/app/modules/Cronks/templates/System/CronkPortalSuccess.php
+++ b/app/modules/Cronks/templates/System/CronkPortalSuccess.php
@@ -176,13 +176,13 @@ var container = new Ext.Panel({
 		id: 'south-frame',
 		layout: 'fit',
 		height: 150,
-		style: {
-			'margin-top': '5px'
+		defaults: {
+			border: false
 		}
 	}, { // -- CENTER
 		region: 'center',
 		// title: 'MyView',
-        margins: '0 0 0 5',
+        margins: '0 0 10 5',
         cls: 'cronk-center-content',
         id: 'center-frame',
         layout: 'fit',
@@ -196,7 +196,7 @@ var container = new Ext.Panel({
         maxSize: 400,
         width: 200,
         collapsible: true,
-        margins: '0 0 0 0',
+        margins: '0 0 10 0',
         
         layout: {
         	type: 'accordion',
@@ -218,12 +218,12 @@ var container = new Ext.Panel({
 
 // Resize the container on windowResize
 Ext.EventManager.onWindowResize(function(w,h) {
-	this.setHeight(h-80);
+	this.setHeight(h-65);
 	this.doLayout();
 }, container);
 
 // Set initial size
-container.setHeight(Ext.lib.Dom.getViewHeight()-80);
+container.setHeight(Ext.lib.Dom.getViewHeight()-65);
 
 // Render the container
 container.render("<?php echo $parentid; ?>");
diff --git a/app/modules/Cronks/templates/System/PortalHelloSuccess.php b/app/modules/Cronks/templates/System/PortalHelloSuccess.php
index 6636a6b..0ffcc00 100644
--- a/app/modules/Cronks/templates/System/PortalHelloSuccess.php
+++ b/app/modules/Cronks/templates/System/PortalHelloSuccess.php
@@ -1,8 +1,10 @@
-<br/>
-<h1>Welcome to the Icinga cronk portal!</h1><br/>
-<p>
-This is our alpha release. Feel free to poke around and don't forget to visit the project homepage to post bug advisories or feature requests.<br/><br/>
-What are Cronks? Simply put, they are widgets for the Icinga web front end - with a cooler name.<br/><br/>
-Have fun<br/><br/>
-Team Icinga
-</p>
\ No newline at end of file
+<div style="padding: 5px;">
+	<br/>
+	<h1>Welcome to the Icinga cronk portal!</h1><br/>
+	<p>
+	This is our alpha release. Feel free to poke around and don't forget to visit the project homepage to post bug advisories or feature requests.<br/><br/>
+	What are Cronks? Simply put, they are widgets for the Icinga web front end - with a cooler name.<br/><br/>
+	Have fun<br/><br/>
+	- <a href="http://www.icinga.org/">Team Icinga</a> -
+	</p>
+</div>
\ No newline at end of file
diff --git a/app/templates/ICINGAWireFrameMaster.php b/app/templates/ICINGAWireFrameMaster.php
index eed67e3..32ad312 100755
--- a/app/templates/ICINGAWireFrameMaster.php
+++ b/app/templates/ICINGAWireFrameMaster.php
@@ -5,7 +5,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 		<base href="<?php echo $ro->getBaseHref(); ?>" />
 		<title><?php if(isset($t['title'])) echo htmlspecialchars($t['title']) . ' - '; echo AgaviConfig::get('core.app_name'); ?></title>
-		<link rel="SHORTCUT ICON" href="images/icinga/favicon.ico">
+		<link rel="shortcut icon" type="image/x-icon" href="images/icinga/favicon.ico" />
 		<?php echo $slots['additional_header_data']; ?>
 		
 	</head>





More information about the icinga-checkins mailing list