dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02918
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 961: Work in progress on default pages.
------------------------------------------------------------
revno: 961
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-11-03 10:05:08 +0100
message:
Work in progress on default pages.
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/ValidateDataElementCategoryOptionAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/category.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
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/addDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.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/java/org/hisp/dhis/dd/action/category/ValidateDataElementCategoryOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/ValidateDataElementCategoryOptionAction.java 2009-11-03 08:29:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/ValidateDataElementCategoryOptionAction.java 2009-11-03 09:05:08 +0000
@@ -85,7 +85,7 @@
public String execute()
{
- if ( (name == null) || (name.trim().equals( "" )) )
+ if ( name == null || name.isEmpty() )
{
message = i18n.getString( "specify_name" );
@@ -93,13 +93,14 @@
}
else
{
- if (dataElementCategoryService.getDataElementCategoryOptionByName( name ) != null)
+ if ( dataElementCategoryService.getDataElementCategoryOptionByName( name ) != null )
{
message = i18n.getString( "name_in_use" );
-
+
return INPUT;
}
}
+
message = "ok";
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/category.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/category.js 2009-11-03 08:29:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/category.js 2009-11-03 09:05:08 +0000
@@ -64,7 +64,6 @@
addOption( 'categoryOptionNames', categoryName, categoryName );
document.getElementById( 'categoryOptionName' ).value = "";
}
-
}
// ----------------------------------------------------------------------
@@ -140,23 +139,25 @@
}
}
-
-function validateCategoryOptionJQuery() {
-
- var categoryName = $("#categoryOptionName").val();
+function validateAddCategoryOption() {
+
+ var categoryName = $( "#categoryOptionName" ).val();
- $.post("validateDataElementCategoryOption.action", {
+ $.post( "validateDataElementCategoryOption.action",
+ {
name:categoryName
- }, function ( xmlObject ) {
-
- xmlObject = xmlObject.getElementsByTagName("message")[0];
- var type = xmlObject.getAttribute("type");
-
- if ( type == "input" ) {
-
- setMessage(xmlObject.firstChild.nodeValue);
+ },
+ function ( xmlObject )
+ {
+ xmlObject = xmlObject.getElementsByTagName( "message" )[0];
+ var type = xmlObject.getAttribute( "type" );
+
+ if ( type == "input" )
+ {
+ setMessage( xmlObject.firstChild.nodeValue );
}
- else {
+ else
+ {
addCategoryOptionToCategory( categoryName );
}
}, "xml");
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2009-11-03 08:29:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2009-11-03 09:05:08 +0000
@@ -27,7 +27,7 @@
<tr>
<td></td>
<td colspan="2">
- <input type="button" value="$i18n.getString( "add_category_option" )" onclick="validateCategoryOptionJQuery()" style="width:200px">
+ <input type="button" value="$i18n.getString( "add_category_option" )" onclick="validateAddCategoryOption()" style="width:200px">
</td>
</tr>
<tr>
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java 2009-11-03 09:05:08 +0000
@@ -0,0 +1,43 @@
+package org.hisp.dhis.dataset.action;
+
+/*
+ * Copyright (c) 2004-2007, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * @author Lars Helge Overland
+ * @version $Id: NoAction.java 4279 2007-12-11 18:41:22Z larshelg $
+ */
+public class NoAction
+ extends ActionSupport
+{
+ public String execute()
+ {
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2009-09-05 07:00:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2009-11-03 09:05:08 +0000
@@ -12,7 +12,6 @@
group_filter = Group filter
all = All
cancel = Cancel
-dataset_management = Dataset management
add_new = Add new
operations = Operations
define_associations = Assign dataset to organisation units
@@ -57,7 +56,7 @@
no_more_elements_to_select = All data elements have been placed in the form. Deleting data element fields from the form will make them reappear in this popup. Please click Cancel to return to the form.
select_dataset = Select dataset
sort_section = Sort section
-section_management = Dataset Section Management
+dataset_section = Dataset Section
label = Label
group = Group
unselect_all_at_level = Unselect all at level
@@ -102,3 +101,7 @@
edit_custom_values = Edit custom values
select_customvalue = Selected Custom Values
selectdataelement = Available Data Elements
+dataset_management = Dataset management
+section_management = Dataset Section management
+intro_dataset = Create, update, view and delete data sets. A data set is a collection of data elements for which data is entered. This page also lets you define custom data entry screens and option lists.
+intro_dataset_section = Create, update, view and delete data set sections. Sections can be inserted into data sets to make them more comprehensible.
\ No newline at end of file
=== 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 2009-09-03 17:43:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2009-11-03 09:05:08 +0000
@@ -8,6 +8,12 @@
<package name="dhis-web-maintenance-dataset" extends="dhis-web-commons" namespace="/dhis-web-maintenance-dataset">
+ <action name="index" class="org.hisp.dhis.dataset.action.NoAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/index.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ </action>
+
<!-- Custom Value -->
<action name="editDataSetFormCustomValues"
@@ -18,9 +24,9 @@
<param name="requiredAuthorities">F_DATASET_UPDATE</param>
</action>
- <!-- Entry point -->
+ <!-- Dataset -->
- <action name="index" class="org.hisp.dhis.dataset.action.DataSetListAction">
+ <action name="dataSet" class="org.hisp.dhis.dataset.action.DataSetListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/dataSetList.vm</param>
<param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
@@ -94,7 +100,7 @@
<action name="saveDataSetSortOrder"
class="org.hisp.dhis.dataset.action.SaveDataSetSortOrderAction">
- <result name="success" type="redirect">index.action</result>
+ <result name="success" type="redirect">dataSet.action</result>
</action>
<!-- Show add DataSet form chain -->
@@ -158,19 +164,19 @@
<action name="addDataSet"
class="org.hisp.dhis.dataset.action.AddDataSetAction">
- <result name="success" type="redirect">index.action</result>
+ <result name="success" type="redirect">dataSet.action</result>
<param name="requiredAuthorities">F_DATASET_ADD</param>
</action>
<action name="updateDataSet"
class="org.hisp.dhis.dataset.action.UpdateDataSetAction">
- <result name="success" type="redirect">index.action</result>
+ <result name="success" type="redirect">dataSet.action</result>
<param name="requiredAuthorities">F_DATASET_UPDATE</param>
</action>
<action name="delDataSet"
class="org.hisp.dhis.dataset.action.DelDataSetAction">
- <result name="success" type="redirect">index.action</result>
+ <result name="success" type="redirect">dataSet.action</result>
<param name="requiredAuthorities">F_DATASET_DELETE</param>
</action>
@@ -192,7 +198,7 @@
<action name="defineDataSetAssociations"
class="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction">
- <result name="success" type="redirect">index.action</result>
+ <result name="success" type="redirect">dataSet.action</result>
<param name="requiredAuthorities">F_DATASET_UPDATE</param>
</action>
@@ -246,7 +252,7 @@
<action name="saveDataEntryForm"
class="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction">
- <result name="success" type="redirect">index.action</result>
+ <result name="success" type="redirect">dataSet.action</result>
</action>
<action name="validateDataEntryForm"
@@ -259,7 +265,7 @@
<action name="delDataEntryForm"
class="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction">
- <result name="success" type="redirect">index.action</result>
+ <result name="success" type="redirect">dataSet.action</result>
<result name="input" type="velocity-xml">/dhis-web-maintenance-dataset/responseInput.vm</result>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2009-11-03 09:05:08 +0000
@@ -91,7 +91,7 @@
<tr>
<td colspan="3">
<input type="submit" value="$i18n.getString( "save" )" style="width:13em"><input type="button"
- onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )" style="width:12em">
+ onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )" style="width:12em">
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2009-11-03 09:05:08 +0000
@@ -1,7 +1,6 @@
<h3>$i18n.getString( "add_section" )</h3>
-
<form id="addSectionForm" name="addSectionForm" action="addSectionAction.action" method="post" onsubmit="submitForm(); return validateAddSection()">
<table id="detailsList">
<col> ## Labels
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm 2009-05-05 15:38:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm 2009-11-03 09:05:08 +0000
@@ -50,7 +50,7 @@
<tr>
<td>
<input type="submit" id="submitButton" value="$i18n.getString( "save" )" style="width:10em"><input type="button"
- onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )" style="width:10em">
+ onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )" style="width:10em">
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm 2009-09-05 07:23:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm 2009-11-03 09:05:08 +0000
@@ -739,7 +739,7 @@
<tr>
<td>
<input type="button" onclick="remove()" value="$i18n.getString( "delete_custom_value" )" style="width:10em">
- <input type="button" onclick="window.location.href='index.action'" value="$i18n.getString( "done_custom_value" )" style="width:10em">
+ <input type="button" onclick="window.location.href='dataSet.action'" value="$i18n.getString( "done_custom_value" )" style="width:10em">
</td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2009-11-03 09:05:08 +0000
@@ -98,7 +98,7 @@
<tr>
<td colspan="3">
<input type="submit" value="$i18n.getString( "save" )" style="width:10em"><input type="button"
- onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )" style="width:10em">
+ onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )" style="width:10em">
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2009-11-03 09:05:08 +0000
@@ -52,9 +52,9 @@
</select>
</td>
<td valign="top">
- <input type="button" value=">" title="$i18n.getString('move_selected')" onclick="move( 'availableList' )">
+ <input type="button" value=">" title="$i18n.getString('move_selected')" onclick="move( 'availableList' )">
<br>
- <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="move( 'selectedList' )">
+ <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="move( 'selectedList' )">
</td>
<td>
<select id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="move( 'selectedList' )">
@@ -74,7 +74,7 @@
<tr>
<td colspan="3">
<input type="submit" value="$i18n.getString( "save" )"><input type="button"
- onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )">
+ onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )">
</td>
</tr>
</tbody>
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm 2009-11-03 09:05:08 +0000
@@ -0,0 +1,7 @@
+
+<h3>$i18n.getString( "dhis-web-maintenance-dataset" )</h3>
+
+<ul class="introList">
+ #introListItem( "dataSet.action" "dataset" )
+ #introListItem( "section.action" "dataset_section" )
+</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm 2009-04-20 14:54:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm 2009-11-03 09:05:08 +0000
@@ -1,6 +1,6 @@
<h2>$i18n.getString( "dataset" ) </h2>
<ul>
- <li><a href="index.action">$i18n.getString( "dataset_management" ) </a></li>
- <li><a href="section.action">$i18n.getString( "section_management" ) </a></li>
+ <li><a href="dataSet.action">$i18n.getString( "dataset" ) </a></li>
+ <li><a href="section.action">$i18n.getString( "dataset_section" ) </a></li>
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2009-11-03 09:05:08 +0000
@@ -25,6 +25,7 @@
<td colspan="4" style="text-align:right">
<input type="button" value="$i18n.getString( "add_new" )" onclick="javascript:addSectionSubmit()">
<input type="button" value="$i18n.getString( "sort_section" )" onclick="javascript:sortOrderSubmit()">
+ <input type="button" value="$i18n.getString( "cancel" )" onclick="javascript:window.location.href='dataSet.action'">
</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm 2009-03-31 20:02:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm 2009-11-03 09:05:08 +0000
@@ -20,7 +20,7 @@
<p>
<input type="button" value="$i18n.getString( 'save' )" style="width:130px" onclick="submitForm()"><input
-type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='index.action'">
+type="button" value="$i18n.getString( 'cancel' )" style="width:130px" onclick="window.location.href='dataSet.action'">
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm 2009-03-23 16:46:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortOrderSection.vm 2009-11-03 09:05:08 +0000
@@ -60,7 +60,7 @@
<tr>
<td colspan="4">
<input type="submit" value="$i18n.getString( "save" )"><input type="button"
- onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )"></td>
+ onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )"></td>
</tr>
</tbody>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2009-11-03 09:05:08 +0000
@@ -61,7 +61,7 @@
<tr>
<td>
<input type="submit" name="save" value="$i18n.getString( "save" )">
- <input type="button" name="cancel" value="$i18n.getString( "cancel" )" onclick="window.location.href='index.action'">
+ <input type="button" name="cancel" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataSet.action'">
</td>
<td id="cde_deletebuttoncell">
<input type="button" name="delete" value="$i18n.getString( "delete" )" onclick="removeDataEntryForm( $dataEntryForm.id, '$dataEntryForm.name' )" #if($status == "ADD") disabled #end>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2009-09-14 16:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2009-11-03 09:05:08 +0000
@@ -79,4 +79,6 @@
dhis-web-jforum-integration = Forum
report_framework = Report framework
birt = BIRT
-jasper = Jasper Reports
\ No newline at end of file
+jasper = Jasper Reports
+intro_user_settings = Customize the system with user specific settings for locale, sort order, display property, style and more.
+intro_system_settings = Customize the system behavior with regard to reporting framework, start page, title, flag and more.
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2009-08-20 08:30:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2009-11-03 09:05:08 +0000
@@ -10,19 +10,21 @@
namespace="/dhis-web-maintenance-settings">
<action name="index" class="org.hisp.dhis.settings.action.NoAction">
- <result name="success" type="redirect">userSettings.action</result>
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-settings/index.vm</param>
+ <param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
</action>
<!-- System settings -->
- <action name="getSystemSettings" class="org.hisp.dhis.settings.action.system.GetSystemSettingsAction">
+ <action name="systemSettings" class="org.hisp.dhis.settings.action.system.GetSystemSettingsAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-settings/systemSettings.vm</param>
<param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
</action>
<action name="setSystemSettings" class="org.hisp.dhis.settings.action.system.SetSystemSettingsAction">
- <result name="success" type="redirect">getSystemSettings.action</result>
+ <result name="success" type="redirect">systemSettings.action</result>
</action>
<!-- User settings -->
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm 2009-11-03 09:05:08 +0000
@@ -0,0 +1,8 @@
+
+<h3>$i18n.getString( "dhis-web-maintenance-settings" )</h3>
+
+<ul class="introList">
+ #introListItem( "userSettings.action" "user_settings" )
+ #introListItem( "systemSettings.action" "system_settings" )
+</ul>
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm 2009-11-03 09:05:08 +0000
@@ -1,5 +1,5 @@
<h2>$i18n.getString( "settings" ) </h2>
<ul>
<li><a href="userSettings.action">$i18n.getString( "user_settings" ) </a></li>
- <li><a href="getSystemSettings.action">$i18n.getString( "system_settings" ) </a></li>
+ <li><a href="systemSettings.action">$i18n.getString( "system_settings" ) </a></li>
</ul>
