[icinga-checkins] icinga.org: icinga-web/mhein/default: * My fixes

git at icinga.org git at icinga.org
Wed Jul 21 16:36:07 CEST 2010


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jul 20 17:59:08 2010 +0200

* My fixes

---

 app/modules/AppKit/lib/js/Layout.js                |    2 +-
 app/modules/AppKit/templates/Ext/HeaderSuccess.php |    8 +-----
 .../AppKit/templates/User/PreferencesSuccess.php   |    4 +-
 .../templates/Widgets/AddHeaderDataSuccess.php     |    4 +-
 .../templates/System/ObjectSearchSuccess.php       |    2 +-
 .../Cronks/templates/System/PortalViewSuccess.php  |    2 +-
 .../System/ViewProc/js/IcingaCommandHandler.js     |    2 +-
 etc/make/files.mk                                  |   24 ++++++++++---------
 8 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/modules/AppKit/lib/js/Layout.js b/app/modules/AppKit/lib/js/Layout.js
index 18aac9c..c9860eb 100755
--- a/app/modules/AppKit/lib/js/Layout.js
+++ b/app/modules/AppKit/lib/js/Layout.js
@@ -29,7 +29,7 @@ Ext.onReady(function() {
 				center	: 'viewport-center',
 			 	north	: 'viewport-north',
 			 	menu	: 'viewport-menu',
-			 	coel	: 'content', 
+			 	coel	: 'content'
 			},
 			
 			constructor : function() {
diff --git a/app/modules/AppKit/templates/Ext/HeaderSuccess.php b/app/modules/AppKit/templates/Ext/HeaderSuccess.php
index c496370..47fbdee 100755
--- a/app/modules/AppKit/templates/Ext/HeaderSuccess.php
+++ b/app/modules/AppKit/templates/Ext/HeaderSuccess.php
@@ -85,12 +85,8 @@ Ext.onReady(function() {
 				height: 30,
 				border: false,
 				cls: 'icinga-link',
-				items: {
-			        autoEl: {
-			            tag: 'img',
-			            style: 'width: 25px; height: 25px; margin: 2px auto; display: block;',
-			            src: AppKit.c.path + '/images/icinga/idot-small.png'
-			        },
+				items: {		  
+		            style: 'background-image: url('+AppKit.c.path + '/images/icinga/idot-small.png);background-repeat:no-repeat;width: 27px;text-align:center; height: 30px; margin-left: 15px;margin-top:0px; display: block;',
 			        listeners: {
 			        	click: function() {
 			        		AppKit.notifyMessage('Picture', ' ... successfully clicked');
diff --git a/app/modules/AppKit/templates/User/PreferencesSuccess.php b/app/modules/AppKit/templates/User/PreferencesSuccess.php
index eb8b1fd..a1958f8 100755
--- a/app/modules/AppKit/templates/User/PreferencesSuccess.php
+++ b/app/modules/AppKit/templates/User/PreferencesSuccess.php
@@ -56,7 +56,7 @@ Ext.onReady(function() {
 							}
 						});
 					}
-				}],
+				}]
 			},{
 				title:_('Change Password'),
 				xtype: 'fieldset',
@@ -242,7 +242,7 @@ Ext.onReady(function() {
 											value: Ext.getCmp("value_"+id).getValue()
 									  }));
 							Ext.getCmp('win_'+id).close();
-						},
+						}
 					}]
 				})
 			});
