=== removed directory 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/META-INF'
=== removed file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/META-INF/MANIFEST.MF'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/META-INF/MANIFEST.MF	2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/META-INF/MANIFEST.MF	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2009-10-26 15:39:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2009-11-03 10:54:57 +0000
@@ -21,7 +21,7 @@
 reset 												= Reset
 org_unit											= Organisation Unit
 org_unit_group 										= Organisation Unit Group
-hierarchy_operations_menu 							= Hierarchy operations
+hierarchy_operations_menu 							= Hierarchy Operations
 org_unit_level										= Organisation Unit Level
 org_unit_management 								= Organisation unit management
 add_new 											= Add new
@@ -118,5 +118,8 @@
 select_all_in_group									= Select All in Group
 unselect_all_in_group								= Un-Select All in Group
 unselect_all										= Un-Select All
-
-
+intro_org_unit										= Create, modify, view and delete organisation units.
+intro_org_unit_group								= Create, modify, view and delete organisation unit groups.
+intro_org_unit_group_set							= Create, modify, view and delete organisation unit group sets.
+intro_org_unit_level								= Create, modify, view and delete organisation unit levels.
+intro_hierarchy_operations_menu						= Move organisation units in the hierarchy.
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2009-10-26 15:39:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2009-11-03 10:54:57 +0000
@@ -10,8 +10,9 @@
 		namespace="/dhis-web-maintenance-organisationunit">
 
 		<action name="index" class="org.hisp.dhis.oum.action.NoAction">
-			<result name="success" type="redirect">organisationUnit.action
-			</result>
+            <result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-maintenance-organisationunit/index.vm</param>
+            <param name="menu">/dhis-web-maintenance-organisationunit/menu.vm</param>
 		</action>
 
 		<!-- OrganisationUnit -->

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2009-11-03 10:54:57 +0000
@@ -167,4 +167,8 @@
 organisation_units = Organisation units
 confirm_delete_role = Are you sure you want to remove the user role?
 authorities = Authorities
-excel_reporting	= Excel Reporting
\ No newline at end of file
+excel_reporting	= Excel Reporting
+intro_user = Create, modify, view and delete users.
+intro_user_by_orgunit = Create, modify, view and delete users for a given organisation unit.
+intro_user_role = Create, modify, view and delete user roles. A user role has a set of authorities.
+intro_change_password = Change the password for users.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2009-11-03 10:54:57 +0000
@@ -12,7 +12,9 @@
     <!-- User -->
     
     <action name="index" class="org.hisp.dhis.user.action.NoAction">
-      <result name="success" type="redirect">alluser.action</result>
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-maintenance-user/index.vm</param>  
+      <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
     </action>
 
     <action name="changePassword" class="org.hisp.dhis.user.action.ChangePasswordAction">

=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/META-INF'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/META-INF/MANIFEST.MF'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/META-INF/MANIFEST.MF	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/META-INF/MANIFEST.MF	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm	2009-06-18 12:45:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm	2009-11-03 10:54:57 +0000
@@ -1,3 +1,4 @@
+
 <h3>$i18n.getString( "user_role_management" )</h3>
 
 <table style="width:100%">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2009-09-26 09:41:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2009-11-03 10:54:57 +0000
@@ -1,4 +1,4 @@
-
+
 <h3>$i18n.getString( "edit_user_role" )</h3>
 
 <form id="updateRoleForm" action="updateRole.action" method="post" onsubmit="return validateUpdateRole()">

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2009-08-21 16:44:05 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2009-11-03 10:54:57 +0000
@@ -273,4 +273,11 @@
 year = Year
 total = Total
 tally_sheet_report = Tally Sheet report
-
+intro_standard_report = View and add standard reports. These reports can be based on report tables and can be designed in BIRT or JasperReports.
+intro_dataset_report = View data set reports. These reports are based on data entry screens and will produce a report with aggregated data.
+intro_static_report = View and add static reports. These reports can be uploaded documents or URLs on the web.
+intro_tally_sheet_generator = Generate tally sheets, which can be printed and used to collect data in the field.
+intro_chart = View and add charts. Charts are based on indicators and either organisation units or periods.
+intro_pivot_table = Browse pivot tables, which can be pivoted on any of the indicator, organisation unit and period dimensions.
+intro_report_table = Add and generate report tables. Report tables are highly customizable database tables which can be used as basis for reports.
+intro_data_completeness = Browse the submission rates of data sets. This can be viewed by organisation unit and period, and later reported to PDF and Workbook.

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2009-10-13 14:39:39 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2009-11-03 10:54:57 +0000
@@ -9,7 +9,9 @@
   <package name="dhis-web-reporting" extends="dhis-web-commons" namespace="/dhis-web-reporting">
     
     <action name="index" class="org.hisp.dhis.reporting.action.NoAction">
-      <result name="success" type="redirect">displayViewReportFormVerifyConfiguration.action</result>
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-reporting/index.vm</param>
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
     </action>
     
     <!-- Document -->

=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/META-INF'
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/META-INF/MANIFEST.MF'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/META-INF/MANIFEST.MF	2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/META-INF/MANIFEST.MF	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2009-10-10 14:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2009-11-03 10:54:57 +0000
@@ -133,4 +133,8 @@
 select_parent_organisation_unit = Select parent organisation unit
 outlier_analysis = Outlier Analysis
 outlier_analysis_search_result = Search result for outlier analysis
-no_outlier_values_found = No outlier values found
\ No newline at end of file
+no_outlier_values_found = No outlier values found
+intro_validation_rule = Add, modify, view and delete validation rules. A validation rule defines certain criterias. Anomalies can be discovered by running validation rules against the data.
+intro_validation_rule_group = Add, modify, view and delete validation rule groups. Provides the ability to group and run validation rules together.
+intro_run_validation = Run validation rules in order to unveil anomalies and errors in the data in the database.
+intro_outlier_analysis = Perform analysis of potential outlier values. Outlier values can be examined and checked for data capture errors.

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2009-10-10 14:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2009-11-03 10:54:57 +0000
@@ -10,7 +10,9 @@
     namespace="/dhis-web-validationrule">
     
     <action name="index" class="org.hisp.dhis.validationrule.action.NoAction">
-      <result name="success" type="redirect">showValidationRuleForm.action</result>
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-validationrule/index.vm</param>
+      <param name="menu">/dhis-web-validationrule/menu.vm</param>
     </action>
     
     <!-- ValidationRule CRUD operations -->

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/outlierForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/outlierForm.vm	2009-10-10 14:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/outlierForm.vm	2009-11-03 10:54:57 +0000
@@ -77,7 +77,7 @@
 	</tr>
 	<tr>
 		<td colspan="2">
-			<div id="selectionTree" style="width:50em;height:30em;overflow:auto;/*border:1px solid #cccccc*/"></div>
+			<div id="selectionTree" style="width:40em;height:20em;overflow:auto;/*border:1px solid #cccccc*/"></div>
 			<script type="text/javascript">
 
           		selectionTreeSelection.setMultipleSelectionAllowed( true );