------------------------------------------------------------
revno: 10159
committer: Hieu <hieu.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Wed 2013-03-13 01:35:16 +0700
message:
(mobile) Sending SMS - Fixed GUI
modified:
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.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-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm 2013-03-12 18:13:59 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm 2013-03-12 18:35:16 +0000
@@ -32,24 +32,11 @@
<form id="sendSMSForm" name="sendSMSForm" action="sendSMS.action">
<input type="hidden" id="isShowPatientList" name="isShowPatientList" />
<table id="detailsList">
+ <col width="85px"/>
<tbody>
- <!--tr>
- <th colspan="2">$i18n.getString( "gateway_type" )</th>
- </tr>
<tr>
- <td><label for="type">$i18n.getString( "type" ):</label></td>
+ <td>$i18n.getString( "send_sms_to_target" ):<td>
<td>
- #set( $keys = $!gatewayMap.keySet() )
- <select id="gatewayId" name="gatewayId" style="width: 100%;">
- #foreach( $key in $!keys )
- <option value="$gatewayMap.get( $key )">$i18n.getString( $key )</option>
- #end
- </select>
- </td>
- </tr-->
-
- <tr>
- <td>$i18n.getString( "send_sms_to_target" ):
<select id="sendTarget" name="sendTarget" onchange="javascript:toggleBasicSMSGUI( this.value );">
<option value="phone">$i18n.getString( "raw_phone_number" )</option>
<option value="userGroup">$i18n.getString( "user_group" )</option>
=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 2013-03-12 18:13:59 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 2013-03-12 18:35:16 +0000
@@ -38,26 +38,12 @@
<h3>$i18n.getString( "send_sms" )</h3>
#if ( $!gatewayMap && $!gatewayMap.size() > 0 )
<form id="sendSMSForm" name="sendSMSForm" action="sendSMS.action">
-
<table id="detailsList">
- <tbody>
- <!--tr>
- <th colspan="2">$i18n.getString( "gateway_type" )</th>
- </tr>
- <tr>
- <td width="328"><label for="type">$i18n.getString( "type" ):</label></td>
- <td width="100">
- #set( $keys = $!gatewayMap.keySet() )
- <select id="gatewayId" name="gatewayId" style="width: 100%;">
- #foreach( $key in $!keys )
- <option value="$gatewayMap.get( $key )">$i18n.getString( $key )</option>
- #end
- </select>
- </td>
- </tr-->
-
- <tr>
- <td>$i18n.getString( "send_sms_to_target" ):
+ <col width="90px"/>
+ <tbody>
+ <tr>
+ <td>$i18n.getString( "send_sms_to_target" ):</td>
+ <td>
<select id="sendTarget" name="sendTarget" onchange="javascript:toggleSMSGUI( this.value );">
<option value="phone">$i18n.getString( "raw_phone_number" )</option>
<option value="userGroup">$i18n.getString( "user_group" )</option>
@@ -68,21 +54,24 @@
</td>
</tr>
<tr id="trUserGroup" style="display:none">
- <td>$i18n.getString( "user_group" ):
- <select id="userGroup" name="userGroup">
- #foreach( $group in $userGroups )
- <option value="$group.id">$!encoder.htmlEncode( $group.name )</option>
- #end
- </select></td>
+ <td>$i18n.getString( "user_group" ):</td>
+ <td>
+ <select id="userGroup" name="userGroup">
+ #foreach( $group in $userGroups )
+ <option value="$group.id">$!encoder.htmlEncode( $group.name )</option>
+ #end
+ </select>
+ </td>
</tr>
<tr id="trRawPhone">
- <td>$i18n.getString( "phone_number" ): <input type="text" id="recipient" name="recipient" style="width:53%"/></td>
+ <td>$i18n.getString( "phone_number" ):</td>
+ <td><input type="text" id="recipient" name="recipient" style="width:65%"/></td>
</tr>
- <tr id="orgunitType" style="display:none"><td>#organisationUnitSelectionTree( true, true, false )</td></tr>
+ <tr id="orgunitType" style="display:none"><td colspan="2"><br/>#organisationUnitSelectionTree( true, true, false )</td></tr>
- <tr><th>$i18n.getString( "message" )</th></tr>
- <tr><td><textarea id="smsMessage" name="smsMessage" cols="86" rows="5" class="{validate:{required:true}}"></textarea></td></tr>
+ <tr><th colspan="2">$i18n.getString( "message" )</th></tr>
+ <tr><td colspan="2"><textarea id="smsMessage" name="smsMessage" cols="86" rows="5" class="{validate:{required:true}}"></textarea></td></tr>
<tr>
<td><input type="submit" name="send" value="$i18n.getString( 'send_sms' )"/>
</tr>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
