[icinga-checkins] icinga.org: icinga-web/jmosshammer/principal: * Welcome cronk show the real base version now

git at icinga.org git at icinga.org
Thu Apr 29 13:03:25 CEST 2010


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Apr 15 10:58:34 2010 +0200

* Welcome cronk show the real base version now

---

 .../Cronks/templates/System/PortalHelloSuccess.php |   30 ++++++++++++++------
 pub/styles/Icinga.css                              |    2 +
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/modules/Cronks/templates/System/PortalHelloSuccess.php b/app/modules/Cronks/templates/System/PortalHelloSuccess.php
index 0ffcc00..11cfe9a 100644
--- a/app/modules/Cronks/templates/System/PortalHelloSuccess.php
+++ b/app/modules/Cronks/templates/System/PortalHelloSuccess.php
@@ -1,10 +1,22 @@
-<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>
+<?php
+	function _GV($item) {
+		return AgaviConfig::get('de.icinga.appkit.version.'. $item);
+	}
+	
+	$version_string = vsprintf('%d.%d.%d-%s', array_map("_GV", array('major', 'minor', 'patch', 'extension')));
+	$version_date = AgaviConfig::get('de.icinga.appkit.version.releasedate');
+	$copy =  AgaviConfig::get('de.icinga.appkit.version.copyright');
+?>
+<div style="margin: 10px auto; padding: 10px 10px;">
+
+	<h1>Welcome to Icinga <?php echo $version_string; ?></h1>
+	
+	<p>Feel free to poke around and don't forget to visit the project homepage 	to post bug advisories or feature requests.</p>
+	
+	<p>What are Cronks? Simply put, they are widgets for the Icinga web front end - with a cooler name.</p>
+	
+	<p>Have fun!</p>
+	
+	<p><?php echo $tm->_d($version_date); ?> - <a href="http://www.icinga.org/"><?php echo $copy; ?></a></p>
+	
 </div>
\ No newline at end of file
diff --git a/pub/styles/Icinga.css b/pub/styles/Icinga.css
index 1061e30..e5e5764 100644
--- a/pub/styles/Icinga.css
+++ b/pub/styles/Icinga.css
@@ -9,6 +9,8 @@ p.legal {
 	margin: 10px auto;	
 }
 
+p { margin: 15px auto; }
+
 /** MISC **/
 
 div#icinga-portal-loading-mask {





More information about the icinga-checkins mailing list