dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17908
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7323: [mobile] improve UI of SMS commands
------------------------------------------------------------
revno: 7323
committer: Em <em.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-06-18 15:51:16 +0700
message:
[mobile] improve UI of SMS commands
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/sms-commands.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-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm 2012-06-13 08:44:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm 2012-06-18 08:51:16 +0000
@@ -25,28 +25,53 @@
* Unik kommando navn
* OID
-->
- <input type="hidden" value="$selectedCommandID" name="selectedCommandID" />
- Name: <input type="text" name="name" value="$SMSCommand.name" />
-
- <div>
- DataSet:
- <!-- onchange="window.location.href='editSMSCommand.action?selectedDataSetID=' + this.options[this.selectedIndex].value" -->
- <select name="selectedDataSetID" >
- #foreach( $dataSet in $dataSets )
- <option value="$dataSet.id" #if ($SMSCommand.dataset.id == $dataSet.id) selected #end >$dataSet.name</option>
- #end
- </select>
- </div>
- <div>
- Separator: <input type="text" #if($SMSCommand.seperator) value="$SMSCommand.seperator" #end name="seperator" />
- </div>
- <div>
- Code seperator: <input type="text" #if($SMSCommand.codeSeperator) value="$SMSCommand.codeSeperator" #end name="codeSeperator" />
- </div>
+
+
+
+ <table width="100%" border="0">
+ <tr>
+ <td>
+ <input type="hidden" value="$selectedCommandID" name="selectedCommandID" />
+ </td>
+ </tr>
+ <tr>
+ <td>Name:</td>
+ <td><input type="text" name="name" value="$SMSCommand.name" /></td>
+ </tr>
+ <tr>
+ <td>DataSet:</td>
+ <td>
+
+ <!-- onchange="window.location.href='editSMSCommand.action?selectedDataSetID=' + this.options[this.selectedIndex].value" -->
+ <select name="selectedDataSetID" >
+ #foreach( $dataSet in $dataSets )
+ <option value="$dataSet.id" #if ($SMSCommand.dataset.id == $dataSet.id) selected #end >$dataSet.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>Separator:</td>
+ <td>
+ <input type="text" #if($SMSCommand.seperator) value="$SMSCommand.seperator" #end name="seperator" />
+ </td>
+ </tr>
+ <tr>
+ <td>Code seperator:</td>
+ <td><input type="text" #if($SMSCommand.codeSeperator) value="$SMSCommand.codeSeperator" #end name="codeSeperator" /></td>
+ </tr>
+
+ </table>
+
+ </br>
+ </br>
+
+
<table id="codes">
+
<tr>
- <td>Data Element Category Combination</td>
- <td>Code</td>
+ <td style="color:#009">Data Element Category Combination</td>
+ <td style="color:#009">Code</td>
</tr>
#foreach( $dataElement in $dataSetElements)
#if ($dataElement.categoryCombo && $dataElement.categoryCombo.categories)
@@ -67,6 +92,9 @@
#end
#end
</table>
+ <br/>
+
<input type="hidden" name="codeDataelementOption" id="codeDataelementOption" />
- <input type="button" onclick="prepSubmit()" value="save" />
+ <input type="button" style="width: 100px" onclick="prepSubmit()" value="save" />
+
</form>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm 2012-06-13 08:44:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm 2012-06-18 08:51:16 +0000
@@ -1,23 +1,42 @@
<form id="newSMSCommand" name="updateSMSCommand" action="createSMSCommandForm.action" method="post">
- <div>
- Name: <input type="text" value="" id="name" name="name" />
- </div>
-
- <div>
- Parser:
- <select name="parser">
- <option value="syntax1">Syntax1</option>
- <option value="syntax2">Syntax2</option>
- </select>
- </div>
- <div>
-
- Dataset:
- <select name="selectedDataSetID" >
- #foreach( $dataSet in $dataSets )
- <option value="$dataSet.id" #if ($SMSCommand.dataset.id == $dataSet.id) selected #end >$dataSet.name</option>
- #end
- </select>
- </div>
- <input id="save" type="submit" />
+
+ <table width="75%" align="center">
+ <tr>
+ <td>
+ Name:
+ </td>
+ <td>
+ <input type="text" value="" id="name" name="name" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Parser:
+ </td>
+ <td>
+ <select name="parser">
+ <option value="syntax1">Syntax1</option>
+ <option value="syntax2">Syntax2</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Dataset:
+ </td>
+ <td>
+ <select name="selectedDataSetID" >
+ #foreach( $dataSet in $dataSets )
+ <option value="$dataSet.id" #if ($SMSCommand.dataset.id == $dataSet.id) selected #end >$dataSet.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td><input id="save" type="submit" value="Submit" /></td>
+ </tr>
+
+ </table>
+
</form>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/sms-commands.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/sms-commands.vm 2012-06-13 08:44:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/sms-commands.vm 2012-06-18 08:51:16 +0000
@@ -1,12 +1,21 @@
<a href="newSMSCommand.action">New command</a>
<br>
-<br>
-<div>
- #foreach( $command in $SMSCommands )
- <div>
- $command.name <a href="editSMSCommand.action?selectedCommandID=$command.id">Edit</a>
- <a href="deleteSMSCommand.action?deleteCommandId=$command.id">Delete</a>
- </div>
+
+
+<table width="75%" border="1" rules="all">
+
+ #foreach( $command in $SMSCommands )
+ <tr>
+ <td>$velocityCount</td>
+
+ <td>$command.name </td>
+ <td><a href="editSMSCommand.action?selectedCommandID=$command.id">Edit</a></td>
+ <td><a href="deleteSMSCommand.action?deleteCommandId=$command.id">Delete</a></td>
+ </tr><br/>
#end
-</div>
\ No newline at end of file
+
+
+
+ </tr>
+</table>
\ No newline at end of file
