dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6161
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-03-04 16:54:11 +0100
message:
  Added missing index link to scheduling
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/attribute.png
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  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/menu.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/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-01-15 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-03-04 15:54:11 +0000
@@ -14,12 +14,8 @@
 <h2>$i18n.getString( "reports" )&nbsp;</h2>
 <ul>
     <li><a href="reportSelect.action">$i18n.getString( "program_summary" )&nbsp;</a></li> 
-	<li><a href="showSingleEventReportForm.action"> $i18n.getString( "anonymous_event_reports" )&nbsp;</a></li> 	    
-</ul>
-
-<h2>$i18n.getString( "activity_planning" )&nbsp;</h2>
-<ul>
-    <li><a href="visitplan.action">$i18n.getString( "visit_plan" )&nbsp;</a></li>     
+	<li><a href="showSingleEventReportForm.action"> $i18n.getString( "anonymous_event_reports" )&nbsp;</a></li>
+	<li><a href="visitplan.action">$i18n.getString( "visit_plan" )&nbsp;</a></li>
 </ul>
 
 <h2>$i18n.getString( "case_aggregation" )&nbsp;</h2>

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/attribute.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/attribute.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/attribute.png	2012-03-04 15:54:11 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-03-01 08:45:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-03-04 15:54:11 +0000
@@ -100,6 +100,7 @@
 intro_constant=Create constants which can be included in expressions of indicator and validation rules.
 intro_attribute=Create and update dynamic attributes. Attributes can be used for data elements, indicators, organisation units and users.
 intro_option_set=Create option sets which can be included in data elements and produce drop-down lists in data entry forms.
+intro_scheduling=Manage scheduled tasks such as data mart exports, where you can set period types, aggregation level and frequency.
 expression_is_empty=Expression is empty
 dataelement_id_not_numeric=Data element identifier must be a number
 category_option_combo_id_not_numeric=Category option combo identifier must be a number

=== 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-03-04 13:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2012-03-04 15:54:11 +0000
@@ -21,8 +21,9 @@
     #introListImgItem( "lockException.action" "lock_exception" "datalocking" )
     #introListImgItem( "zeroValueStorageManagement.action" "zero_storage_management" "zerovaluestorage" )
 	#introListImgItem( "getMinMaxValidationParams.action" "min_max_value_generation" "minmaxvaluegeneration" ) 
-    #introListImgItem( "showCache.action" "cache_statistics" "cachestatistics" )
     #introListImgItem( "constant.action" "constant" "constant" )
 	#introListImgItem( "optionSet.action" "option_set" "resource" )
-	#introListImgItem( "attribute.action" "attribute" "constant" )
+    #introListImgItem( "showCache.action" "cache_statistics" "cachestatistics" )
+	#introListImgItem( "attribute.action" "attribute" "attribute" )
+	#introListImgItem( "viewScheduledTasks.action" "scheduling" "scheduling" )
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.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/menu.vm	2012-03-04 15:54:11 +0000
@@ -18,16 +18,11 @@
 	<li><a href="constant.action">$i18n.getString( "constant")&nbsp;</a></li>
 	<li><a href="optionSet.action">$i18n.getString( "option_set")&nbsp;</a></li>
 	<li><a href="showCache.action">$i18n.getString( "cache_statistics" )&nbsp;</a></li>
-</ul>
-
-<h2>$i18n.getString( "dynamic_attributes" )&nbsp;</h2>
-
-<ul>
-	<li><a href="attribute.action">$i18n.getString( "attribute" )&nbsp;</a></li>
+	<li><a href="attribute.action">$i18n.getString( "attribute" )&nbsp;</a></li>	
 </ul>
 
 <h2>$i18n.getString( "scheduling" )&nbsp;</h2>
 
 <ul>
 	<li><a href="viewScheduledTasks.action">$i18n.getString( "scheduling" )</a></li>
-</ul>
+</ul>
\ No newline at end of file