dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6157: Impl a system overview page which displays all modules with a short description. Accessible as st...

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sun, 04 Mar 2012 13:28:12 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 6157
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-03-04 14:26:24 +0100
message:
  Impl a system overview page which displays all modules with a short description. Accessible as start page, by clicking on logo and system title and from help menu.
removed:
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-caseentry.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dashboard-integration.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dataentry.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-importexport.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-light.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataadmin.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-datadictionary.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataset.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-mobile.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-organisationunit.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-patient.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-settings.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-user.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-mapping.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-reporting.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-validationrule.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-visualizer.png
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/welcome.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm
  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/redirect.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.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-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-02-17 17:11:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-03-04 13:26:24 +0000
@@ -1,7 +1,7 @@
 
 <h3>$i18n.getString( "dhis-web-caseentry" )</h3>
 
-<ul id="introList">
+<ul class="introList">
 	#introListImgItem( "patient.action" "patient" "patient" )
     #introListImgItem( "dataEntrySelect.action" "name_based_data_entry" "dataentry" )
 	#introListImgItem( "multipledataEntrySelect.action" "multiple_name_based_data_entry" "dataentry" )

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm	2011-06-16 08:08:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm	2012-03-04 13:26:24 +0000
@@ -2,6 +2,14 @@
 <h3>$i18n.getString( "change_log" )</h3>
 
 <dl>
+  <dt>$i18n.getString( "release" ) 2.7:</dt>
+  <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.7"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
+  <dt>$i18n.getString( "release" ) 2.6:</dt>
+  <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.6"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
+  <dt>$i18n.getString( "release" ) 2.5:</dt>
+  <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.5"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
+  <dt>$i18n.getString( "release" ) 2.4:</dt>
+  <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.4"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
   <dt>$i18n.getString( "release" ) 2.3:</dt>
   <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.3"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
   <dt>$i18n.getString( "release" ) 2.2:</dt>

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm	2012-03-04 13:26:24 +0000
@@ -0,0 +1,27 @@
+<table cellspacing="0" cellpadding="0">
+<tr>
+
+#if( $maintenanceModules && $maintenanceModules.size() > 0 )
+<td valign="top">
+<h3>$i18n.getString( "maintenance" )</h3>
+<ul class="introList" style="width:340px; margin-right:15px;">
+#foreach( $module in $maintenanceModules )
+	#introListImgItem( "${module.defaultAction}" "${module.name}" "${module.name}" )
+#end
+</ul>
+</td>
+#end
+
+#if( $serviceModules && $serviceModules.size() > 0 )
+<td valign="top">
+<h3>$i18n.getString( "services" )</h3>
+<ul class="introList" style="width:340px">
+#foreach( $module in $serviceModules )
+	#introListImgItem( "${module.defaultAction}" "${module.name}" "${module.name}" )
+#end
+</ul>
+</td>
+#end
+
+</tr>
+</table>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-03-02 18:05:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-03-04 13:26:24 +0000
@@ -418,7 +418,7 @@
 /* Intro                                                                      */
 /*----------------------------------------------------------------------------*/
 
-#introList
+.introList
 {
   display: none;
   list-style-type:none;

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-caseentry.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-caseentry.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-caseentry.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dashboard-integration.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dashboard-integration.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dashboard-integration.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dataentry.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dataentry.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-dataentry.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-importexport.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-importexport.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-importexport.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-light.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-light.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-light.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataadmin.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataadmin.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataadmin.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-datadictionary.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-datadictionary.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-datadictionary.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataset.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataset.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-dataset.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-mobile.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-mobile.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-mobile.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-organisationunit.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-organisationunit.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-organisationunit.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-patient.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-patient.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-patient.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-settings.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-settings.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-settings.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-user.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-user.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-user.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-mapping.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-mapping.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-mapping.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-reporting.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-reporting.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-reporting.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-validationrule.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-validationrule.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-validationrule.png	2012-03-04 13:26:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-visualizer.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-visualizer.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-visualizer.png	2012-03-04 13:26:24 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-02-17 09:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-03-04 13:26:24 +0000
@@ -71,6 +71,11 @@
 			window.location.href = currentPath + 'showUpdateUserAccountForm.action' + backURL;
 		});
 		
