------------------------------------------------------------
revno: 9058
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2012-11-15 16:58:10 +0100
message:
minor fixes to layout in anonymousRegistration
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.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-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-11-14 05:52:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-11-15 15:58:10 +0000
@@ -343,6 +343,7 @@
after = After
on = On
clear_filter = Clear filter
+show_filter = Advanced filtering
events = Events
orgunit_groups = Groups
not_empty = The value must be not empty
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-11-14 09:37:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-11-15 15:58:10 +0000
@@ -20,7 +20,7 @@
<table>
<tr>
<td><label>$i18n.getString( "registering_unit" )</label></td>
- <td><input type="text" id='orgunitName' name='orgunitName' #if( $orgunit ) value="$encoder.htmlEncode( $orgunit.name )" #else value="[$i18n.getString( 'please_select_village' )]" #end readonly></td>
+ <td><input type="text" id='orgunitName' name='orgunitName' #if( $orgunit ) value="$encoder.htmlEncode( $orgunit.name )" #else value="[$i18n.getString( 'please_select_village' )]" #end readonly /></td>
</tr>
<tr>
<td>
@@ -35,27 +35,31 @@
#end
#end
</select>
- <input type='hidden' class='stage-object-selected hidden'>
+ <input type='hidden' class='stage-object-selected hidden' />
</td>
- <td></td>
- <td>
- <input type="button" class='large-button' id='addBtn' value='$i18n.getString( "add_new" )' onclick="showAddEventForm();">
- <input type="button" id='removeBtn' value='$i18n.getString( "remove_empty_events" )' onclick="removeEmptyEvents();" style="width:140px;">
+ <td colspan="2" style="padding-left: 20px;">
+ <input type="button" class='large-button' id='addBtn' style="width: 145px;" value='$i18n.getString( "add_new" )' onclick="showAddEventForm();" />
+ <input type="button" id='removeBtn' value='$i18n.getString( "remove_empty_events" )' onclick="removeEmptyEvents();" style="width: 145px;" />
</td>
</tr>
+ <tr><td style="padding-top: 10px;"></td></tr>
<tr>
<td><label>$i18n.getString('from')</label></td>
<td>
- <input type="text" id='startDate' name='startDate' style="width:240px;">
+ <input type="text" id='startDate' name='startDate' style="width:240px;" />
</td>
+ <td style="padding-left: 20px;">
+ <input type="checkbox" id="incompleted" name="incompleted" value="true">$i18n.getString("incomplete")</input>
+ </td>
+ </tr>
+ <tr>
<td><label>$i18n.getString('to')</label></td>
<td>
- <input type="text" id='endDate' name='endDate' style="width:240px;">
+ <input type="text" id='endDate' name='endDate' style="width:240px;" />
</td>
- <td>
- <input type="checkbox" id="incompleted" name="incompleted" value="true">$i18n.getString("incomplete")
- <input type="button" class='large-button' id='filterBtn' name="filterBtn" value='$i18n.getString( "filter" )' onclick="showFilterForm();">
- <input type="button" class='large-button' id='listBtn' value="$i18n.getString( 'update' )" onclick="validateSearchEvents(false);">
+ <td style="padding-left: 20px;">
+ <input type="button" class='large-button' style="width: 145px;" id='filterBtn' name="filterBtn" value='$i18n.getString( "show_filter" )' onclick="showFilterForm();" />
+ <input type="button" class='large-button' style="width: 145px;" id='listBtn' value="$i18n.getString( 'search' )" onclick="validateSearchEvents(false);" />
</td>
</tr>
<tr><td> </td></tr>
@@ -82,23 +86,27 @@
<tr>
<td></td>
<td></td>
- <td rowspan='30' valign='bottom'>
- <input type="button" class='large-button' id='addSearchOptionBtn' name='addSearchOptionBtn' value="$i18n.getString('add')" onclick='addAttributeOption()'>
- </td>
- <td rowspan='30' valign='bottom'>
- <input type="button" class='large-button' id='clearAllBtn' name='clearAllBtnaddSearchOptionBtn' value="$i18n.getString('clear_all')" onclick='removeAllOption()'>
- </td>
- </tr>
- <tr id='advSearchBox0'>
- <td>
- <select id="searchObjectId" name="searchObjectId" onchange='dataElementOnChange(this);'></select>
- </td>
- <td>
- <input type="text" id="searchText" name="searchText" value="$!searchText">
- <input type="button" class='large-button' name="clearSearchBtn" value='$i18n.getString( "clear" )' onclick="removeAttributeOption('advSearchBox0');" disabled>
- </td>
- </tr>
+ <tr/>
+
+ <tr id='advSearchBox0'>
+ <td>
+ <select id="searchObjectId" name="searchObjectId" onchange='dataElementOnChange(this);'></select>
+ </td>
+ <td>
+ <input type="text" id="searchText" name="searchText" value="$!searchText">
+ <input type="button" class='large-button' name="clearSearchBtn" value='$i18n.getString( "clear" )' onclick="removeAttributeOption('advSearchBox0');" disabled>
+ </td>
+ </tr>
+
</tbody>
+ <tfoot>
+ <tr>
+ <td colspan="2">
+ <input type="button" class='large-button' id='addSearchOptionBtn' name='addSearchOptionBtn' value="$i18n.getString('add')" onclick='addAttributeOption()' />
+ <input type="button" class='large-button' id='clearAllBtn' name='clearAllBtnaddSearchOptionBtn' value="$i18n.getString('clear_all')" onclick='removeAllOption()' />
+ </td>
+ </tr>
+ </tfoot>
</table>
</div>
</div>
_______________________________________________
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
