dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02624
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 889: Removed unused menu template.
------------------------------------------------------------
revno: 889
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-10-20 14:58:44 +0200
message:
Removed unused menu template.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/MainMenu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/orgUnitTreeMenu.vm
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm
modified:
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/struts.xml
--
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/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 2009-10-19 17:10:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2009-10-20 12:58:44 +0000
@@ -52,6 +52,7 @@
create_new_data_element_category_option_combo = Create new data element category option combination
category_combo = Combination of categories
data_element_category = Data Element Category
+data_element_category_combo = Data Element Category Combination
select = Select
data_element = Data Element
data_element_group = Data Element Group
=== 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 2009-10-19 17:10:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2009-10-20 12:58:44 +0000
@@ -13,7 +13,7 @@
class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/index.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
</action>
<!-- DataElement -->
@@ -22,7 +22,7 @@
class="org.hisp.dhis.dd.action.dataelement.GetDataElementListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/dataElement.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/dataElement.js,javascript/dataDictionary.js,javascript/filterTable.js</param>
</action>
@@ -107,7 +107,7 @@
class="org.hisp.dhis.dd.action.dataelement.GetDataElementListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/dataElementGroupEditor.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/dataElementGroupEditor.js</param>
</action>
@@ -146,7 +146,7 @@
class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/dataElementGroup.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/dataElementGroup.js,javascript/filterTable.js</param>
</action>
@@ -208,7 +208,7 @@
class="org.hisp.dhis.dd.action.indicator.GetIndicatorListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupEditor.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/indicatorGroupEditor.js</param>
<param name="stylesheets">style/indicatorGroupEditor.css</param>
</action>
@@ -248,7 +248,7 @@
class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroup.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/indicatorGroup.js,javascript/filterTable.js</param>
</action>
@@ -312,7 +312,7 @@
class="org.hisp.dhis.dd.action.indicatortype.GetIndicatorTypeListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicatorType.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/indicatorType.js</param>
</action>
@@ -372,7 +372,7 @@
class="org.hisp.dhis.dd.action.indicator.GetIndicatorListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicator.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/indicator.js,javascript/dataDictionary.js,javascript/filterTable.js,javascript/denum.js</param>
</action>
@@ -483,7 +483,7 @@
class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/dataDictionary.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/dataDictionary.js</param>
</action>
@@ -654,7 +654,7 @@
class="org.hisp.dhis.dd.action.category.GetDataElementCategoryListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/category.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/category.js,javascript/filterTable.js</param>
</action>
@@ -715,7 +715,7 @@
class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryComboListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm</param>
- <param name="menu">/dhis-web-maintenance-datadictionary/menu/MainMenu.vm</param>
+ <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/categoryCombo.js,javascript/filterTable.js</param>
</action>
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu'
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2009-10-20 12:58:44 +0000
@@ -0,0 +1,19 @@
+
+<h2>$i18n.getString( "data_element" ) </h2>
+ <ul>
+ <li><a href="dataElement.action">$i18n.getString( "data_element" ) </a></li>
+ <li><a href="dataElementGroup.action">$i18n.getString( "data_element_group" ) </a></li>
+ <li><a href="dataElementGroupEditor.action">$i18n.getString( "data_element_group_editor" ) </a></li>
+ #if ( !$dataDictionaryMode || $dataDictionaryMode != "extended" )
+ <li><a href="category.action">$i18n.getString( "data_element_category" ) </a></li>
+ <li><a href="categoryCombo.action">$i18n.getString( "data_element_category_combo" ) </a></li>
+ #end
+ </ul>
+
+<h2>$i18n.getString( "indicator" ) </h2>
+ <ul>
+ <li><a href="indicator.action">$i18n.getString( "indicator" ) </a></li>
+ <li><a href="indicatorType.action">$i18n.getString( "indicator_type" ) </a></li>
+ <li><a href="indicatorGroup.action">$i18n.getString( "indicator_group" ) </a></li>
+ <li><a href="indicatorGroupEditor.action">$i18n.getString( "indicator_group_editor" ) </a></li>
+ </ul>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/MainMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/MainMenu.vm 2009-10-19 17:10:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/MainMenu.vm 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-
-<h2>$i18n.getString( "data_element" ) </h2>
- <ul>
- <li><a href="dataElement.action">$i18n.getString( "data_element" ) </a></li>
- <li><a href="dataElementGroup.action">$i18n.getString( "data_element_group" ) </a></li>
- <li><a href="dataElementGroupEditor.action">$i18n.getString( "data_element_group_editor" ) </a></li>
- </ul>
-
-<h2>$i18n.getString( "indicator" ) </h2>
- <ul>
- <li><a href="indicator.action">$i18n.getString( "indicator" ) </a></li>
- <li><a href="indicatorType.action">$i18n.getString( "indicator_type" ) </a></li>
- <li><a href="indicatorGroup.action">$i18n.getString( "indicator_group" ) </a></li>
- <li><a href="indicatorGroupEditor.action">$i18n.getString( "indicator_group_editor" ) </a></li>
- </ul>
-
-<h2>$i18n.getString( "data_dictionary" ) </h2>
- <ul>
- <li><a href="dataDictionary.action">$i18n.getString( "data_dictionary" ) </a></li>
- </ul>
-
-#if ( !$dataDictionaryMode || $dataDictionaryMode != "extended" )
-
-<h2>$i18n.getString( "data_element_category" ) </h2>
- <ul>
- <li><a href="category.action">$i18n.getString( "category" ) </a></li>
- <li><a href="categoryCombo.action">$i18n.getString( "category_combination" ) </a></li>
- </ul>
-
-#end
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/orgUnitTreeMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/orgUnitTreeMenu.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu/orgUnitTreeMenu.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
