=== 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 ) #if( $!title ) #end
-

$encoder.htmlEncode( $title )

+

$!encoder.htmlEncode( $title )

+ #if ( $description ) +
$!encoder.htmlEncode( $description )
+ #end
- +
#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;