dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16585
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-08-29 18:13:52 +0200
message:
  Data entry, rendering section description under title for each section
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm
  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-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2013-12-14 14:14:40 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2014-08-29 16:13:52 +0000
@@ -24,7 +24,7 @@
 #else
     #foreach( $section in $sections )
         #set( $categoryComboId = $sectionCombos.get( $section.id ) )
-        #renderSection( $categoryComboId $section.dataElements $section.displayName )
+        #renderSection( $categoryComboId $section.dataElements $section.displayName $section.description )
     #end
 #end
 
@@ -33,19 +33,22 @@
     @param $dataElements Data Elements to be rendered in your section
     @param $args.title Include if you want a title rendered in your section
 *#
-#macro( renderSection $categoryComboId $dataElements $title )
+#macro( renderSection $categoryComboId $dataElements $title $description )
 <table class="formSection" style="margin-bottom: 20px;">
 #if( $!title )
 <tr>
   <td>
-    <div class="cent"><h3>$encoder.htmlEncode( $title )</h3></div>
+    <div class="cent"><h3>$!encoder.htmlEncode( $title )</h3></div>
+    #if ( $description )
+    <div class="cent sectionDescription">$!encoder.htmlEncode( $description )</div>
+    #end
   </td>
 </tr>
 #end
 <tr>
   <td>
     <div>
-    <table cellspacing="0">
+    <table class="sectionTable" cellspacing="0">
     #set( $colCount = $numberOfTotalColumns.get( $categoryComboId ) )
     #set( $categories = $orderedCategories.get( $categoryComboId ) )
     #set( $optionsMap = $orderedOptionsMap.get( $categoryComboId ) )

=== 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	2014-07-21 07:19:23 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2014-08-29 16:13:52 +0000
@@ -100,6 +100,18 @@
   border: 1px solid #CBDDEB;
 }
 
+.sectionTable
+{
+  border-collapse: collapse;
+}
+
+.sectionDescription
+{
+  font-size: 13px;
+  color: #777;
+  padding-bottom: 10px;
+}
+
 .sectionFilter
 {
   padding: 5px;