dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13312
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4231: Css fix
------------------------------------------------------------
revno: 4231
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-07-28 11:34:27 +0200
message:
Css fix
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm 2011-06-17 17:37:34 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm 2011-07-28 09:34:27 +0000
@@ -12,7 +12,7 @@
<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='message.action'" style="width:120px">
</div>
-<div id="senderInfo" style="display:none">
+<div id="senderInfo" style="display:none" class="page">
<h3>$message.message.sender.name</h3>
<table>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2011-07-28 07:34:34 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2011-07-28 09:34:27 +0000
@@ -6,24 +6,21 @@
#set( $width = 40 * $dataElementHistory.historyLength )
#set( $lastIndex = $dataElementHistory.historyLength - 1 )
#set( $average = $dataElementHistory.historyPoints.get( $lastIndex ).average )
-
-<h3>
- $encoder.htmlEncode( $dataElementHistory.dataElement.name )
- $encoder.htmlEncode( $dataElementHistory.optionCombo.name )
- #if ( $dataValue && $dataValue.isFollowup() )
- <img id="followup" src="../images/marked.png" alt="$i18n.getString( 'mark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer"/>
- #elseif ( $dataValue )
- <img id="followup" src="../images/unmarked.png" alt="$i18n.getString( 'unmark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer"/>
- #else
- <img id="followup" src="../images/unmarked.png"/>
- #end
-</h3>
-
+#set( $dataValueAuditSize = $dataValueAudits.size() )
<table>
<tr>
<!-- Comment -->
<td valign="top">
- <h4>$i18n.getString( "dataelement_comment" )</h4>
+ <h4>$i18n.getString( "dataelement_comment" )
+
+ #if ( $dataValue && $dataValue.isFollowup() )
+ <img id="followup" src="../images/marked.png" alt="$i18n.getString( 'mark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer"/>
+ #elseif ( $dataValue )
+ <img id="followup" src="../images/unmarked.png" alt="$i18n.getString( 'unmark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer"/>
+ #else
+ <img id="followup" src="../images/unmarked.png"/>
+ #end
+ </h4>
<textarea id="commentTextArea" style="height:130px;width:240px">$!encoder.htmlEncode( $dataValue.comment )</textarea><br>
<input type="button" value="$i18n.getString( 'save_comment' )" style="width:130px" onclick="saveComment()">
</td>
@@ -40,7 +37,7 @@
onkeyup="saveMinMaxLimit()"
#else disabled="disabled" #end />
<i><span id="maxSpan" style="color:red"></span></i>
- </td>
+ </td>
</tr>
<tr>
<td style="background-color:#d54a4a; height:26px"> </td>
@@ -65,7 +62,7 @@
<tr>
<td colspan="3"><input type="button" value="$i18n.getString( 'remove' )" onclick="removeMinMaxLimit()" style="width:100px"></td>
</tr>
- </table>
+ </table>
</td>
</tr>
<tr>
@@ -74,11 +71,11 @@
<h4>$encoder.htmlEncode( $i18n.getString( "dataelement_history" ) )</h4>
#if( !$isHistoryValid )
<h4>$encoder.htmlEncode( $i18n.getString( "history_not_valid" ) )</h4>
- #end
-
- <img id="historyChart" src="getHistoryChart.action?dataElementId=${dataElementHistory.dataElement.id}&categoryOptionComboId=${dataElementHistory.optionCombo.id}&periodId=${periodId}"/>
+ #end
+ <img id="historyChart" src="getHistoryChart.action?dataElementId=${dataElementHistory.dataElement.id}&categoryOptionComboId=${dataElementHistory.optionCombo.id}&periodId=${periodId}"/>
</td>
</tr>
+ #if( $dataValueAuditSize > 0 )
<tr>
<!-- Data Value History -->
<td colspan="2">
@@ -87,9 +84,10 @@
<p>
$encoder.htmlEncode( $i18n.getString( "on" ) ) $eachDataValueAudit.timeStamp,
$eachDataValueAudit.storedBy
- $encoder.htmlEncode( $i18n.getString( "change_from" ) ) $eachDataValueAudit.value.
+ $encoder.htmlEncode( $i18n.getString( "change_from" ) ) $eachDataValueAudit.value
</p>
#end
</td>
</tr>
+ #end
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2011-07-28 08:10:02 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2011-07-28 09:34:27 +0000
@@ -558,11 +558,11 @@
// History
// -----------------------------------------------------------------------------
-function displayHistoryDialog()
+function displayHistoryDialog( operandName )
{
$( '#historyDiv' ).dialog( {
modal: true,
- title: 'History',
+ title: operandName,
width: 580,
height: 710
} );
@@ -572,9 +572,14 @@
{
var periodId = $( '#selectedPeriodId' ).val();
+ var dataElementName = dataElements[dataElementId].name;
+ var optionComboName = $( '#' + optionComboId + '-optioncombo' ).html();
+ var operandName = dataElementName + ' ' + optionComboName;
+
$( '#historyDiv' ).load( 'viewHistory.action', {
- dataElementId: dataElementId, optionComboId: optionComboId, periodId: periodId },
- displayHistoryDialog
+ dataElementId: dataElementId, optionComboId: optionComboId, periodId: periodId }, function() {
+ displayHistoryDialog( operandName );
+ }
);
}
=== 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-07-28 07:34:34 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2011-07-28 09:34:27 +0000
@@ -108,8 +108,8 @@
#parse( "dhis-web-commons/loader/loader.vm" )
-<div id="contentDiv"></div>
-
-<div id="historyDiv"></div>
-
-<div id="validationDiv"></div>
+<div id="contentDiv" class="page"></div>
+
+<div id="historyDiv" class="page"></div>
+
+<div id="validationDiv" class="page"></div>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm 2011-07-28 08:10:02 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm 2011-07-28 09:34:27 +0000
@@ -124,4 +124,4 @@
#end
-<div id="validationResultDetailsDiv"></div>
+<div id="validationResultDetailsDiv" class="page"></div>
