------------------------------------------------------------
revno: 3190
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Mon 2011-03-28 17:28:36 +0200
message:
cleanup, and fixed updateUser validation
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js 2011-03-24 10:13:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js 2011-03-28 15:28:36 +0000
@@ -10,7 +10,7 @@
rawPassword : {
required : false,
password : true,
- range : r.user.password.rangelength,
+ rangelength : r.user.password.rangelength,
notequalto : '#username'
},
retypePassword : {
@@ -19,18 +19,18 @@
},
surname : {
required : true,
- range : r.user.name.rangelength
+ rangelength : r.user.name.rangelength
},
firstName : {
required : true,
- range : r.user.name.rangelength
+ rangelength : r.user.name.rangelength
},
email : {
email : true,
- range : r.user.email.rangelength
+ rangelength : r.user.email.rangelength
},
phoneNumber : {
- range : r.user.phone.rangelength
+ rangelength : r.user.phone.rangelength
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm 2011-03-28 15:28:36 +0000
@@ -30,8 +30,10 @@
</tr>
<tr>
<td></td>
- <td><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em"/>
+ <td>
+ <input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
+ <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em" />
+ </td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm 2011-03-28 15:28:36 +0000
@@ -83,7 +83,7 @@
<tr></tr>
<tr>
<td>
- <input type="submit" id="lock" name="lock" onclick="setClickedButtonElementValue( true )" value="$i18n.getString( 'lock' )" style="width:10em" disabled="true"/>
+ <input type="submit" id="lock" name="lock" onclick="setClickedButtonElementValue( true )" value="$i18n.getString( 'lock' )" style="width:10em" disabled="true" />
#if( $auth.hasAccess( "dhis-web-maintenance-dataadmin", "collectiveDataLockingForUnlocking") )
<input type="submit" id="unlock" name="unlock" onclick="setClickedButtonElementValue( false )" value="$i18n.getString( 'unlock' )" style="width:10em" disabled="true"/>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm 2011-03-28 15:28:36 +0000
@@ -4,5 +4,5 @@
<div align="left"><h3>$message</h3></div>
<p>
- <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='displayLockingForm.action'" style="width:100px"/>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='displayLockingForm.action'" style="width:100px" />
</p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2011-03-28 15:28:36 +0000
@@ -52,8 +52,10 @@
</tr>
<tr>
<td></td>
- <td><input type="button" value="$i18n.getString( 'archive' )" style="width:100px" onclick="archive( 'archive' )"/><input
- type="button" value="$i18n.getString( 'unarchive' )" style="width:100px" onclick="archive( 'unarchive' )"/></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'archive' )" style="width:100px" onclick="archive( 'archive' )" />
+ <input type="button" value="$i18n.getString( 'unarchive' )" style="width:100px" onclick="archive( 'unarchive' )" />
+ </td>
</tr>
</table>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm 2011-03-28 15:28:36 +0000
@@ -29,7 +29,9 @@
<td><span id="eliminateNameField">[$i18n.getString( "not_selected" )]</span></td>
</tr>
<tr>
- <td><input id="confirmEliminateButton" type="button" value="$i18n.getString( 'confirm' )" onclick="eliminateConfirmed()" style="width:10em" disabled="disabled"/></td>
+ <td>
+ <input id="confirmEliminateButton" type="button" value="$i18n.getString( 'confirm' )" onclick="eliminateConfirmed()" style="width:10em" disabled="disabled" />
+ </td>
</tr>
<tr>
<td colspan="2"> </td>
@@ -42,7 +44,9 @@
<td><span id="keepNameField">[$i18n.getString( "not_selected" )]</span></td>
</tr>
<tr>
- <td><input id="confirmKeepButton" type="button" value="$i18n.getString( 'confirm' )" onclick="keepConfirmed()" style="width:10em" disabled="disabled"/></td>
+ <td>
+ <input id="confirmKeepButton" type="button" value="$i18n.getString( 'confirm' )" onclick="keepConfirmed()" style="width:10em" disabled="disabled" />
+ </td>
</tr>
<tr>
<td colspan="2"> </td>
@@ -52,8 +56,10 @@
<th>$i18n.getString( "eliminate" )</th>
</tr>
<tr>
- <td><input type="button" id="eliminateButton" value="$i18n.getString( 'eliminate' )" style="width:10em" onclick="eliminate()" disabled="disabled"/><input
- type="button" value="$i18n.getString( 'reset' )" style="width:10em" onclick="window.location.href='displayDuplicateDataEliminationForm.action'"/></td>
+ <td>
+ <input type="button" id="eliminateButton" value="$i18n.getString( 'eliminate' )" style="width:10em" onclick="eliminate()" disabled="disabled" />
+ <input type="button" value="$i18n.getString( 'reset' )" style="width:10em" onclick="window.location.href='displayDuplicateDataEliminationForm.action'" />
+ </td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm 2011-03-28 15:28:36 +0000
@@ -91,9 +91,9 @@
</li>
</ul>
</ul>
+
<div style=" float:right; font-size:8pt; cursor:pointer; margin-top:-15px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( 'go_back' )"/></a>
+ <a href="index.action"><img src="images/goback.png" width="36" height="30" alt="$i18n.getString( 'go_back' )"/></a>
</div>
<br/><br/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm 2011-03-28 15:28:36 +0000
@@ -45,9 +45,11 @@
</td>
</tr>
<tr>
- <td><input type="submit" id="saveButton" onclick="javascipt: isGenerate = true;" style="width:10em" value="$i18n.getString( 'generate' )">
- <input type="submit" id="removeButton" onclick="javascipt: isGenerate = false;" style="width:10em" value="$i18n.getString( 'remove' )"/>
- <input type="button"" style="width:10em" onClick="window.location.href='index.action'" value="$i18n.getString( 'cancel' )"/></td>
+ <td>
+ <input type="submit" id="saveButton" onclick="javascipt: isGenerate = true;" style="width:10em" value="$i18n.getString( 'generate' )">
+ <input type="submit" id="removeButton" onclick="javascipt: isGenerate = false;" style="width:10em" value="$i18n.getString( 'remove' )"/>
+ <input type="button"" style="width:10em" onClick="window.location.href='index.action'" value="$i18n.getString( 'cancel' )"/>
+ </td>
</tr>
</table>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm 2011-03-28 15:28:36 +0000
@@ -15,7 +15,6 @@
<h3>$i18n.getString( "organisation_unit_merge" ) #openHelp( "organisationUnitMerge" )</h3>
<div id="selectionTree" style="width:500px; height:200px"></div>
-
<br/>
@@ -30,7 +29,9 @@
<td><span id="eliminateNameField">[$i18n.getString( "not_selected" )]</span></td>
</tr>
<tr>
- <td><input id="confirmOrganisationUnitToEliminateButton" type="button" value="$i18n.getString( 'confirm' )" onclick="organisationUnitToEliminateConfirmed()" style="width:10em" disabled="disabled"/></td>
+ <td>
+ <input id="confirmOrganisationUnitToEliminateButton" type="button" value="$i18n.getString( 'confirm' )" onclick="organisationUnitToEliminateConfirmed()" style="width:10em" disabled="disabled"/>
+ </td>
</tr>
<tr>
<td colspan="2"> </td>
@@ -43,7 +44,9 @@
<td><span id="keepNameField">[$i18n.getString( "not_selected" )]</span></td>
</tr>
<tr>
- <td><input id="confirmOrganisationUnitToKeepButton" type="button" value="$i18n.getString( 'confirm' )" onclick="organisationUnitToKeepConfirmed()" style="width:10em" disabled="disabled"/></td>
+ <td>
+ <input id="confirmOrganisationUnitToKeepButton" type="button" value="$i18n.getString( 'confirm' )" onclick="organisationUnitToKeepConfirmed()" style="width:10em" disabled="disabled" />
+ </td>
</tr>
<tr>
<td colspan="2"> </td>
@@ -53,8 +56,10 @@
<th>$i18n.getString( "merge" )</th>
</tr>
<tr>
- <td><input type="button" id="mergeButton" value="$i18n.getString( 'merge' )" style="width:10em" onclick="mergeOrganisationUnits()" disabled="disabled"/><input
- type="button" value="$i18n.getString( 'reset' )" style="width:10em" onclick="window.location.href='displayOrganisationUnitMergeForm.action'"/></td>
+ <td>
+ <input type="button" id="mergeButton" value="$i18n.getString( 'merge' )" style="width:10em" onclick="mergeOrganisationUnits()" disabled="disabled" />
+ <input type="button" value="$i18n.getString( 'reset' )" style="width:10em" onclick="window.location.href='displayOrganisationUnitMergeForm.action'" />
+ </td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm 2011-03-28 15:28:36 +0000
@@ -53,8 +53,10 @@
</tr>
<tr>
<td></td>
- <td><input type="button" value="$i18n.getString( 'archive' )" style="width:100px" onclick="patientArchive( 'archive' )"/><input
- type="button" value="$i18n.getString( 'unarchive' )" style="width:100px" onclick="patientArchive( 'unarchive' )"/></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'archive' )" style="width:100px" onclick="patientArchive( 'archive' )" />
+ <input type="button" value="$i18n.getString( 'unarchive' )" style="width:100px" onclick="patientArchive( 'unarchive' )" />
+ </td>
</tr>
</table>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm 2011-03-28 15:28:36 +0000
@@ -35,7 +35,7 @@
<div>
<table>
<tr>
- <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em" />
</tr>
</table>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm 2011-03-17 14:42:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm 2011-03-28 15:28:36 +0000
@@ -12,8 +12,10 @@
<form id="updateSqlViewForm" action="updateSqlViewInstance.action" method="post" >
- <div><input type="hidden" id="id" name="id" value="$!sqlViewObject.id"/>
- <input type="hidden" id="name" name="name" value="$!encoder.htmlEncode( $!sqlViewObject.name )"/></div>
+ <div>
+ <input type="hidden" id="id" name="id" value="$!sqlViewObject.id" />
+ <input type="hidden" id="name" name="name" value="$!encoder.htmlEncode( $!sqlViewObject.name )" />
+ </div>
<table>
<tr>
@@ -21,21 +23,29 @@
</tr>
<tr>
<td><label for="name">$encoder.htmlEncode( $i18n.getString( "name" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="nameField" name="nameField" value="$!encoder.htmlEncode( $!sqlViewObject.name )" style="width:20em" maxlength="50" disabled /></td>
+ <td>
+ <input type="text" id="nameField" name="nameField" value="$!encoder.htmlEncode( $!sqlViewObject.name )" style="width:20em" maxlength="50" disabled />
+ </td>
</tr>
<tr>
<td><label for="description">$encoder.htmlEncode( $i18n.getString( "description" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><textarea id="description" name="description" style="width:20em; height:6em" maxlength="255" class="{validate:{required:true,minlength:2}}">$!encoder.htmlEncode( $!sqlViewObject.description )</textarea></td>
+ <td>
+ <textarea id="description" name="description" style="width:20em; height:6em" maxlength="255" class="{validate:{required:true,minlength:2}}">$!encoder.htmlEncode( $!sqlViewObject.description )</textarea>
+ </td>
</tr>
<tr>
<td><label for="sql_statement">$encoder.htmlEncode( $i18n.getString( "sql_statement" ) ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><textarea type="text" id="sqlquery" name="sqlquery" style="width:80em;height:20em" class="{validate:{required:true,minlength:14}}">$!encoder.htmlEncode( $!sqlViewObject.sqlQuery )</textarea></td>
+ <td>
+ <textarea type="text" id="sqlquery" name="sqlquery" style="width:80em;height:20em" class="{validate:{required:true,minlength:14}}">$!encoder.htmlEncode( $!sqlViewObject.sqlQuery )</textarea>
+ </td>
</tr>
<tr>
<td></td>
- <td><input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em"/>
+ <td>
+ <input type="submit" value="$i18n.getString( 'update' )" style="width:10em" />
+ <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='showSqlViewListForm.action'" style="width:10em" />
+ </td>
</tr>
</table>
_______________________________________________
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
