dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 19162 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2015-05-17 20:12:58 +0200
message:
  Default forms, using name of data set instead of default cat combo name when default. Section form css fixes.
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/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css


--
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	2015-02-02 13:42:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2015-05-17 14:46:45 +0000
@@ -207,13 +207,13 @@
 #leftBar
 {
   height: 100%;
-  background-color: #f7f7f7;
+  background-color: #f3f3f3;
   width: 235px;
   position: fixed;
   top: 46px;
   left: 0;
   padding-top: 6px;
-  border-right: 1px solid #ddd;
+  border-right: 1px solid #dadada;
   box-shadow: #ddd 0 0 2px 0;
   z-index: 10;
 }

=== 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	2015-02-02 13:42:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2015-05-17 14:46:45 +0000
@@ -207,13 +207,13 @@
 #leftBar
 {
   height: 100%;
-  background-color: #f7f7f7;
+  background-color: #f3f3f3;
   width: 235px;
   position: fixed;
   top: 46px;
   left: 0;
   padding-top: 6px;
-  border-right: 1px solid #ddd;
+  border-right: 1px solid #dadada;
   box-shadow: #ddd 0 0 2px 0;
   z-index: 10;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2015-04-15 18:00:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2015-05-17 14:46:45 +0000
@@ -490,7 +490,7 @@
 
 .alt
 {
-  background-color: #e9e9e9;
+  background-color: #f3f3f3;
   padding-right: 50px;
 }
 
@@ -506,7 +506,7 @@
 
 .formSection
 {
-  border:1px solid #c0c0c0; 
+  border:1px solid #cacaca; 
   padding:10px;
   border-radius: 3px;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2015-03-19 12:47:13 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2015-05-17 15:31:40 +0000
@@ -343,15 +343,18 @@
 
             for ( int i = 0; i < orderedCategoryCombos.size(); i++ )
             {
+                DataElementCategoryCombo categoryCombo = orderedCategoryCombos.get( i );
+                String name = !categoryCombo.isDefault() ? categoryCombo.getName() : dataSetCopy.getName();
+                
                 Section section = new Section();
                 section.setUid( CodeGenerator.generateCode() );
                 section.setId( i );
-                section.setName( orderedCategoryCombos.get( i ).getName() );
+                section.setName( name );
                 section.setSortOrder( i );
                 section.setDataSet( dataSet );
                 dataSet.getSections().add( section );
 
-                section.getDataElements().addAll( orderedDataElements.get( orderedCategoryCombos.get( i ) ) );
+                section.getDataElements().addAll( orderedDataElements.get( categoryCombo ) );
                 section.setIndicators( new ArrayList<>( dataSet.getIndicators() ) );
             }
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2015-03-31 13:27:32 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2015-05-17 14:46:45 +0000
@@ -96,8 +96,9 @@
 {
   text-align: center;
   min-width: 46px;
-  background-color: #CBDDEB;
-  border: 1px solid #CBDDEB;
+  background-color: #f3f3f3;
+  border: 1px solid #dadada;
+  color: #444;
 }
 
 .sectionTable