dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #34054
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17469: minor: indentation consistency
------------------------------------------------------------
revno: 17469
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-11-14 13:22:03 +0100
message:
minor: indentation consistency
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupSetForm.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-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupForm.vm 2014-09-26 06:23:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupForm.vm 2014-11-14 12:22:03 +0000
@@ -1,24 +1,24 @@
<script type="text/javascript">
- jQuery(function() {
+ jQuery(function() {
validation( 'updateCategoryOptionGroupForm', function( form )
{
form.submit();
},function(){
$("#coSelected").find("option").attr("selected", "selected");
- if(jQuery("#coSelected option").length > 0 ){
- setFieldValue('hasOptions', 'true');
- }
- });
+ if(jQuery("#coSelected option").length > 0 ){
+ setFieldValue('hasOptions', 'true');
+ }
+ });
checkValueIsExist( "name", "validateCategoryOptionGroup.action", {
id : getFieldValue( 'id' )
} );
-
- checkValueIsExist( "shortName", "validateCategoryOptionGroup.action", {
+
+ checkValueIsExist( "shortName", "validateCategoryOptionGroup.action", {
id : getFieldValue( 'id' )
} );
-
- checkValueIsExist( "code", "validateCategoryOptionGroup.action", {
+
+ checkValueIsExist( "code", "validateCategoryOptionGroup.action", {
id : getFieldValue( 'id' )
} );
@@ -28,7 +28,7 @@
search: $('#coAvailableSearch'),
iterator: 'categoryOptions'
});
- });
+ });
</script>
<h3>$i18n.getString( "edit_category_option_group" )</h3>
@@ -36,27 +36,27 @@
<form id="updateCategoryOptionGroupForm" action="updateCategoryOptionGroup.action" method="post" class="inputForm">
<div>
- <input type="hidden" id="id" name="id" value="$categoryOptionGroup.id"/>
+ <input type="hidden" id="id" name="id" value="$categoryOptionGroup.id"/>
</div>
<table>
- <tr>
- <th colspan="2">$i18n.getString( "details" )</th>
- </tr>
+ <tr>
+ <th colspan="2">$i18n.getString( "details" )</th>
+ </tr>
- <tr>
- <td style="width: 120px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" class="{validate:{required:true}}" value="$encoder.htmlEncode( $!categoryOptionGroup.name )">
- </td>
- </tr>
- <tr>
- <td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="shortName" name="shortName" class="{validate:{required:true}}" value="$!encoder.htmlEncode( $categoryOptionGroup.shortName )"></td>
- </tr>
- <tr>
- <td><label for="code">$i18n.getString( "code" )</label></td>
- <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $categoryOptionGroup.code )"></td>
- </tr>
+ <tr>
+ <td style="width: 120px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" class="{validate:{required:true}}" value="$encoder.htmlEncode( $!categoryOptionGroup.name )">
+ </td>
+ </tr>
+ <tr>
+ <td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="shortName" name="shortName" class="{validate:{required:true}}" value="$!encoder.htmlEncode( $categoryOptionGroup.shortName )"></td>
+ </tr>
+ <tr>
+ <td><label for="code">$i18n.getString( "code" )</label></td>
+ <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $categoryOptionGroup.code )"></td>
+ </tr>
</table>
#jqSelected({
@@ -67,8 +67,8 @@
})
<p>
- <input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'categoryOptionGroup.action' )" style="width:10em"/>
+ <input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'categoryOptionGroup.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupSetForm.vm 2014-09-26 06:23:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupSetForm.vm 2014-11-14 12:22:03 +0000
@@ -1,14 +1,14 @@
<script type="text/javascript">
- jQuery(function() {
+ jQuery(function() {
validation( 'updateCategoryOptionGroupSetForm', function( form )
{
form.submit();
},function(){
$("#cogSelected").find("option").attr("selected", "selected");
- if(jQuery("#cogSelected option").length > 0 ){
- setFieldValue('hasOptions', 'true');
- }
- });
+ if(jQuery("#cogSelected option").length > 0 ){
+ setFieldValue('hasOptions', 'true');
+ }
+ });
checkValueIsExist( "name", "validateCategoryOptionGroupSet.action", {
id : getFieldValue( 'id' )
@@ -20,7 +20,7 @@
search: $('#cogAvailableSearch'),
iterator: 'categoryOptionGroups'
});
- });
+ });
</script>
<h3>$i18n.getString( "edit_category_option_group_set" )</h3>
@@ -28,32 +28,32 @@
<form id="updateCategoryOptionGroupSetForm" action="updateCategoryOptionGroupSet.action" method="post" class="inputForm">
<div>
- <input type="hidden" id="id" name="id" value="$categoryOptionGroupSet.id"/>
+ <input type="hidden" id="id" name="id" value="$categoryOptionGroupSet.id"/>
</div>
<table>
- <tr>
- <th colspan="2">$i18n.getString( "details" )</th>
- </tr>
+ <tr>
+ <th colspan="2">$i18n.getString( "details" )</th>
+ </tr>
- <tr>
- <td style="width: 120px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" class="{validate:{required:true}}" value="$encoder.htmlEncode( $!categoryOptionGroupSet.name )">
- </td>
- </tr>
- <tr>
- <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="description" name="description" value="#if( $categoryOptionGroupSet.description)$encoder.htmlEncode( $categoryOptionGroupSet.description )#end"></td>
- </tr>
- <tr>
- <td><label for="dataDimension">$i18n.getString( "data_dimension" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td>
- <select id="dataDimension" name="dataDimension">
- <option value="true" #if( $categoryOptionGroupSet.dataDimension ) selected="selected" #end>$i18n.getString( "yes" )</option>
- <option value="false" #if( !$categoryOptionGroupSet.dataDimension ) selected="selected" #end>$i18n.getString( "no" )</option>
- </select>
- </td>
- </tr>
+ <tr>
+ <td style="width: 120px;"><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="name" name="name" class="{validate:{required:true}}" value="$encoder.htmlEncode( $!categoryOptionGroupSet.name )">
+ </td>
+ </tr>
+ <tr>
+ <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><input type="text" id="description" name="description" value="#if( $categoryOptionGroupSet.description)$encoder.htmlEncode( $categoryOptionGroupSet.description )#end"></td>
+ </tr>
+ <tr>
+ <td><label for="dataDimension">$i18n.getString( "data_dimension" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td>
+ <select id="dataDimension" name="dataDimension">
+ <option value="true" #if( $categoryOptionGroupSet.dataDimension ) selected="selected" #end>$i18n.getString( "yes" )</option>
+ <option value="false" #if( !$categoryOptionGroupSet.dataDimension ) selected="selected" #end>$i18n.getString( "no" )</option>
+ </select>
+ </td>
+ </tr>
</table>
#jqSelected({
@@ -64,8 +64,8 @@
})
<p>
- <input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'categoryOptionGroupSet.action' )" style="width:10em"/>
+ <input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'categoryOptionGroupSet.action' )" style="width:10em"/>
</p>
</form>
