------------------------------------------------------------
revno: 19249
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2015-06-02 13:47:35 +0200
message:
Program, validation rule, indicator expression builder, replaced png icons
with css links
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.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-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-06-01 15:28:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-06-02 11:47:35 +0000
@@ -210,6 +210,13 @@
user_does_not_have_valid_email=User does not have a valid email
user_has_critical_authorities=User has critical authorities
default=Default
+left_brackets=Left brackets
+right_brackets=Right brackets
+multiply=Multiply
+divide=Divide
+plus=Plus
+minus=Minus
+no_of_days=No of days
#-- Relative periods -----------------------------------------------------------#
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png 2009-10-20 13:07:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png 2009-10-20 13:07:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png 2009-10-20 13:07:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png 2009-10-20 13:07:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png 2009-10-20 13:07:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png 2009-10-20 13:07:59 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2015-05-18 21:05:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2015-06-02 11:47:35 +0000
@@ -73,13 +73,6 @@
saving_indicator_group_failed=Saving the indicator group failed with the following message
adding_indicator_type_failed=Adding the indicator type failed with the following message
saving_indicator_type_failed=Saving the indicator type failed with the following message
-left_brackets=Left brackets
-right_brackets=Right brackets
-multiply=Multiply
-divide=Divide
-plus=Plus
-minus=Minus
-no_of_days=Number of days
calculated=Calculated
available_dataelements=Available Data Elements
selected_dataelements=Selected Data Elements
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2014-10-11 19:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2015-06-02 11:47:35 +0000
@@ -59,14 +59,14 @@
<tr>
<td valign="top">
<textarea id="expression" name="expression" style="width:100%; min-width: 250px; height:160px; margin-top:2px;" wrap="virtual" onchange="cleanExpression()" class="{validate:{required:true}}"></textarea><br/>
- <div style="margin-bottom:2px">
- <a href="javascript:insertText( 'expression', '(' )"><img src="../images/left_parent.png" title="$i18n.getString( 'left_brackets' )"/></a>
- <a href="javascript:insertText( 'expression', ')' )"><img src="../images/right_parent.png" title="$i18n.getString( 'right_brackets' )"/></a>
- <a href="javascript:insertText( 'expression', '*' )"><img src="../images/multiply.png" title="$i18n.getString( 'multiply' )"/></a>
- <a href="javascript:insertText( 'expression', '/' )"><img src="../images/divide.png" title="$i18n.getString( 'divide' )"/></a>
- <a href="javascript:insertText( 'expression', '+' )"><img src="../images/plus.png" title="$i18n.getString( 'plus' )"/></a>
- <a href="javascript:insertText( 'expression', '-' )"><img src="../images/minus.png" title="$i18n.getString( 'minus' )"/></a>
- <a href="javascript:insertText( 'expression', '[days]' )"><img src="../images/no_of_days.png" title="$i18n.getString( 'no_of_days' )"/></a>
+ <div style="padding: 9px 0">
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '(' )" title="$i18n.getString( 'left_brackets' )">(</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', ')' )" title="$i18n.getString( 'right_brackets' )">)</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '*' )" title="$i18n.getString( 'multiply' )">*</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '/' )" title="$i18n.getString( 'divide' )">/</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '+' )" title="$i18n.getString( 'plus' )">+</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '-' )" title="$i18n.getString( 'minus' )">-</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '[days]' )" title="$i18n.getString( 'no_of_days' )">Days</a>
</div>
</td>
<td></td>
@@ -85,7 +85,7 @@
<th colspan="4">$i18n.getString( "description" )</th>
</tr>
<tr>
- <td colspan="4"><div id="formulaText" style="width:100%;height:170px;overflow:auto"></div></td>
+ <td colspan="4"><div id="formulaText" style="width:100%;height:160px;overflow:auto"></div></td>
</tr>
<tr>
<td colspan="4"></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2015-06-02 11:13:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2015-06-02 11:47:35 +0000
@@ -111,12 +111,12 @@
</tr>
<tr>
<td>
- <a href="javascript:insertOperator( '(' )"><img src="../images/left_parent.png" title="$i18n.getString( 'left_brackets' )"/></a>
- <a href="javascript:insertOperator( ')' )"><img src="../images/right_parent.png" title="$i18n.getString( 'right_brackets' )"/></a>
- <a href="javascript:insertOperator( '*' )"><img src="../images/multiply.png" title="$i18n.getString( 'multiply' )"/></a>
- <a href="javascript:insertOperator( '/' )"><img src="../images/divide.png" title="$i18n.getString( 'divide' )"/></a>
- <a href="javascript:insertOperator( '+' )"><img src="../images/plus.png" title="$i18n.getString( 'plus' )"/></a>
- <a href="javascript:insertOperator( '-' )"><img src="../images/minus.png" title="$i18n.getString( 'minus' )"/></a><br><br>
+ <a class="greyButtonLink" href="javascript:insertOperator( '(' )" title="$i18n.getString( 'left_brackets' )">(</a>
+ <a class="greyButtonLink" href="javascript:insertOperator( ')' )" title="$i18n.getString( 'right_brackets' )">)</a>
+ <a class="greyButtonLink" href="javascript:insertOperator( '*' )" title="$i18n.getString( 'multiply' )">*</a>
+ <a class="greyButtonLink" href="javascript:insertOperator( '/' )" title="$i18n.getString( 'divide' )">/</a>
+ <a class="greyButtonLink" href="javascript:insertOperator( '+' )" title="$i18n.getString( 'plus' )">+</a>
+ <a class="greyButtonLink" href="javascript:insertOperator( '-' )" title="$i18n.getString( 'minus' )">-</a><br><br>
</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm 2014-10-11 19:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm 2015-06-02 11:47:35 +0000
@@ -49,14 +49,14 @@
<tr>
<td valign="top">
<textarea id="expression" name="expression" style="width:100%; min-width: 250px; height:160px; margin-top:2px;" wrap="virtual" onchange="getExpressionText()" class="{validate:{required:true}}"></textarea><br/>
- <div style="margin-bottom:2px">
- <a href="javascript:insertText( 'expression', '(' )"><img src="../images/left_parent.png" alt="$i18n.getString( 'left_brackets' )"/></a>
- <a href="javascript:insertText( 'expression', ')' )"><img src="../images/right_parent.png" alt="$i18n.getString( 'right_brackets' )"/></a>
- <a href="javascript:insertText( 'expression', '*' )"><img src="../images/multiply.png" alt="$i18n.getString( 'multiply' )"/></a>
- <a href="javascript:insertText( 'expression', '/' )"><img src="../images/divide.png" alt="$i18n.getString( 'divide' )"/></a>
- <a href="javascript:insertText( 'expression', '+' )"><img src="../images/plus.png" alt="$i18n.getString( 'plus' )"/></a>
- <a href="javascript:insertText( 'expression', '-' )"><img src="../images/minus.png" alt="$i18n.getString( 'minus' )"/></a>
- <a href="javascript:insertText( 'expression', '[days]' )"><img src="../images/no_of_days.png" title="$i18n.getString( 'no_of_days' )"/></a>
+ <div style="padding: 9px 0">
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '(' )" title="$i18n.getString( 'left_brackets' )">(</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', ')' )" title="$i18n.getString( 'right_brackets' )">)</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '*' )" title="$i18n.getString( 'multiply' )">*</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '/' )" title="$i18n.getString( 'divide' )">/</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '+' )" title="$i18n.getString( 'plus' )">+</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '-' )" title="$i18n.getString( 'minus' )">-</a>
+ <a class="greyButtonLink" href="javascript:insertText( 'expression', '[days]' )" title="$i18n.getString( 'no_of_days' )">Days</a>
</div>
</td>
<td></td>
@@ -75,7 +75,7 @@
<th colspan="3">$i18n.getString( "description" )</th>
</tr>
<tr>
- <td colspan="3"><div id="formulaText" style="width:100%;height:170px;overflow:auto"></div></td>
+ <td colspan="3"><div id="formulaText" style="width:100%;height:150px;overflow:auto"></div></td>
</tr>
<tr>
<td colspan="3"></td>
_______________________________________________
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