+	$( "#menuDropDownModuleOverview" ).click( function()
+		{
+			window.location.href = currentPath + 'modules.action' + backURL;
+		});
+		
 	$( "#menuDropDownWebApi" ).click( function()
 		{
 			window.location.href = '../api';
@@ -83,7 +88,7 @@
 	
 	// Intro fade in
 	
-	$( "#introList" ).fadeIn();
+	$( ".introList" ).fadeIn();
 }
 
 // -----------------------------------------------------------------------------

=== 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	2012-03-02 18:05:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-03-04 13:26:24 +0000
@@ -103,7 +103,7 @@
     #parse( "macros.vm" )
         
     <div id="header">
-      <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png"#if( $startModule ) onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer"#end>
+      <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" onclick="window.location.href='../dhis-web-commons-about/modules.action'" style="cursor:pointer">
       
       <img id="menuSeparator1" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
       <img id="menuSeparator2" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
@@ -146,12 +146,13 @@
           <li class="menuDropDownItem" id="menuDropDownChangeLog">$i18n.getString( "change_log" )&nbsp;</li>
           <li class="menuDropDownItem" id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" )&nbsp;</li>
           <li class="menuDropDownItem" id="menuDropDownUserAccount">$i18n.getString( "user_account" )&nbsp;</li>
+          <li class="menuDropDownItem" id="menuDropDownModuleOverview">$i18n.getString( "system_overview" )&nbsp;</li>
           <li class="menuDropDownItem" id="menuDropDownWebApi">$i18n.getString( "web_api" )&nbsp;</li>
           <li class="menuDropDownItem" id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" )&nbsp;</li>
         </ul>
       </div>
 	  
-      <span id="headerText">
+      <span id="headerText" onclick="window.location.href='../dhis-web-commons-about/modules.action'" style="cursor:pointer">
         #if ( $applicationTitle )
           $encoder.htmlEncode( $applicationTitle )
         #else

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-03-02 09:08:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-03-04 13:26:24 +0000
@@ -98,6 +98,7 @@
   </package>
 
   <!-- Security -->
+  
   <package name="dhis-web-commons-security" extends="dhis-web-commons" namespace="/dhis-web-commons/security">
 
     <action name="login" class="org.hisp.dhis.security.action.LoginAction">
@@ -109,6 +110,7 @@
   </package>
 
   <!-- Organisation Unit Selection Tree -->
+  
   <package name="dhis-web-commons-oust" extends="dhis-web-commons" namespace="/dhis-web-commons/oust">
 
     <action name="expandSubtree" class="org.hisp.dhis.oust.action.ExpandSubtreeAction">
@@ -840,6 +842,12 @@
       </result>
     </action>
 
+    <action name="modules" class="org.hisp.dhis.commons.action.NoAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-commons/about/modules.vm</param>
+      <param name="menu">/dhis-web-commons/about/menu.vm</param>
+    </action>
+
   </package>
 
 </struts>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-02-27 14:53:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-03-04 13:26:24 +0000
@@ -53,30 +53,44 @@
 dhis-web-caseentry=Name-Based Data Records
 dhis-web-dataentry=Data Entry
 dhis-web-importexport=Import-Export
-dhis-web-datamart=Data Mart
 dhis-web-validationrule=Data Quality
-dhis-web-dashboard=Data Analyser
-dhis-web-gis=GIS
+dhis-web-mapping=GIS
 dhis-web-reporting=Reports
 dhis-web-light=Mobile
-dhis-web-openhealth-integration=Data analysis
+dhis-web-dashboard-integration=Dashboard
+dhis-web-visualizer=Data Visualizer
+dhis-web-dashboard=Data Analyser
 dhis-web-integration=NHRM Integration
 dhis-web-reports=NRHM Reports
-dhis-web-dashboard-integration=Dashboard
-dhis-web-jforum-integration=Forum
 dhis-web-dataentry-national=Linelisting Data Entry
 dhis-web-validationrule-local-in=Validation Analysis
-dhis-web-mapping=GIS
-dhis-web-visualizer=Data Visualizer
-dhis-web-api=API
 dhis-web-survey=Survey - Target
 dhis-web-spreadsheet-reporting=Spreadsheet Reports
 dhis-web-mobile=Mobiles
 dhis-web-sms=SMS
 dhis-web-maintenance-in=Configuration
-dhis-web-excelimport=Data Integration
 dhis-web-linelisting-mp=Manpower
 
+#-- Intro ----------------------------------------------------------------------#
+
+intro_dhis-web-maintenance-datadictionary=Maintain data elements, indicators, data dictionaries, categories and groups.
+intro_dhis-web-maintenance-dataset=Maintain data sets, custom forms, sections and compulsory data elements.
+intro_dhis-web-maintenance-organisationunit=Maintain organisation units and its hierarchy, groups and group sets.
+intro_dhis-web-maintenance-user=Maintain users in terms of authorities and passwords, user roles and groups.
+intro_dhis-web-maintenance-dataadmin=Maintain resource tables, check data integrity, see statistics and more.
+intro_dhis-web-maintenance-settings=Maintain user and system settings related to appearance, notifications and more.
+intro_dhis-web-maintenance-patient=Maintain beneficiaries and programs including attributes and identifiers.
+intro_dhis-web-maintenance-mobile=Maintain data sets plus settings for mobile reporting and SMS configuration.
+intro_dhis-web-caseentry=Register beneficiaries, enter data for encounters and events and view reports.
+intro_dhis-web-dataentry=Enter data for forms either on-line or off-line, validate data and view data trends.
+intro_dhis-web-importexport=Import and export data from DHIS or third-party systems using internal and common formats.
+intro_dhis-web-validationrule=Validate and assess data quality using validation rules or statistical methods.
+intro_dhis-web-mapping=Visualize data on maps using polygons, points, symbols with customizable legends.
+intro_dhis-web-reporting=Analyse data using predefined and dynamic report tools and view reporting rates.
+intro_dhis-web-light=Access a mobile device optimized version of data entry, settings, messages and analysis.
+intro_dhis-web-dashboard-integration=Get an overview of favorite charts, reports and maps and view or write messages.
+intro_dhis-web-visualizer=Produce dynamic data visualizations as charts or tables for data elements and indicators.
+
 #-- Common ---------------------------------------------------------------------#
 
 details=Details
@@ -284,6 +298,7 @@
 mobile_client=Mobile client
 mobile_client_description=Client for data capture on mobile devices
 web_api=Web API
+system_overview=System Overview
 server_date=Server date
 
 #-- Change Log------------------------------------------------------------------#

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm	2011-03-28 14:39:48 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm	2012-03-04 13:26:24 +0000
@@ -1,7 +1,7 @@
 
 <h3>$i18n.getString( "export_to_other_systems" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "displayMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_metadata_export" "dhis14" )
     #introListImgItem( "displayDetailedMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_detailed_metadata_export" "dhis14" )
     #introListImgItem( "displayDataValueExportForm.action?exportFormat=DHIS14XML" "DHIS14_data_export" "dhis14" )

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm	2011-03-28 14:39:48 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm	2012-03-04 13:26:24 +0000
@@ -1,7 +1,7 @@
 
 <h3>$i18n.getString( "dhis14_import" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "setImportFormat.action?importFormat=DHIS14XML" "DHIS14_xml_import" "dhis14" )
     #introListImgItem( "setImportFormat.action?importFormat=DHIS14FILE" "DHIS14_file_import" "dhis14" )
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2011-05-31 12:24:47 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 
-<ul id="introList">
+<ul class="introList">
 	#introListImgItem( "setImportFormat.action?importFormat=DXF" "import" "import" )
 	#introListImgItem( "displayExternalImportMenu.action" "dhis14_import" "import" )
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2012-02-29 09:21:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "data_administration" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "displayDataBrowserForm.action" "data_browser" "databrowser" )
     #introListImgItem( "displayDataIntegrityForm.action" "data_integrity" "dataintegrity" )
     #introListImgItem( "displayDataArchiveForm.action" "data_archive" "dataarchive" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2011-05-31 12:24:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 
