dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4517
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-09-04 23:07:05 +0200
message:
  Data entry, gui improvement
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
  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/webapp/dhis-web-dataentry/defaultForm.vm
  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/select.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-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2011-08-30 21:19:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2011-09-04 21:07:05 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 2.4-SNAPSHOT Version 19
+# 2.4-SNAPSHOT Version 22
 NETWORK:
 *
 CACHE:

=== 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	2011-09-03 18:23:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2011-09-04 21:07:05 +0000
@@ -18,21 +18,19 @@
 div#rightBar
 {
   display:none;
-  background-color: #baffbc;
+  background-color: #d5efd5;
   height: 454px;
   width: 300px;
   float: right;
   position: absolute;
   top: 85px;
   right: 10px;
-  border: 1px solid #12cd17;
+  border: 1px solid #a4d2a3;
   padding-left: 15px;
   padding-right: 15px;
   padding-top: 9px;
   padding-bottom: 9px;
   overflow: auto;
-  filter: alpha(opacity=94);
-  opacity: 0.94;
 }
 
 #hideRightBar
@@ -466,7 +464,7 @@
   height: 400px; /* Override this */
   border: 1px solid #a4d2a3;
   background-color: #d5efd5;
-  padding-top: 5px;
+  padding-top: 10px;
   padding-bottom: 5px;
   padding-left: 20px;
   margin-bottom: 15px;

=== 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-08-27 11:43:07 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm	2011-09-04 21:07:05 +0000
@@ -2,7 +2,7 @@
 #set( $hasAccess = $auth.hasAccess( "dhis-web-dataentry", "saveValue" ) )
 
 #foreach( $categoryCombo in $orderedCategoryCombos )
-<table style="border:1px solid #c0c0c0; padding:10px;" cellspacing="0">
+<table class="formSection" cellspacing="0">
   #set( $colCount = $numberOfTotalColumns.get( $categoryCombo.id )  ) 
   #set( $categories = $orderedCategories.get( $categoryCombo.id )  )
   #set( $optionsMap = $orderedOptionsMap.get( $categoryCombo.id )  )

=== 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-08-27 11:43:07 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2011-09-04 21:07:05 +0000
@@ -10,7 +10,7 @@
   #set( $marker = 1 )
 #end
 
-<table style="border:1px solid #c0c0c0; padding:10px;">
+<table class="formSection">
 <tr>
   <td>
     <div class="cent"><h3>$encoder.htmlEncode( $section.name )</h3></div>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2011-08-30 21:19:19 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2011-09-04 21:07:05 +0000
@@ -45,6 +45,7 @@
     <input type="button" value="$i18n.getString( 'run_validation' )" onclick="validate()" id="validationButton" style="width:150px;" disabled="disabled"/>
 </div>
 
+<div class="inputCriteria" style="width:485px;height:93px;">
 <table>
 	<tr>
 		<td><label for="selectedOrganisationUnit">$i18n.getString( "organisation_unit" )</label></td>
@@ -63,23 +64,18 @@
 		</td>
 	</tr>	
 </table>
-
-<hr style="clear:both"/>
-<br/>
+</div>
 
 #parse( "dhis-web-commons/loader/loader.vm" )
 
-<div id="contentDiv" class="page"></div>
+<div id="contentDiv" class="page" style="margin-left:2px;margin-bottom:8px;"></div>
 
 <div id="historyDiv" class="page"></div>
 
 <div id="validationDiv" class="page"></div>
 
-<div id="completenessDiv" class="page" style="display:none">
-
-<hr style="clear:both">
+<div id="completenessDiv" class="page inputCriteria" style="display:none;width:386px;height:29px;">
 <input type="button" id="completeButton" name="completeButton" value="$i18n.getString( 'complete' )" onclick="validateCompleteDataSet()" style="width:120px">
 <input type="button" id="undoButton" name="undoButton" value="$i18n.getString( 'incomplete' )" onclick="undoCompleteDataSet()" style="width:120px">
 <input type="button" value="$i18n.getString( 'run_validation' )" onclick="validate()" style="width:120px">
-
 </div>

=== 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	2011-08-19 19:27:33 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2011-09-04 21:07:05 +0000
@@ -1,10 +1,9 @@
 
 #currentSelection
 {
-  color: black;
   padding: 6px;
-  background-color: #d5ffc5;
-  border: 1px solid black;
+  background-color: #e0e0e0;
+  border: 1px solid #a0a0a0;
   font-size: 14px;
   text-align: right;
   position: fixed;
@@ -54,3 +53,11 @@
 {
   text-align: center;
 }
+
+.formSection
+{
+  border:1px solid #c0c0c0; 
+  padding:10px;
+  border-radius: 3px;
+  -moz-border-radius: 3px; /* Firefox */
+}