[icinga-checkins] icinga.org: icinga-web/master: * Splitted the xml templates into directories

git at icinga.org git at icinga.org
Fri Jul 16 11:08:07 CEST 2010


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Jul 16 11:04:34 2010 +0200

* Splitted the xml templates into directories

---

 app/modules/Cronks/config/module.xml               |   40 ++++++++++++--------
 app/modules/Cronks/data/README                     |   12 ++++++
 .../{ => grid}/icinga-host-history-template.xml    |    0 
 .../data/xml/{ => grid}/icinga-host-template.xml   |    0 
 .../icinga-hostgroup-summary-template.xml          |    0 
 .../data/xml/{ => grid}/icinga-log-template.xml    |    0 
 .../{ => grid}/icinga-notification-template.xml    |    0 
 .../{ => grid}/icinga-service-history-template.xml |    0 
 .../xml/{ => grid}/icinga-service-template.xml     |    0 
 .../icinga-servicegroup-summary-template.xml       |    0 
 .../icinga-tactical-overview-template-cv.xml       |    0 
 .../icinga-tactical-overview-template-hg.xml       |    0 
 .../{ => to}/icinga-tactical-overview-template.xml |    0 
 .../System/StaticContentSuccessView.class.php      |    2 +-
 .../ViewProc/MetaInformationSuccessView.class.php  |    2 +-
 .../views/System/ViewProcSuccessView.class.php     |    4 +-
 16 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/app/modules/Cronks/config/module.xml b/app/modules/Cronks/config/module.xml
index 29458e7..6931637 100755
--- a/app/modules/Cronks/config/module.xml
+++ b/app/modules/Cronks/config/module.xml
@@ -6,11 +6,26 @@
 			<settings>
 				<setting name="title">Cronks Module</setting>
 				<setting name="version">1.0</setting>
-				
-				<setting name="xml.path">%core.module_dir%/Cronks/data/xml</setting>
-				
+
+				<!--
+					* Path to our grid templates
+				-->
+				<setting name="xml.path.grid">%core.module_dir%/Cronks/data/xml/grid</setting>
+
+				<!--
+					* Path to our tactical overview templates
+				-->
+				<setting name="xml.path.to">%core.module_dir%/Cronks/data/xml/to</setting>
+
+				<!--
+					* How log we preload the portal (showing the funny throbber, idling arround)
+				-->
 				<setting name="portal.loadmasktimeout">2300</setting>
-				
+
+				<!--
+					* Categories for the cronks
+					The content depends on cronks.xml
+				-->
 				<setting name="categories">
 					<ae:parameter name="core">
 						<ae:parameter name="title">Core components</ae:parameter>
@@ -30,23 +45,16 @@
 						<ae:parameter name="visible">true</ae:parameter>
 					</ae:parameter>
 				</setting>
-				
+
+				<!--
+					* Include a seperated cronks.xml
+					Keep this configuration small
+				-->
 				<setting name="cronks">
 					<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 					href="cronks.xml#xpointer(setting/node())" />
 				</setting>
 				
-				<!--
-				
-				<setting name="dynamicscripts">
-					<ae:parameter name="AppKit.Ext.grid.IcingaColumnRenderer">%core.module_dir%/Cronks/templates/System/ViewProc/js/IcingaColumnRenderer.js</ae:parameter>
-					<ae:parameter name="Cronks.CommandHandler">%core.module_dir%/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js</ae:parameter>
-					<ae:parameter name="Cronks.JitStatusMap">%core.module_dir%/Cronks/templates/System/js/JitStatusMap.js</ae:parameter>
-					<ae:parameter name="Cronks.CronkTrigger">%core.module_dir%/Cronks/templates/System/js/CronkTrigger.js</ae:parameter>
-				</setting>
-				
-				-->
-			
 			</settings>
 		</module>
 		
