dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 60
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Sat 2009-03-14 08:19:36 +0100
message:
  Implemented link to home page. The starting module/home page can be defined in the settings module as a system setting. After setting the start module to something else than the portal the DHIS 2 logo in the top left coner will be a link to this module.
modified:
  dhis-2/dhis-support/dhis-support-webwork/src/main/java/org/hisp/dhis/webwork/interceptor/WebWorkSystemSettingInterceptor.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm

=== modified file 'dhis-2/dhis-support/dhis-support-webwork/src/main/java/org/hisp/dhis/webwork/interceptor/WebWorkSystemSettingInterceptor.java'
--- dhis-2/dhis-support/dhis-support-webwork/src/main/java/org/hisp/dhis/webwork/interceptor/WebWorkSystemSettingInterceptor.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-support/dhis-support-webwork/src/main/java/org/hisp/dhis/webwork/interceptor/WebWorkSystemSettingInterceptor.java	2009-03-14 07:19:36 +0000
@@ -38,6 +38,7 @@
 import static org.hisp.dhis.options.SystemSettingManager.KEY_APPLICATION_TITLE;
 import static org.hisp.dhis.options.SystemSettingManager.KEY_FLAG;
 import static org.hisp.dhis.options.SystemSettingManager.KEY_FORUM_INTEGRATION;
+import static org.hisp.dhis.options.SystemSettingManager.KEY_START_MODULE;
 
 /**
  * @author Lars Helge Overland
@@ -69,10 +70,12 @@
         String applicationTitle = (String) systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE );
         String flag = (String) systemSettingManager.getSystemSetting( KEY_FLAG );
         Boolean forumIntegration = (Boolean) systemSettingManager.getSystemSetting( KEY_FORUM_INTEGRATION );
+        String startModule = (String) systemSettingManager.getSystemSetting( KEY_START_MODULE );
         
         map.put( KEY_APPLICATION_TITLE, applicationTitle );
         map.put( KEY_FLAG, flag );
         map.put( KEY_FORUM_INTEGRATION, forumIntegration );
+        map.put( KEY_START_MODULE, startModule );
         
         invocation.getStack().push( map );
     }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2009-03-07 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2009-03-14 07:19:36 +0000
@@ -37,7 +37,7 @@
         
     <div id="header">
       <img id="header1" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_left.png">
-      <img id="header2" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png">
+      <img id="header2" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png"#if( $startModule && $startModule != "null" ) onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer"#end>
       <img id="header3" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_right.png">
 
       <img id="menuSeparator1" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">



--

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.