diff --git a/app/modules/AppKit/templates/Widgets/AddHeaderDataSuccess.php b/app/modules/AppKit/templates/Widgets/AddHeaderDataSuccess.php
index 491189c..2fe2f9f 100755
--- a/app/modules/AppKit/templates/Widgets/AddHeaderDataSuccess.php
+++ b/app/modules/AppKit/templates/Widgets/AddHeaderDataSuccess.php
@@ -36,7 +36,7 @@
 		<!-- JS included files -->
 	<?php foreach ($t['js_files'] as $js_file) { ?>
 		<script type="text/javascript" src="<?php echo $js_file; ?>">
-		<!-- // <![CDATA[
+		//<!-- // <![CDATA[
 		// NO INLINE SCRIPT
 		// ]]> -->
 		</script>
@@ -46,7 +46,7 @@
 <?php if (is_array($t['js_raw']) && count($t['js_raw'])) { ?>
 		<!-- RAW js code -->
 		<script type="text/javascript">
-		<!-- // <![CDATA[
+		//<!-- // <![CDATA[
 <?php foreach ($t['js_raw'] as $js_name => $js_raw) { ?>
 
 			// start JS data: <?php echo $js_name; ?>
diff --git a/app/modules/Cronks/templates/System/ObjectSearchSuccess.php b/app/modules/Cronks/templates/System/ObjectSearchSuccess.php
index 29db20a..b5f327d 100755
--- a/app/modules/Cronks/templates/System/ObjectSearchSuccess.php
+++ b/app/modules/Cronks/templates/System/ObjectSearchSuccess.php
@@ -315,5 +315,5 @@ Cronk.util.initEnvironment("<?php echo $parentid = $rd->getParameter('parentid')
 	this.add(oSearch);
 	this.doLayout();
 });
--->
+//-->
 </script>
diff --git a/app/modules/Cronks/templates/System/PortalViewSuccess.php b/app/modules/Cronks/templates/System/PortalViewSuccess.php
index 640cdcf..c124958 100755
--- a/app/modules/Cronks/templates/System/PortalViewSuccess.php
+++ b/app/modules/Cronks/templates/System/PortalViewSuccess.php
@@ -124,7 +124,7 @@ Cronk.util.initEnvironment("<?php echo $parentid = $rd->getParameter('parentid')
 
 							notifyDrop: function(dd, e, data) {
 								var params = {
-									'p[parentid]': id,
+									'p[parentid]': id
 								};
 								
 								if (data.dragData.parameter) {
diff --git a/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js b/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js
index f969958..77bc0f2 100755
--- a/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js
+++ b/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js
@@ -251,7 +251,7 @@ IcingaCommandHandler.prototype = {
 						text: _('Abort'),
 						iconCls: 'silk-cross',
 						handler: function(b, e) { oWin.close(); }
-					}],
+					}]
 				});
 				
 				// This fixes the webkit (safari, chrome) width issue ...
diff --git a/etc/make/files.mk b/etc/make/files.mk
index ef52300..11d3504 100755
--- a/etc/make/files.mk
+++ b/etc/make/files.mk
@@ -454,17 +454,19 @@ inc-install-files:
 	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/config/validators.xml $(DESTDIR)$(prefix)/app/modules/Cronks/config/validators.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/modules/Cronks/data
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-hostgroup-summary-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-host-history-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-host-history-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-host-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-host-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-log-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-log-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-notification-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-notification-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-servicegroup-summary-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-service-history-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-service-history-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-service-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-service-template.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-tactical-overview-template-cv.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-tactical-overview-template-cv.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-tactical-overview-template-hg.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-tactical-overview-template-hg.xml
-	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/icinga-tactical-overview-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/icinga-tactical-overview-template.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/to	
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-hostgroup-summary-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-hostgroup-summary-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-host-history-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-host-history-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-host-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-host-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-log-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-log-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-notification-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-notification-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-servicegroup-summary-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-servicegroup-summary-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-service-history-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-service-history-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/grid/icinga-service-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/grid/icinga-service-template.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-cv.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-cv.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-hg.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/to/icinga-tactical-overview-template-hg.xml
+	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/data/xml/to/icinga-tactical-overview-template.xml $(DESTDIR)$(prefix)/app/modules/Cronks/data/xml/to/icinga-tactical-overview-template.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/modules/Cronks/lib
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/app/modules/Cronks/lib/action
 	$(INSTALL) -m 644 $(INSTALL_OPTS) app/modules/Cronks/lib/action/CronksBaseAction.class.php $(DESTDIR)$(prefix)/app/modules/Cronks/lib/action/CronksBaseAction.class.php





More information about the icinga-checkins mailing list