dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06152
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1918: Applied patch from Hieu. Provides feedback area for deletion of objects. Good work.
------------------------------------------------------------
revno: 1918
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Thu 2010-05-27 19:25:36 +0200
message:
Applied patch from Hieu. Provides feedback area for deletion of objects. Good work.
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.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-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm 2010-04-26 08:34:42 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm 2010-05-27 17:25:36 +0000
@@ -237,7 +237,6 @@
<input type="hidden" value="" id="hiddenId"/>
</div>
-
<table>
<tr>
<th colspan="6">$i18n.getString( 'details' )</th>
@@ -321,8 +320,6 @@
</form>
</div>
-
-
<div id='organisationUnitGroup' style="position:fixed;display:none;width:450px;z-index:10001;background-color: white;border: medium solid silver;height:200px;padding:20px;">
<div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="javascript:hideById('organisationUnitGroup');deleteDivEffect();">[x]</div>
<input type="hidden" value="" id="orgUnitId" name="orgUnitId"/>
@@ -369,6 +366,13 @@
<span id="message" style="top:100px;right:5px;position:absolute;width:200px;z-index:10002" onclick="javascript:hideById(this.id);"></span>
+<div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+</div>
+
<div id="listExcelTemplate" style="overflow:auto;position:fixed;display:none;width:300px;z-index:10001;background-color: white;border: medium solid silver;height:500px;padding:5px;right:5px;top:5px;">
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2010-03-30 04:36:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2010-05-27 17:25:36 +0000
@@ -183,6 +183,9 @@
class="org.hisp.dhis.dd.action.dataelementgroup.RemoveDataElementGroupAction">
<result name="success" type="velocity-xml">
/dhis-web-maintenance-datadictionary/responseSuccess.vm</result>
+ <result name="error" type="velocity-xml">
+ /dhis-web-maintenance-datadictionary/responseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_DATAELEMENTGROUP_DELETE</param>
</action>
@@ -214,6 +217,9 @@
class="org.hisp.dhis.dd.action.dataelementgroup.RemoveDataElementGroupAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_DATAELEMENTGROUP_DELETE</param>
</action>
@@ -326,6 +332,9 @@
class="org.hisp.dhis.dd.action.dataelementgroupset.DeleteDataElementGroupSetAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_DATAELEMENTGROUPSET_DELETE</param>
</action>
@@ -378,8 +387,6 @@
</result>
</action>
-
-
<action name="getIndicatorGroupEditor"
class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupAction">
<result name="success" type="velocity-xml">
@@ -407,6 +414,9 @@
class="org.hisp.dhis.dd.action.indicatorgroup.RemoveIndicatorGroupAction">
<result name="success" type="velocity-xml">
/dhis-web-maintenance-datadictionary/responseSuccess.vm</result>
+ <result name="error" type="velocity-xml">
+ /dhis-web-maintenance-datadictionary/responseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
</action>
@@ -440,6 +450,9 @@
class="org.hisp.dhis.dd.action.indicatorgroup.RemoveIndicatorGroupAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
</action>
@@ -552,6 +565,9 @@
class="org.hisp.dhis.dd.action.indicatorgroupset.DeleteIndicatorGroupSetAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_INDICATORGROUPSET_DELETE</param>
</action>
@@ -787,6 +803,9 @@
class="org.hisp.dhis.dd.action.datadictionary.RemoveDataDictionaryAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_DATADICTIONARY_DELETE</param>
</action>
@@ -1096,6 +1115,9 @@
class="org.hisp.dhis.dd.action.categorycombo.RemoveDataElementCategoryComboAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_DATAELEMENT_DELETE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2010-05-27 17:25:36 +0000
@@ -44,6 +44,13 @@
<p><label>$i18n.getString( "region" ):</label><br><span id="regionField"></span></p>
</div>
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2010-05-27 17:25:36 +0000
@@ -98,7 +98,7 @@
<div id="warningArea" style="display:none">
<div style="float:right">
- <a href="javascript:hideWarning()" title="$i18n.getString( "hide_warning" )"><img src="../images/close.png" alt="$i18n.getString( "hide_warning" )"></a>
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
</div>
<p><span id="warningField"></span></p>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm 2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm 2010-05-27 17:25:36 +0000
@@ -45,6 +45,13 @@
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm 2010-03-11 13:32:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm 2010-05-27 17:25:36 +0000
@@ -94,6 +94,13 @@
</div>
+<div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+</div>
+
<div id="tooltip"></div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.vm 2010-03-30 02:59:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.vm 2010-05-27 17:25:36 +0000
@@ -90,6 +90,13 @@
</div>
+<div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+</div>
+
<div id="tooltip"></div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2010-05-27 17:25:36 +0000
@@ -44,7 +44,14 @@
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
-
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2010-05-27 17:25:36 +0000
@@ -44,7 +44,14 @@
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
-
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm 2010-03-11 13:32:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView1.vm 2010-05-27 17:25:36 +0000
@@ -72,6 +72,13 @@
</div>
+<div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+</div>
+
<div id="tooltip"></div>
<script type="text/javascript">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm 2010-03-11 13:32:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView2.vm 2010-05-27 17:25:36 +0000
@@ -68,6 +68,13 @@
</div>
+<div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+</div>
+
<div id="tooltip"></div>
<script type="text/javascript">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2010-05-27 17:25:36 +0000
@@ -45,6 +45,13 @@
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js 2010-03-30 02:59:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js 2010-05-27 17:25:36 +0000
@@ -249,6 +249,12 @@
document.getElementById( 'groupNameView' ).innerHTML = "";
selectedDataElements = new Object();
}
+ else if ( type == 'error' )
+ {
+ setFieldValue( 'warningArea', xmlObject.firstChild.nodeValue );
+
+ showWarning();
+ }
}
function showRenameDataElementGroupForm()
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js 2010-03-30 02:59:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js 2010-05-27 17:25:36 +0000
@@ -204,11 +204,17 @@
{
var type = xmlObject.getAttribute( 'type' );
- if ( type=='success' )
+ if ( type == 'success' )
{
var dataElementGroupsSelect = document.getElementById( 'availableGroups' );
dataElementGroupsSelect.remove( dataElementGroupsSelect.selectedIndex );
}
+ else if ( type == 'error' )
+ {
+ setFieldValue( 'warningArea', xmlObject.firstChild.nodeValue );
+
+ showWarning();
+ }
}
function showRenameDataElementGroupForm()
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js 2010-03-30 02:59:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView1.js 2010-05-27 17:25:36 +0000
@@ -417,6 +417,12 @@
var indicatorGroupsSelect = document.getElementById( 'indicatorGroups' );
indicatorGroupsSelect.remove( indicatorGroupsSelect.selectedIndex );
}
+ else if ( type == "error" )
+ {
+ setFieldValue( 'warningArea', xmlObject.firstChild.nodeValue );
+
+ showWarning();
+ }
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js 2010-03-30 02:59:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView2.js 2010-05-27 17:25:36 +0000
@@ -378,6 +378,12 @@
var list = byId('availableGroups');
list.remove( list.selectedIndex );
}
+ else if ( type == "error" )
+ {
+ setFieldValue( 'warningArea', xmlObject.firstChild.nodeValue );
+
+ showWarning();
+ }
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2010-05-27 17:25:36 +0000
@@ -43,6 +43,13 @@
<p><label>$i18n.getString( "number_of_categories" ):</label><br><span id="dataElementCategoryCountField"></span></p>
</div>
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-05-24 16:30:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-05-27 17:25:36 +0000
@@ -185,6 +185,8 @@
<action name="delDataSet"
class="org.hisp.dhis.dataset.action.DelDataSetAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_DATASET_DELETE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2010-05-27 17:25:36 +0000
@@ -80,6 +80,13 @@
<p><label>$i18n.getString( "number_of_data_elements" ):</label><br><span id="dataElementCountField"></span></p>
<p><label>$i18n.getString( "dataentryform" ):</label><br><span id="dataEntryFormField"></span></p>
</div>
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js 2010-03-24 02:56:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/multiDataSet.js 2010-05-27 17:25:36 +0000
@@ -234,5 +234,11 @@
availableList.remove( availableList.selectedIndex );
setMessage( message );
}
+ else if ( type == "error" )
+ {
+ setFieldValue( 'warningArea', xmlObject.firstChild.nodeValue );
+
+ showWarning();
+ }
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm 2010-04-28 04:59:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm 2010-05-27 17:25:36 +0000
@@ -249,6 +249,13 @@
</div>
+<div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+</div>
+
<span id="message" style="top:100px;right:5px;position:fixed;width:200px;z-index:10002" onclick="hideById(this.id);"></span>
<script type="text/javascript">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2010-02-10 19:12:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2010-05-27 17:25:36 +0000
@@ -178,6 +178,9 @@
class="org.hisp.dhis.oum.action.organisationunitgroup.RemoveOrganisationUnitGroupAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_ORGUNITGROUP_DELETE</param>
</action>
@@ -275,6 +278,9 @@
class="org.hisp.dhis.oum.action.organisationunitgroupset.RemoveGroupSetAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_ORGUNITGROUPSET_DELETE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2010-05-27 17:25:36 +0000
@@ -56,7 +56,7 @@
<div id="warningArea" style="display:none">
<div style="float:right">
- <a href="javascript:hideWarning()" title="$i18n.getString( "hide_warning" )"><img src="../images/close.png" alt="$i18n.getString( "hide_warning" )"></a>
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
</div>
<p><span id="warningField"></span></p>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm 2010-05-27 17:25:36 +0000
@@ -42,7 +42,14 @@
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_group_members" ):</label><br><span id="memberCountField"></span></p>
</div>
-
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm 2010-05-27 17:25:36 +0000
@@ -44,7 +44,14 @@
<p><label>$i18n.getString( "compulsory" ):</label><br><span id="compulsoryField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
-
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml 2010-04-21 10:42:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml 2010-05-27 17:25:36 +0000
@@ -43,8 +43,8 @@
<result name="logout" type="redirect">/dhis-web-commons-security/logout.action</result>
<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
<param name="requiredAuthorities">F_USER_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
-
<action name="showAddUserForm" class="org.hisp.dhis.user.action.SetupTreeAction">
<result name="success" type="velocity">/main.vm</result>
@@ -114,6 +114,7 @@
<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
<result name="logout" type="redirect">/</result>
<param name="requiredAuthorities">F_USERROLE_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
<action name="showAddRoleForm" class="org.hisp.dhis.user.action.SetupRoleAction">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm 2010-02-25 03:10:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm 2010-05-27 17:25:36 +0000
@@ -51,6 +51,13 @@
<p><label>$i18n.getString( "members" ):</label><br><span id="membersField"></span></p>
<p><label>$i18n.getString( "data_sets" ):</label><br><span id="dataSetsField"></span></p>
</div>
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2010-04-21 10:42:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2010-05-27 17:25:36 +0000
@@ -60,6 +60,13 @@
<p><label>$i18n.getString( "email" ):</label><br><span id="emailField"></span></p>
<p><label>$i18n.getString( "phone_number" ):</label><br><span id="phoneNumberField"></span></p>
</div>
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm 2010-05-27 17:25:36 +0000
@@ -53,6 +53,13 @@
<p><label>$i18n.getString( "organisation_unit" ):</label><br><span id="organisationNameField"></span></p>
<p><label>$i18n.getString( "email" ):</label><br><span id="emailField"></span></p>
</div>
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2010-04-26 09:09:48 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2010-05-27 17:25:36 +0000
@@ -25,6 +25,7 @@
<action name="removeDocument" class="org.hisp.dhis.reporting.document.action.RemoveDocumentAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="requiredAuthorities">F_DOCUMENT_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
<action name="displayViewDocumentForm" class="org.hisp.dhis.reporting.document.action.GetAllDocumentsAction">
@@ -76,6 +77,7 @@
<action name="removeChart" class="org.hisp.dhis.reporting.chart.action.RemoveChartAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="requiredAuthorities">F_CHART_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
<action name="displayAddChartForm" class="org.hisp.dhis.reporting.chart.action.GetChartOptionsAction">
@@ -132,6 +134,7 @@
<action name="removeReport" class="org.hisp.dhis.reporting.reportviewer.action.RemoveReportAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="requiredAuthorities">F_REPORT_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
<action name="createReportTable" class="org.hisp.dhis.reporting.tablecreator.action.CreateTableAction">
@@ -189,6 +192,7 @@
<action name="removeTable" class="org.hisp.dhis.reporting.tablecreator.action.RemoveTableAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="requiredAuthorities">F_REPORTTABLE_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
<action name="saveTable" class="org.hisp.dhis.reporting.tablecreator.action.SaveTableAction">
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm 2010-03-11 11:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm 2010-05-27 17:25:36 +0000
@@ -51,6 +51,13 @@
<p><label>$i18n.getString( "periods" ):</label><br><span id="periodsField"></span></p>
<p><label>$i18n.getString( "organisation_units" ):</label><br><span id="organisationUnitsField"></span></p>
</div>
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2010-03-17 06:25:32 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2010-05-27 17:25:36 +0000
@@ -51,6 +51,13 @@
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
<p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
</div>
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2010-05-27 17:25:36 +0000
@@ -42,6 +42,13 @@
<div id="detailsArea" style="display:none; padding-top:1em; padding-bottom:1em"></div>
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2010-03-11 13:21:41 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2010-05-27 17:25:36 +0000
@@ -65,6 +65,13 @@
<p><label>$i18n.getString( "crosstab_organisation_units" ):</label><br><span id="doUnitsField"></span></p>
</div>
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties 2010-05-26 15:58:31 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties 2010-05-27 17:25:36 +0000
@@ -162,4 +162,5 @@
result = result
start = Start
specify_period_type = Please specify a period type
-period_type = Period Type
\ No newline at end of file
+period_type = Period Type
+periodtype = Periodtype
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml 2010-05-26 15:58:31 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml 2010-05-27 17:25:36 +0000
@@ -47,6 +47,7 @@
<action name="removeValidationRule" class="org.hisp.dhis.validationrule.action.RemoveValidationRuleAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="requiredAuthorities">F_VALIDATIONRULE_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
<action name="validateValidationRule" class="org.hisp.dhis.validationrule.action.ValidateValidationRuleAction">
@@ -113,6 +114,7 @@
<action name="removeValidationRuleGroup" class="org.hisp.dhis.validationrule.action.validationrulegroup.RemoveValidationRuleGroupAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="requiredAuthorities">F_VALIDATIONRULEGROUP_DELETE</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
<action name="showAddValidationRuleGroupForm" class="org.hisp.dhis.validationrule.action.validationrulegroup.GetValidationRuleGroupMembersAction">
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2010-05-26 15:58:31 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2010-05-27 17:25:36 +0000
@@ -17,7 +17,7 @@
</tr>
<tr>
<th>$i18n.getString( "name" )</th>
- <th>$i18n.getString('period_type')</th>
+ <th>$i18n.getString('periodtype')</th>
<th colspan="3">$i18n.getString( "operations" )</th>
</tr>
</thead>
@@ -48,6 +48,13 @@
<p><label>$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
<p><label>$i18n.getString( "right_side_description" ):</label><br><span id="rightSideDescriptionField"></span></p>
</div>
+
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm 2010-02-24 17:04:30 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm 2010-05-27 17:25:36 +0000
@@ -43,6 +43,13 @@
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
+ <div id="warningArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/close.png" alt=$i18n.getString( "hide_warning" )'></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
