dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08277
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1969: Changed section grey button to Done
------------------------------------------------------------
revno: 1969
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-10-29 17:38:38 +0200
message:
Changed section grey button to Done
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.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-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-10-22 09:23:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-10-29 15:38:38 +0000
@@ -126,4 +126,5 @@
not_change_old_but_assign_new_only = Do not change the old assignment but assign new only.
datasets_different_orgunitlist = These selected datasets are not the same the list of organsation unit.
optional = Optional expansion
-dataelement_is_inserted = Data Element was inserted
\ No newline at end of file
+dataelement_is_inserted = Data Element was inserted
+done = Done
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2010-10-29 15:38:38 +0000
@@ -44,7 +44,7 @@
<br/>
<p>
- <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'back' )"/>
+ <input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( 'done' )"/>
</p>
<script type="text/javascript">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm 2010-10-29 15:38:38 +0000
@@ -42,10 +42,10 @@
#if( $greyedField == "true" )
<input name="entryfieldTxt" id="[$dataElement.id].txt" type="text" disabled="disabled"/>
- <input name="entryfieldBtn" id="[$dataElement.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '' )" value="$i18n.getString( 'enable' )"/>
+ <input name="entryfieldBtn" id="[$dataElement.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '' )" value="$i18n.getString( 'enable' )" style="width:70px"/>
#else
<input name="entryfieldTxt" id="[$dataElement.id].txt" type="text"/>
- <input name="entryfieldBtn" id="[$dataElement.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '' )" value="$i18n.getString( 'disable' )"/>
+ <input name="entryfieldBtn" id="[$dataElement.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '' )" value="$i18n.getString( 'disable' )" style="width:70px"/>
#end
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm 2010-10-29 15:38:38 +0000
@@ -43,10 +43,10 @@
#if( $greyedField == "true" )
<input name="entryfieldTxt" id="[$dataElement.id]_[$optionCombo.id].txt" type="text" disabled="disabled"/>
- <input name="entryfieldBtn" id="[$dataElement.id]_[$optionCombo.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '$optionCombo.id' )" value="$i18n.getString( 'enable' )"/>
+ <input name="entryfieldBtn" id="[$dataElement.id]_[$optionCombo.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '$optionCombo.id' )" value="$i18n.getString( 'enable' )" style="width:70px"/>
#else
<input name="entryfieldTxt" id="[$dataElement.id]_[$optionCombo.id].txt" type="text"/>
- <input name="entryfieldBtn" id="[$dataElement.id]_[$optionCombo.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '$optionCombo.id' )" value="$i18n.getString( 'disable' )"/>
+ <input name="entryfieldBtn" id="[$dataElement.id]_[$optionCombo.id].btn" type="button" onclick="saveGreyStatus( '$section.id', '$dataElement.id', '$optionCombo.id' )" value="$i18n.getString( 'disable' )" style="width:70px"/>
#end
</td>