-<ul id="introList">
+<ul class="introList">
 	#introListImgItem( "dataElement.action" "data_element" "dataelement" )
 	#introListImgItem( "dataElementGroup.action" "data_element_group" "dataelement" )
     #introListImgItem( "dataElementGroupEditor.action" "data_element_group_editor" "dataelement" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm	2011-10-31 11:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-maintenance-dataset" ) #openHelp( "datasets" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "dataSet.action" "dataset" "dataset" )
     #introListImgItem( "section.action" "dataset_section" "dataset" )
     #introListImgItem( "displayEditorForm.action" "dataset_assignment_editor" "dataset" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties	2012-02-23 11:12:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties	2012-03-04 13:26:24 +0000
@@ -41,3 +41,4 @@
 outbound=Outbound
 api_id=API ID
 save_settings=Save Settings
+show_send_sms_form=Show send SMS form
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/welcome.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/welcome.vm	2011-11-01 06:09:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/welcome.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "mobile_configuration" ) </h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "showMobileDataSet.action" "mobile_dataset" "mobile" )
     #introListImgItem( "patientMobileSetting.action" "patient_mobile_setting" "mobile" )
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2011-05-31 12:24:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-maintenance-organisationunit" ) #openHelp( "ou_hierarchy" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "organisationUnit.action" "org_unit" "organisationunit" )
     #introListImgItem( "organisationUnitGroup.action" "org_unit_group" "organisationunit" )
     #introListImgItem( "organisationUnitGroupSet.action" "org_unit_group_set" "organisationunit" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-01-13 07:32:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-maintenance-patient" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "patientAttribute.action" "patient_attribute" "patient" )
     #introListImgItem( "patientAttributeGroup.action" "patient_attribute_group" "patient" )
     #introListImgItem( "patientIdentifierType.action" "patient_identifier_type" "patient" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-02-23 11:12:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-03-04 13:26:24 +0000
