dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11290
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-06-30 18:51:19 +0200
message:
  Added more index page icons
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/category.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groupset.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/mobilesettings.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/section.png
renamed:
  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/index.vm
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
  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/vietnam/vietnam.css
  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/struts.xml
  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-mobile/src/main/webapp/dhis-web-maintenance-mobile/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-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-06-30 11:36:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-06-30 16:51:19 +0000
@@ -397,7 +397,7 @@
   display: none;
   list-style-type:none;
   width: 465px;
-  padding-top: 15px;
+  padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
@@ -433,7 +433,7 @@
 .introItemHeader
 {
   font-family: LiberationSansBold, arial;
-  color: #3c533c;
+  color: #3F693F;
   font-size: 13px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-06-30 11:36:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-06-30 16:51:19 +0000
@@ -397,7 +397,7 @@
   width: 450px;
   background-color: #d5efd5;
   border: 1px solid #a4d2a3;
-  padding-top: 15px;
+  padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
@@ -434,7 +434,7 @@
 .introItemHeader
 {
   font-family: LiberationSansBold, arial;
-  color: #3c533c;
+  color: #3F693F;
   font-size: 13px;
 }
 

=== 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	2013-06-30 11:36:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-06-30 16:51:19 +0000
@@ -392,7 +392,7 @@
   display: none;
   list-style-type:none;
   width: 465px;
-  padding-top: 15px;
+  padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
@@ -428,7 +428,7 @@
 .introItemHeader
 {
   font-family: LiberationSansBold, arial;
-  color: #3c533c;
+  color: #3F693F;
   font-size: 13px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-06-30 11:36:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-06-30 16:51:19 +0000
@@ -394,7 +394,7 @@
   width: 450px;
   background-color: #d5efd5;
   border: 1px solid #a4d2a3;
-  padding-top: 15px;
+  padding-top: 10px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
@@ -430,7 +430,7 @@
 .introItemHeader
 {
   font-family: LiberationSansBold, arial;
-  color: #3c533c;
+  color: #3F693F;
   font-size: 13px;
 }
 

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/category.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/category.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/category.png	2013-06-30 16:51:19 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groupset.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groupset.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/groupset.png	2013-06-30 16:51:19 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/mobilesettings.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/mobilesettings.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/mobilesettings.png	2013-06-30 16:51:19 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/section.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/section.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/section.png	2013-06-30 16:51:19 +0000 differ
=== 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	2013-04-29 11:54:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2013-06-30 16:51:19 +0000
@@ -11,15 +11,15 @@
 	#introListImgItem( "dataElement.action" "data_element" "dataelement" )
 	#introListImgItem( "dataElementGroup.action" "data_element_group" "dataelement" )
     #introListImgItem( "dataElementGroupEditor.action" "data_element_group_editor" "dataelement" )
-    #introListImgItem( "dataElementGroupSet.action" "data_element_group_set" "dataelement" )
-    #introListImgItem( "categoryOption.action" "data_element_category_option" "dataelement" )
-    #introListImgItem( "category.action" "data_element_category" "dataelement" )
-    #introListImgItem( "categoryCombo.action" "data_element_category_combo" "dataelement" )
+    #introListImgItem( "dataElementGroupSet.action" "data_element_group_set" "groupset" )
+    #introListImgItem( "categoryOption.action" "data_element_category_option" "category" )
+    #introListImgItem( "category.action" "data_element_category" "category" )
+    #introListImgItem( "categoryCombo.action" "data_element_category_combo" "category" )
     #introListImgItem( "dataDictionary.action" "data_dictionary" "datadictionary" )
 	#introListImgItem( "concept.action" "concept" "dataelement" )
     #introListImgItem( "indicator.action" "indicator" "indicator" )
     #introListImgItem( "indicatorType.action" "indicator_type" "indicator" )
     #introListImgItem( "indicatorGroup.action" "indicator_group" "indicator" )
     #introListImgItem( "indicatorGroupEditor.action" "indicator_group_editor" "indicator" )
-    #introListImgItem( "indicatorGroupSet.action" "indicator_group_set" "indicator" )
+    #introListImgItem( "indicatorGroupSet.action" "indicator_group_set" "groupset" )
 </ul>
\ No newline at end of file

=== 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	2012-03-04 13:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm	2013-06-30 16:51:19 +0000
@@ -9,6 +9,6 @@
 
 <ul class="introList">
     #introListImgItem( "dataSet.action" "dataset" "dataset" )
-    #introListImgItem( "section.action" "dataset_section" "dataset" )
+    #introListImgItem( "section.action" "dataset_section" "section" )
     #introListImgItem( "displayEditorForm.action" "dataset_assignment_editor" "dataset" )
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2013-05-24 09:21:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2013-06-30 16:51:19 +0000
@@ -12,7 +12,7 @@
 
     <action name="index" class="org.hisp.dhis.mobile.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-maintenance-mobile/welcome.vm</param>
+      <param name="page">/dhis-web-maintenance-mobile/index.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
     </action>
     

=== renamed 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/index.vm'
--- 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
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm	2013-06-30 16:51:19 +0000
@@ -9,5 +9,5 @@
 
 <ul class="introList">
     #introListImgItem( "showMobileDataSet.action" "mobile_dataset" "mobile" )
-    #introListImgItem( "patientMobileSetting.action" "patient_mobile_setting" "mobile" )
+    #introListImgItem( "patientMobileSetting.action" "patient_mobile_setting" "mobilesettings" )
 </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	2012-03-04 13:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm	2013-06-30 16:51:19 +0000
@@ -10,8 +10,8 @@
 <ul class="introList">
     #introListImgItem( "organisationUnit.action" "org_unit" "organisationunit" )
     #introListImgItem( "organisationUnitGroup.action" "org_unit_group" "organisationunit" )
-    #introListImgItem( "organisationUnitGroupSet.action" "org_unit_group_set" "organisationunit" )
-    #introListImgItem( "organisationUnitLevel.action" "org_unit_level" "organisationunit" )
+    #introListImgItem( "organisationUnitGroupSet.action" "org_unit_group_set" "groupset" )
+    #introListImgItem( "organisationUnitLevel.action" "org_unit_level" "hierarchy" )
     #introListImgItem( "organisationUnitSearch.action?skipSearch=true" "org_unit_search" "search" )
     #introListImgItem( "hierarchyOperations.action" "hierarchy_operations_menu" "hierarchy" )
 </ul>