[icinga-checkins] icinga.org: icinga-web/elippmann/config_handlers: * Removed squishloader. css route

git at icinga.org git at icinga.org
Tue Jul 26 11:20:45 CEST 2011


Module: icinga-web
Branch: elippmann/config_handlers
Commit: 1414202fea679cb3d12136425d048192c140c7db
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=1414202fea679cb3d12136425d048192c140c7db

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Tue Jul 26 11:19:42 2011 +0200

* Removed squishloader.css route
* Added styles.css route allowing url(../images*) for module css files

refs #1548

---

 app/config/routing.xml                             |    5 ++++-
 .../actions/Widgets/HeaderDataAction.class.php     |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/config/routing.xml b/app/config/routing.xml
index c9ef8d6..95982ba 100755
--- a/app/config/routing.xml
+++ b/app/config/routing.xml
@@ -11,6 +11,10 @@
 					<xi:fallback></xi:fallback>
 				</xi:include>
 			</route>
+            
+            <route name="styles" pattern="^/styles" module="%actions.default_module%" action="Widgets.SquishLoader">
+                <route name=".css" pattern="^/css" output_type="css" />
+            </route>
 			
 			<!--
 				* AppKit routes
@@ -26,7 +30,6 @@
 
 				<route name=".squishloader" pattern="^/squishloader" action="Widgets.SquishLoader">
                     <route name=".javascript" pattern="^/javascript" output_type="javascript" />
-                    <route name=".css" pattern="^/css" output_type="css" />
                 </route>
 
 				<route name="appkit.admin" pattern="^/admin" action="Admin.Index">
diff --git a/app/modules/AppKit/actions/Widgets/HeaderDataAction.class.php b/app/modules/AppKit/actions/Widgets/HeaderDataAction.class.php
index 88c109b..ccea7b4 100755
--- a/app/modules/AppKit/actions/Widgets/HeaderDataAction.class.php
+++ b/app/modules/AppKit/actions/Widgets/HeaderDataAction.class.php
@@ -19,7 +19,7 @@ class AppKit_Widgets_HeaderDataAction extends AppKitBaseAction {
 				break;
 			case 'css':
 				$includes = array(
-					$this->getContext()->getRouting()->gen('appkit.squishloader.css')
+					$this->getContext()->getRouting()->gen('styles.css')
 				);
 
 				$resources = $this->getContext()->getModel('Resources', 'AppKit');





More information about the icinga-checkins mailing list