@@ -96,3 +96,4 @@
 completeness_recipients=Completeness notification recipients
 no_completeness_recipients=No completeness recipients
 use_db_locale_no_translation=Use database locale / no translation
+system_overview=System overview
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2011-12-10 12:23:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-maintenance-settings" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "userGeneralSettings.action" "user_general_settings" "usersettings" )
     #introListImgItem( "userMessageSettings.action" "user_message_settings" "usersettings" )
     #introListImgItem( "systemGeneralSettings.action" "system_general_settings" "systemsettings" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm	2011-10-06 07:05:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm	2012-03-04 13:26:24 +0000
@@ -16,12 +16,10 @@
 
 <h3>$i18n.getString( "appearance_settings" )</h3>
 
-<!-- application_title -->
 <h4>$i18n.getString( "application_title" )</h4>
 
 <p><input type="text" id="applicationTitle" name="applicationTitle" style="width:30em" maxlength="40" value="$!applicationTitle"/></p>
 
-<!-- style -->
 <h4>$i18n.getString( "style" )</h4>
 
 <select id='currentStyle' name='currentStyle' style="width:30em">
@@ -30,7 +28,6 @@
 	#end
 </select>
 
-<!-- flag -->
 <h4>$i18n.getString( "flag" )</h4>
 
 <p>
@@ -42,12 +39,11 @@
 </select>
 </p>
 
-<!-- start_page -->
 <h4>$i18n.getString( "start_page" )</h4>
 
 <p>
 <select id="startModule" name="startModule" style="width:30em">
-    <option value="NO_START_PAGE">$i18n.getString( "no_start_page" )</option>
+    <option value="NO_START_PAGE">$i18n.getString( "system_overview" )</option>
 	#foreach ( $module in $modules )
 	<option value="$module.name" #if( $module.name == $startModule )selected="selected"#end>$i18n.getString( "$module.name" )</option>
 	#end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2011-05-31 12:24:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-maintenance-user" ) #openHelp( "users" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "alluser.action" "user" "user" )
     #introListImgItem( "user.action" "user_by_orgunit" "user" )
     #introListImgItem( "allRole.action" "user_role" "user" )

=== 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	2011-01-19 12:40:41 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml	2012-03-04 13:26:24 +0000
@@ -8,19 +8,11 @@
   
   <package name="dhis-web-portal" extends="dhis-web-commons" namespace="/dhis-web-portal">
     
-    <action name="redirect" class="org.hisp.dhis.wp.action.NoAction">
+    <action name="redirect" class="org.hisp.dhis.commons.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">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-portal/intro.vm</param>
-      <param name="menu">/dhis-web-commons/about/menu.vm</param>
-      <param name="stylesheets">style/intro.css</param>
-      <param name="javascripts">javascript/intro.js</param>
-    </action>    
-    
   </package>
 </struts>

=== removed file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm	2011-06-12 10:33:24 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-
-<div id="intro" class="bold">
-    
-    <br><br>
-    
-    <img src="../images/logo_banner.png"><br><br><br><br><br>
-    
-    $i18n.getString( "welcome_to_dhis2" )<br><br>
-    
-    <a href="../dhis-web-commons-about/help.action">$i18n.getString( "get_help_here" )</a>
-    
-</div>

=== 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	2011-01-19 12:40:41 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/redirect.vm	2012-03-04 13:26:24 +0000
@@ -5,7 +5,7 @@
 #if ( $startModule && $auth.hasAccess( $startModule, "index" ) )
 	redirectUrl = "../${startModule}/index.action";
 #else
-	redirectUrl = "intro.action";
+	redirectUrl = "../dhis-web-commons-about/modules.action";
 #end
 </script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2012-02-05 13:28:15 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-reporting" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "displayViewReportForm.action" "standard_report" "standardreport" )
     #introListImgItem( "showDataSetReportForm.action" "dataset_report" "datasetreport" )
     #introListImgItem( "displayViewDataCompletenessForm.action" "reporting_rate_summary" "reportingratesummary" )

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2011-09-26 09:31:56 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2012-03-04 13:26:24 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "dhis-web-validationrule" )</h3>
 
-<ul id="introList">
+<ul class="introList">
     #introListImgItem( "validationRule.action" "validation_rule" "validationrule" )
     #introListImgItem( "showValidationRuleGroupForm.action" "validation_rule_group" "validationrule" )
     #introListImgItem( "showRunValidationForm.action" "validation_rule_analysis" "validationanalysis" )