dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29771
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15102: Program ui, consistent width for form elements
------------------------------------------------------------
revno: 15102
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-29 13:29:41 +0200
message:
Program ui, consistent width for form elements
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.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-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm 2014-04-29 11:29:41 +0000
@@ -25,28 +25,28 @@
<tbody>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input style="width: 330px;" type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}"></td>
+ <td><input type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}"></td>
<td></td>
</tr>
<tr>
<td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input style="width: 330px;" type="text" id="shortName" name="shortName" class="{validate:{required:true,minlength:2}}"></td>
+ <td><input type="text" id="shortName" name="shortName" class="{validate:{required:true,minlength:2}}"></td>
<td></td>
</tr>
<tr>
<td><label for="code">$i18n.getString( "code" ) </label></td>
- <td><input style="width: 330px;" type="text" id="code" name="code" class="{validate:{minlength:2}}"></td>
+ <td><input type="text" id="code" name="code" class="{validate:{minlength:2}}"></td>
<td></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" ) </label></td>
- <td><textarea style="width: 330px;" type="text" id="description" name="description" ></textarea></td>
+ <td><textarea type="text" id="description" name="description" ></textarea></td>
<td></td>
</tr>
<tr>
<td><label for="valueType">$i18n.getString( "value_type" ) </label></td>
<td>
- <select style="width: 336px;" id="valueType" name="valueType" onchange='programIndicatorOnChange();' class="{validate:{required:true}}">
+ <select id="valueType" name="valueType" onchange='programIndicatorOnChange();' class="{validate:{required:true}}">
<option value='int'>$i18n.getString('int')</option>
<option value='date'>$i18n.getString('date')</option>
</select>
@@ -56,7 +56,7 @@
<tr id='rootDateTR' style='display:none'>
<td><label for="rootDate">$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
- <select style="width:336px;" id="rootDate" name="rootDate" class="{validate:{required:true}}">
+ <select id="rootDate" name="rootDate" class="{validate:{required:true}}">
<option value='incident_date'>$i18n.getString('incident_date')</option>
<option value='execution_date'>$i18n.getString('report_date')</option>
<option value='current_date'>$i18n.getString('current_date')</option>
@@ -67,7 +67,7 @@
<tr>
<td><label for="programStageId">$i18n.getString( "program_stage" ) </label></td>
<td>
- <select style="width:336px;" id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();">
+ <select id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();">
<option value=''>[$i18n.getString('please_select')]</option>
#foreach( $programStage in $program.programStages )
<option value='$programStage.id'>$programStage.displayName</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm 2014-04-29 11:29:41 +0000
@@ -37,13 +37,13 @@
<tr>
<td></td>
<td>
- <input type="button" value="$i18n.getString( 'edit_left_side' )" onclick="editLeftExpression();">
+ <input type="button" value="$i18n.getString( 'edit_left_side' )" onclick="editLeftExpression();" style="width:10em">
<input type="hidden" id="leftSideDescription" name="leftSideDescription" class="{validate:{required:true}}">
<input type="hidden" id="leftSideExpression" name="leftSideExpression">
<input type="hidden" id="leftSideTextualExpression" name="leftSideTextualExpression">
<input type="hidden" id="leftSideNullIfBlank" name="leftSideNullIfBlank">
- <input type="button" value="$i18n.getString( 'edit_right_side' )" onclick="editRightExpression();"></td>
+ <input type="button" value="$i18n.getString( 'edit_right_side' )" onclick="editRightExpression();" style="width:10em"></td>
<input type="hidden" id="rightSideDescription" name="rightSideDescription" class="{validate:{required:true}}">
<input type="hidden" id="rightSideExpression" name="rightSideExpression">
<input type="hidden" id="rightSideTextualExpression" name="rightSideTextualExpression">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm 2014-04-29 11:29:41 +0000
@@ -12,11 +12,11 @@
<tr><th colspan="3">$i18n.getString('validation_criteria_details')</th></tr>
<tr>
<td><label for="name">$i18n.getString('name') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="2"><input type='text' id='name' name='name' style='width: 40em' class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+ <td colspan="2"><input type='text' id='name' name='name' class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
<td><label for="description">$i18n.getString('description') <em title="$i18n.getString( 'required' )" class="required">*</em></label></label></td>
- <td colspan="2"><input type='text' id='description' name='description' style='width: 40em' class="{validate:{required:true,rangelength:[2,160]}}"></td>
+ <td colspan="2"><input type='text' id='description' name='description' class="{validate:{required:true,rangelength:[2,160]}}"></td>
</tr>
<tr>
<td><label for="property">$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
@@ -24,7 +24,7 @@
<table>
<tr>
<td>
- <select id='property' name='property' style='width:16em' onChange="showDivValue();">
+ <select id='property' name='property' style='width:120px' onChange="showDivValue();">
<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
#foreach($programAttribute in $program.attributes)
#set($opt="")
@@ -36,14 +36,14 @@
</select>
</td>
<td>
- <select id='operator' name='operator' style='width: 7em'>
+ <select id='operator' name='operator' style='width: 39px'>
<option value='-1' #if( "$validationCriteria.operator"=='-1') selected #end>$i18n.getString('operator_less_then')</option>
<option value='0' #if( "$validationCriteria.operator"=='0') selected #end>$i18n.getString('operator_equal_to')</option>
<option value='1' #if( "$validationCriteria.operator"=='1') selected #end>$i18n.getString('operator_greater_then')</option>
</select>
</td>
<td id='valueTD'>
- <input id='value' name='value' class="{validate:{required:true}}" style="width:200px;"/>
+ <input type='text' id='value' name='value' class="{validate:{required:true}}" style="width:130px"/>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm 2013-12-17 01:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm 2014-04-29 11:29:41 +0000
@@ -16,8 +16,8 @@
<table class="mainPageTable">
<tr>
<td style="text-align:right">
- <input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddProgramIndicator.action?id=$program.id'" style="width:150px"><br>
- <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='program.action'" style="width:150px">
+ <input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddProgramIndicator.action?id=$program.id'" style="width:100px"><br>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='program.action'" style="width:100px">
</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2014-04-29 11:29:41 +0000
@@ -25,28 +25,28 @@
</thead>
<tr>
<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input style="width: 330px;" type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}" value='$programIndicator.name'></td>
+ <td><input type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}" value='$programIndicator.name'></td>
<td></td>
</tr>
<tr>
<td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input style="width: 330px;" type="text" id="shortName" name="shortName" class="{validate:{required:true,minlength:2}}" value='$programIndicator.shortName'></td>
+ <td><input type="text" id="shortName" name="shortName" class="{validate:{required:true,minlength:2}}" value='$programIndicator.shortName'></td>
<td></td>
</tr>
<tr>
<td><label for="code">$i18n.getString( "code" )</label></td>
- <td><input style="width: 330px;" type="text" id="code" name="code" class="{validate:{minlength:2}}" value='$programIndicator.code'></td>
+ <td><input type="text" id="code" name="code" class="{validate:{minlength:2}}" value='$programIndicator.code'></td>
<td></td>
</tr>
<tr>
<td><label for="description">$i18n.getString( "description" ) </label></td>
- <td><textarea style="width: 330px;" type="text" id="description" name="description">$programIndicator.description</textarea></td>
+ <td><textarea type="text" id="description" name="description">$programIndicator.description</textarea></td>
<td></td>
</tr>
<tr>
<td><label for="valueType">$i18n.getString( "value_type" )</label></td>
<td>
- <select style="width: 336px;" id="valueType" name="valueType" onchange='programIndicatorOnChange();' class="{validate:{required:true}}">
+ <select id="valueType" name="valueType" onchange='programIndicatorOnChange();' class="{validate:{required:true}}">
<option value='int' #if( $programIndicator.valueType=='int' ) selected #end>$i18n.getString('int')</option>
<option value='date' #if( $programIndicator.valueType=='date' ) fasdfasdf selected #end>$i18n.getString('date')</option>
</select>
@@ -56,7 +56,7 @@
<tr id='rootDateTR' #if($programIndicator.valueType!='date') style='display:none' #end >
<td><label for="rootDate">$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
- <select style="width:336px;" id="rootDate" name="rootDate" class="{validate:{required:true}}">
+ <select id="rootDate" name="rootDate" class="{validate:{required:true}}">
<option value='incident_date'>$i18n.getString('incident_date')</option>
<option value='execution_date'>$i18n.getString('report_date')</option>
<option value='current_date'>$i18n.getString('current_date')</option>
@@ -67,7 +67,7 @@
<tr>
<td><label for="programStageId">$i18n.getString( "program_stage" ) </label></td>
<td>
- <select style="width:336px;" id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();">
+ <select id="programStageId" name="programStageId" onChange="getTrackedEntityDataElements();">
<option value=''>[$i18n.getString('please_select')]</option>
#foreach( $programStage in $programIndicator.program.programStages )
<option value='$programStage.id'>$programStage.displayName</option>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm 2014-04-29 11:29:41 +0000
@@ -38,13 +38,13 @@
<tr>
<td></td>
<td>
- <input type="button" value="$i18n.getString( 'edit_left_side' )" onclick="editLeftExpression();">
+ <input type="button" value="$i18n.getString( 'edit_left_side' )" onclick="editLeftExpression();" style="width:10em">
<input type="hidden" id="leftSideDescription" name="leftSideDescription" value="$!validation.leftSide.description">
<input type="hidden" id="leftSideExpression" name="leftSideExpression" value="$!validation.leftSide.expression" class="{validate:{required:true}}">
<input type="hidden" id="leftSideTextualExpression" name="leftSideTextualExpression" value="$!leftSideTextualExpression">
<input type="hidden" id="leftSideNullIfBlank" name="leftSideNullIfBlank" value="$!validation.leftSide.nullIfBlank">
- <input type="button" value="$i18n.getString( 'edit_right_side' )" onclick="editRightExpression();">
+ <input type="button" value="$i18n.getString( 'edit_right_side' )" onclick="editRightExpression();" style="width:10em">
<input type="hidden" id="rightSideDescription" name="rightSideDescription" value="$!validation.rightSide.description">
<input type="hidden" id="rightSideExpression" name="rightSideExpression" value="$!validation.rightSide.expression" class="{validate:{required:true}}">
<input type="hidden" id="rightSideTextualExpression" name="rightSideTextualExpression" value="$!rightSideTextualExpression">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm 2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm 2014-04-29 11:29:41 +0000
@@ -12,11 +12,11 @@
</tr>
<tr>
<td><label for="name">$i18n.getString('name') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="2"><input type='text' id='name' name='name' style='width: 40em' value="$validationCriteria.name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+ <td colspan="2"><input type='text' id='name' name='name' value="$validationCriteria.name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
</tr>
<tr>
<td><label for="description">$i18n.getString('description') <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td colspan="2"><input type='text' id='description' name='description' style='width: 40em' value="$validationCriteria.description" class="{validate:{required:true,rangelength:[2,160]}}" /></td>
+ <td colspan="2"><input type='text' id='description' name='description' value="$validationCriteria.description" class="{validate:{required:true,rangelength:[2,160]}}" /></td>
</tr>
<tr>
<td><label for="property">$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
@@ -24,7 +24,7 @@
<table>
<tr>
<td>
- <select id='property' name='property' style='width:16em' onChange="showDivValue();">
+ <select id='property' name='property' style='width:120px' onChange="showDivValue();">
<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
#set($attribute = '')
#foreach($programAttribute in $program.attributes)
@@ -37,7 +37,7 @@
</select>
</td>
<td>
- <select id='operator' name='operator' style='width: 7em'>
+ <select id='operator' name='operator' style='width: 39px'>
<option value='-1' #if( "$validationCriteria.operator"=='-1') selected #end>$i18n.getString('operator_less_then')</option>
<option value='0' #if( "$validationCriteria.operator"=='0') selected #end>$i18n.getString('operator_equal_to')</option>
<option value='1' #if( "$validationCriteria.operator"=='1') selected #end>$i18n.getString('operator_greater_then')</option>
@@ -45,13 +45,13 @@
</td>
<td id='valueTD'>
#if($attribute.optionSet.options)
- <select id='value' name='value' class="{validate:{required:true}}" style="width:200px;">
+ <select id='value' name='value' class="{validate:{required:true}}" style="width:130px">
#foreach($option in $attribute.optionSet.options)
<option value="$option" #if($validationCriteria.value==$option.name) selected #end>$option</option>
#end
</select>
#else
- <input id='value' name='value' class="{validate:{required:true}}" style="width:200px;" value='$validationCriteria.value' />
+ <input type='text' id='value' name='value' class="{validate:{required:true}}" style="width:200px;" value='$validationCriteria.value' />
#end
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.vm 2014-04-29 11:29:41 +0000
@@ -21,8 +21,8 @@
</td>
<td style="text-align:right" >
- <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddValidationCriteriaForm.action?id=$program.id'" style="width:100px">
- <br><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='program.action'" style="width:100px">
+ <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddValidationCriteriaForm.action?id=$program.id'" style="width:100px"><br>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='program.action'" style="width:100px">
</td>
</tr>
</table>
