dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2638
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-01-19 13:40:41 +0100
message:
  Fixed bug 'inappropriate-inmemory-warning'
modified:
  dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/javascript/intro.js
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/redirect.vm


--
lp:dhis2
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

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml	2011-01-19 12:40:41 +0000
@@ -11,6 +11,7 @@
     <action name="redirect" class="org.hisp.dhis.wp.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-portal/redirect.vm</param>
+      <param name="javascripts">javascript/intro.js</param>
     </action>
     
     <action name="intro" class="org.hisp.dhis.wp.action.NoAction">

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/javascript/intro.js'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/javascript/intro.js	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/javascript/intro.js	2011-01-19 12:40:41 +0000
@@ -3,3 +3,8 @@
 {
   $( "div#intro" ).fadeIn( 1500 );
 });
+
+function redirect()
+{
+	window.location = redirectUrl;
+}

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/redirect.vm'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/redirect.vm	2010-12-13 14:00:57 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/redirect.vm	2011-01-19 12:40:41 +0000
@@ -1,19 +1,24 @@
 
 <script type="text/javascript">
-function redirect()
-{
+var redirectUrl;
+
 #if ( $startModule && $auth.hasAccess( $startModule, "index" ) )
-	window.location.href = "../${startModule}/index.action";
+	redirectUrl = "../${startModule}/index.action";
 #else
-    window.location.href = "intro.action";
+	redirectUrl = "intro.action";
 #end
-}
+</script>
 
 #if ( !$inMemoryDatabase )
+
+<script type="text/javascript">
 redirect();
-#end
 </script>
 
+#else
+
 <span id="info">$i18n.getString( "in_memory_notification" )</span>
 
-<p><input type="button" value="$i18n.getString( 'proceed' )" onclick="redirect()"></p>
\ No newline at end of file
+<p><input type="button" value="$i18n.getString( 'proceed' )" onclick="redirect()"></p>
+
+#end
\ No newline at end of file