diff --git a/app/modules/Cronks/data/README b/app/modules/Cronks/data/README
new file mode 100644
index 0000000..2825794
--- /dev/null
+++ b/app/modules/Cronks/data/README
@@ -0,0 +1,12 @@
+Where are my templates?
+
+We splitted the xml templates depending on their structures into two folders:
+
+ * to: TacticalOverview templates
+ * grid: Data grids
+
+The directories can be configured in ../conf/module.xml
+
+Kind regards,
+ the icinga development team
+
diff --git a/app/modules/Cronks/data/xml/icinga-host-history-template.xml b/app/modules/Cronks/data/xml/grid/icinga-host-history-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-host-history-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-host-history-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-host-template.xml b/app/modules/Cronks/data/xml/grid/icinga-host-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-host-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-host-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml b/app/modules/Cronks/data/xml/grid/icinga-hostgroup-summary-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-hostgroup-summary-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-log-template.xml b/app/modules/Cronks/data/xml/grid/icinga-log-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-log-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-log-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-notification-template.xml b/app/modules/Cronks/data/xml/grid/icinga-notification-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-notification-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-notification-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-service-history-template.xml b/app/modules/Cronks/data/xml/grid/icinga-service-history-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-service-history-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-service-history-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-service-template.xml b/app/modules/Cronks/data/xml/grid/icinga-service-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-service-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-service-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml b/app/modules/Cronks/data/xml/grid/icinga-servicegroup-summary-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml
rename to app/modules/Cronks/data/xml/grid/icinga-servicegroup-summary-template.xml
diff --git a/app/modules/Cronks/data/xml/icinga-tactical-overview-template-cv.xml b/app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-cv.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-tactical-overview-template-cv.xml
rename to app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-cv.xml
diff --git a/app/modules/Cronks/data/xml/icinga-tactical-overview-template-hg.xml b/app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-hg.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-tactical-overview-template-hg.xml
rename to app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-hg.xml
diff --git a/app/modules/Cronks/data/xml/icinga-tactical-overview-template.xml b/app/modules/Cronks/data/xml/to/icinga-tactical-overview-template.xml
similarity index 100%
rename from app/modules/Cronks/data/xml/icinga-tactical-overview-template.xml
rename to app/modules/Cronks/data/xml/to/icinga-tactical-overview-template.xml
diff --git a/app/modules/Cronks/views/System/StaticContentSuccessView.class.php b/app/modules/Cronks/views/System/StaticContentSuccessView.class.php
index 664e858..ce5c84f 100755
--- a/app/modules/Cronks/views/System/StaticContentSuccessView.class.php
+++ b/app/modules/Cronks/views/System/StaticContentSuccessView.class.php
@@ -24,7 +24,7 @@ class Cronks_System_StaticContentSuccessView extends CronksBaseView
 		
 		$templateFile = sprintf(
 			'%s/%s.xml', 
-			AgaviConfig::get('modules.cronks.xml.path'), 
+			AgaviConfig::get('modules.cronks.xml.path.to'), 
 			$rd->getParameter('template')
 		);
 
diff --git a/app/modules/Cronks/views/System/ViewProc/MetaInformationSuccessView.class.php b/app/modules/Cronks/views/System/ViewProc/MetaInformationSuccessView.class.php
index 1b0c864..f497dd6 100755
--- a/app/modules/Cronks/views/System/ViewProc/MetaInformationSuccessView.class.php
+++ b/app/modules/Cronks/views/System/ViewProc/MetaInformationSuccessView.class.php
@@ -12,7 +12,7 @@ class Cronks_System_ViewProc_MetaInformationSuccessView extends CronksBaseView
 	public function executeJson(AgaviRequestDataHolder $rd) {
 		$template_file = sprintf(
 			'%s/%s.xml', 
-			AgaviConfig::get('modules.cronks.xml.path'), 
+			AgaviConfig::get('modules.cronks.xml.path.grid'), 
 			$rd->getParameter('template')
 		);
 		
diff --git a/app/modules/Cronks/views/System/ViewProcSuccessView.class.php b/app/modules/Cronks/views/System/ViewProcSuccessView.class.php
index 3ee1b56..aa0dc02 100755
--- a/app/modules/Cronks/views/System/ViewProcSuccessView.class.php
+++ b/app/modules/Cronks/views/System/ViewProcSuccessView.class.php
@@ -17,7 +17,7 @@ class Cronks_System_ViewProcSuccessView extends CronksBaseView {
 
 		$template_file = sprintf(
 			'%s/%s.xml', 
-			AgaviConfig::get('modules.cronks.xml.path'), 
+			AgaviConfig::get('modules.cronks.xml.path.grid'), 
 			$rd->getParameter('template')
 		);
 		
@@ -41,7 +41,7 @@ class Cronks_System_ViewProcSuccessView extends CronksBaseView {
 	public function executeJson(AgaviRequestDataHolder $rd) {
 		$template_file = sprintf(
 			'%s/%s.xml', 
-			AgaviConfig::get('modules.cronks.xml.path'), 
+			AgaviConfig::get('modules.cronks.xml.path.grid'), 
 			$rd->getParameter('template')
 		);
 		





More information about the icinga-checkins mailing list