dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11437
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-07-18 12:10:22 +0200
message:
  Moved css out of template in data entry
modified:
  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-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2013-05-29 21:44:35 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2013-07-18 10:10:22 +0000
@@ -60,7 +60,7 @@
 <h3 id="moduleHeader">$i18n.getString( "data_entry" ) #openHelp( "dataEntry" )</h3>
 
 <div id="currentSelection">
-	<span style="float:left;cursor:pointer;margin-right:5px;"><img src="../images/hide.png" title="$i18n.getString( 'close' )" onclick="closeCurrentSelection()"></span>
+	<span id="closeCurrentSelection"><img src="../images/hide.png" title="$i18n.getString( 'close' )" onclick="closeCurrentSelection()"></span>
 	<span id="currentOrganisationUnit">$i18n.getString( "no_organisationunit_selected" )</span> - <span id="currentPeriod">$i18n.getString( "no_period_selected" )</span/><br>
 	<span id="currentDataElement">$i18n.getString( "no_dataelement_selected" )</span>
 </div>
@@ -70,7 +70,7 @@
     <input type="button" value="$i18n.getString( 'print' )" onclick="window.print()" id="printButton" style="width:120px"/>
 </div>
 
-<div id="selectionBox" class="inputCriteria" style="width:534px;height:95px;">
+<div id="selectionBox" class="inputCriteria" style="width:534px">
 <table>
 	<tr>
 		<td><label for="selectedOrganisationUnit">$i18n.getString( "organisation_unit" )</label></td>
@@ -100,26 +100,26 @@
 
 #parse( "dhis-web-commons/loader/loader.vm" )
 
-<div id="contentDiv" class="page" style="margin-left:2px;margin-bottom:8px;"></div>
+<div id="contentDiv" class="page"></div>
 
 <div id="historyDiv" class="page"></div>
 
 <div id="validationDiv" class="page"></div>
 
-<div id="completenessDiv" class="page inputCriteria" style="display:none;width:386px;height:29px;">
+<div id="completenessDiv" class="page inputCriteria">
 <input type="button" id="completeButton" name="completeButton" value="$i18n.getString( 'complete' )" onclick="registerCompleteDataSet()" style="width:120px">
 <input type="button" id="undoButton" name="undoButton" value="$i18n.getString( 'incomplete' )" onclick="undoCompleteDataSet()" style="width:120px">
 <input type="button" id="validateButton" value="$i18n.getString( 'run_validation' )" onclick="validate( false )" style="width:120px">
 </div>
 
-<div id="infoDiv" class="page inputCriteria" style="display:none;width:386px;height:20px;">
-<span style="color:#505050">$i18n.getString( "completed_by" ): </span><span id="completedBy"></span>
-<span style="color:#505050"> $i18n.getString( "at" ): </span><span id="completedDate"></span>
+<div id="infoDiv" class="page inputCriteria">
+<span class="tipText">$i18n.getString( "completed_by" ): </span><span id="completedBy"></span>
+<span class="tipText"> $i18n.getString( "at" ): </span><span id="completedDate"></span>
 <a href="javascript:displayUserDetails()">$i18n.getString( "see_details" )</a>
 </div>
 
 
-<div id="completedByDiv" style="display:none" class="page">
+<div id="completedByDiv" class="page">
 <h3><span id="userFullName"></span></h3>
 <table>
 	<tr>

=== 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	2013-07-04 19:49:24 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2013-07-18 10:10:22 +0000
@@ -14,19 +14,50 @@
   border-radius: 3px;
 }
 
+#actions
+{
+  float: right;
+  width: 160px;
+  text-align: right;
+}
+
+#closeCurrentSelection
+{
+  float:left;
+  cursor:pointer;
+  margin-right:5px;
+}
+
+#contentDiv
+{
+  margin-bottom: 8px;
+}
+
+#completenessDiv
+{
+  display: none;
+  width: 386px;
+  height: 29px;
+}
+
+#infoDiv
+{
+  display: none;
+  width: 386px;
+  height: 20px;
+}
+
+#completedByDiv
+{
+  display: none;
+}
+
 .currentRow
 {
   background-color: #d5ffc5;
   padding-right: 50px;
 }
 
-#actions
-{
-  float: right;
-  width: 160px;
-  text-align: right;
-}
-
 .hidden 
 {
   display: none;