------------------------------------------------------------
revno: 314
committer: Miri <[email protected]>
branch nick: trunk
timestamp: Wed 2009-05-20 16:35:18 +0200
message:
Added new L&F to Customvalue edit Form.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml
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/editCustomValues.vm
=== modified file
'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml'
---
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml
2009-05-11 13:32:24 +0000
+++
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml
2009-05-20 14:35:18 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
<class name="org.hisp.dhis.customvalue.CustomValue" table="customvalue">
-
+
<id name="id" column="customvalueid">
<generator class="native"/>
</id>
=== 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
2009-05-06 11:24:10 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
2009-05-20 14:35:18 +0000
@@ -87,7 +87,9 @@
unselect_all_in_group
= Unselect all in group
unselect_all
= Unselect all
select_customvalue
= Select Custom Value
-add_new_custom_value
= Add new custom value
-delete_custom_value
= Delete custom value
+add_new_custom_value
= Add New Custom Value
+delete_custom_value
= Delete Custom Value
done_custom_value
= Done
edit_custom_values
= Edit custom values
+manage_custom_values
= Manage Custom Value Lists
+available_customvalue
= Suggested Custom Values
\ 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/editCustomValues.vm'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm
2009-05-03 23:04:13 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm
2009-05-20 14:35:18 +0000
@@ -1,4 +1,3 @@
-
<html>
<head>
<title>$i18n.getString( "selectdataelement" )</title>
@@ -790,41 +789,80 @@
</style>
</head>
<body>
- <table border="0" cellpadding="0" cellspacing="5" style="border-collapse:
collapse" width="100%">
+
+<h3>$i18n.getString( "manage_custom_values" )</h3>
+
+ <table>
+ <col> ## selectdataelement
+ <col> ## select_optioncombo
+ <thead>
+ <tr>
+ <th>$i18n.getString( "selectdataelement" )</th>
+ <th>$i18n.getString( "select_optioncombo" )</th>
+ </tr>
+ </thead>
+ <tbody>
<tr>
<td>
- <h4>$i18n.getString( "selectdataelement" )</h4>
- <select name="dataElementSelector" id="dataElementSelector"
onchange="getOptionCombos()" size="5">
+ <select name="dataElementSelector" id="dataElementSelector"
onchange="getOptionCombos()" style="min-width:25em" size="10">
#foreach($dataElement in $dataElements)
<option
value="$dataElement.id">$dataElement.name</option>
#end
</select>
- <div id="message" name="message"> </div>
+
</td>
<td>
- <h4>$i18n.getString( "select_optioncombo" )</h4>
- <select name="optionComboSelector" id="optionComboSelector"
onchange="getCustomValues('get')" size="5">
+ <select name="optionComboSelector" id="optionComboSelector"
onchange="getCustomValues('get')" style="min-width:25em" size="10">
</select>
</td>
</tr>
<tr>
- <td><input type="text" name="newCustomValue" id="newCustomValue"
maxlength="160" size="60"/>
+ <td><input type="text" name="newCustomValue" id="newCustomValue"
maxlength="160" style="min-width:25em" size="60"/>
</td>
<td>
- <h4>$i18n.getString( "select_customvalue" )</h4>
- <select name="customValueSelector" id="customValueSelector"
size="15">
- </select>
+ <button type="button" onclick="addNew()">$i18n.getString(
"add_new_custom_value" )</button>
</td>
</tr>
+ </tbody>
+ </table>
+
+ <table>
+ <col> ## available_customvalue
+ <col> ## select_customvalue
+ <thead>
+ <tr>
+ <th>$i18n.getString( "available_customvalue" )</th>
+ <th>$i18n.getString( "select_customvalue" )</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <select name="availableCustomValue" id="availableCustomValue"
style="min-width:25em" size="10">
+ </select>
+ </td>
+ <td>
+ <select name="customValueSelector" id="customValueSelector"
style="min-width:25em" size="10">
+ </select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table>
+ <tbody>
<tr>
<td>
- <button type="button" onclick="addNew()">$i18n.getString(
"add_new_custom_value" )</button>
<button type="button" onclick="remove()">$i18n.getString(
"delete_custom_value" )</button>
</td>
<td>
- <button type="button">$i18n.getString( "done_custom_value"
)</button>
+ <input type="button"
+ onclick="window.location.href='index.action'"
value="$i18n.getString( "done_custom_value" )" style="width:12em">
</td>
- </tr>
+ </tr>
+ </tbody>
+ </table>
+ <div id="message" name="message"> </div>
<input type="hidden" name="dataSetIdField" id="dataSetIdField"
value="$dataSet.id" />
</body>
</html>
\ No newline at end of file
--
Trunk
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
