dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3092
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-03-20 10:21:04 +0100
message:
  Made the data entry forms scale according to the size and not fill the whole screen horizontally. Removed open/hide section function.
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.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-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm	2011-02-10 12:06:26 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm	2011-03-20 09:21:04 +0000
@@ -2,8 +2,7 @@
 
 #set( $tabIndex = 1 )
 #foreach( $categoryCombo in $orderedCategoryCombos )
-<div style="border:1px solid #808080;width:98%">            
-  <table class="mainPageTable" cellpadding="0">
+<table style="border:1px solid #c0c0c0; padding:10px;">
   #set( $colCount = $numberOfTotalColumns.get( $categoryCombo.id )  ) 
   #set( $categories = $orderedCategories.get( $categoryCombo.id )  )
   #set( $optionsMap = $orderedOptionsMap.get( $categoryCombo.id )  )
@@ -39,7 +38,7 @@
 
   #set( $count = $count + 1 )
   <tr>
-    <td #if( $mark == 1 ) style="background-color:#dddddd" #end>
+    <td  style="#if( $mark == 1 )background-color:#e0e0e0;#end padding-right:50px;">
       <span id="value[$dataElement.id].name" title="$!encoder.htmlEncode( $dataElement.description )">$encoder.htmlEncode( $dataElement.name )</span><span id="value[$dataElement.id].type" class="hidden">$dataElement.getDetailedNumberType()</span>
     </td>
     #foreach( $optionCombo in $optionCombos )
@@ -71,10 +70,9 @@
     #end
   </tr>
   #end
-  </table>
-</div>
+</table>
 <br>
 <br>
 #end
 
-#parse( "/dhis-web-dataentry/completeRegistration.vm" )
+#parse( "/dhis-web-dataentry/completeRegistration.vm" )
\ No newline at end of file

=== 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	2011-02-10 12:06:26 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2011-03-20 09:21:04 +0000
@@ -11,18 +11,16 @@
   #set( $marker = 1 )
 #end
 
-<div style="border:thin solid">
-
-<table class="mainPageTable">
+<table style="border:1px solid #c0c0c0; padding:10px;">
 <tr>
-  <td onclick="openCloseSection( $section.id )" onmouseover="style.backgroundColor='#ebf0f6';" onmouseout="style.backgroundColor='#FFFFFF'">
-    <div id="$section.id:name" style="text-align:center"><h3>$encoder.htmlEncode( $section.name )</h3></div>
+  <td>
+    <div style="text-align:center"><h3>$encoder.htmlEncode( $section.name )</h3></div>
   </td>
 </tr>
 <tr>
   <td>
     <div id="$section.id" style="display:block">
-      <table class="mainPageTable" cellpadding="0">
+      <table cellpadding="0">
       #set( $categoryComboId = $sectionCombos.get( $section.id ) )
       #set( $colCount = $numberOfTotalColumns.get( $categoryComboId ) )
       #set( $categories = $orderedCategories.get( $categoryComboId ) )
@@ -57,7 +55,7 @@
       #end
       #set( $count = $count + 1 )
       <tr>
-        <td #if( $mark == 1 ) style="background-color: #dddddd" #end>
+        <td  style="#if( $mark == 1 )background-color:#e0e0e0;#end padding-right:50px;">
           <span id="value[$dataElement.id].name" title="$!encoder.htmlEncode( $dataElement.description )">$encoder.htmlEncode( $dataElement.name )</span><span id="value[$dataElement.id].type" class="hidden">$dataElement.getDetailedNumberType()</span>
         </td>
         #foreach( $optionCombo in $optionCombos )
@@ -95,11 +93,10 @@
     </div>
     </td>
   </tr>
-  </table>
-</div>
+</table>
 
 <br>
 
 #end
 
-#parse( "/dhis-web-dataentry/completeRegistration.vm" )
+#parse( "/dhis-web-dataentry/completeRegistration.vm" )
\ No newline at end of file