dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02909
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 958: Work in progress on module opening pages.
------------------------------------------------------------
revno: 958
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-11-02 19:13:58 +0100
message:
Work in progress on module opening pages.
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm
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
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm
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/updateDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.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-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css 2009-07-07 18:12:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css 2009-11-02 18:13:58 +0000
@@ -380,3 +380,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/dom.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/dom.js 2009-11-02 18:13:58 +0000
@@ -12,4 +12,16 @@
$( this ).css( "background-color", "#2a3857" );
$( this ).css( "border", "1px solid #2a3857" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js 2009-11-02 18:13:58 +0000
@@ -12,4 +12,16 @@
$( this ).css( "background-color", "#405f43" );
$( this ).css( "border", "1px solid #405f43" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2009-07-07 18:12:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2009-11-02 18:13:58 +0000
@@ -380,3 +380,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js 2009-04-17 23:13:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js 2009-11-02 18:13:58 +0000
@@ -12,4 +12,16 @@
$( this ).css( "background-color", "#518a0f" );
$( this ).css( "border", "1px solid #518a0f" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2009-04-17 23:13:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2009-11-02 18:13:58 +0000
@@ -380,3 +380,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js 2009-11-02 18:13:58 +0000
@@ -12,4 +12,16 @@
$( this ).css( "background-color", "#265687" );
$( this ).css( "border", "1px solid #265687" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2009-07-07 18:31:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2009-11-02 18:13:58 +0000
@@ -381,3 +381,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js 2009-07-07 21:34:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js 2009-11-02 18:13:58 +0000
@@ -14,4 +14,16 @@
$( this ).css( "color", "#407298" );
$( this ).css( "border", "1px solid #d6e6f2" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css 2009-07-07 22:11:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css 2009-11-02 18:13:58 +0000
@@ -380,3 +380,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js 2009-11-02 18:13:58 +0000
@@ -12,4 +12,16 @@
$( this ).css( "background-color", "#405f43" );
$( this ).css( "border", "1px solid #405f43" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css 2009-07-07 18:31:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css 2009-11-02 18:13:58 +0000
@@ -378,3 +378,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js 2009-11-02 18:13:58 +0000
@@ -12,4 +12,16 @@
$( this ).css( "background-color", "#7B0A0F" );
$( this ).css( "border", "1px solid #7B0A0F" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2009-10-22 17:22:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2009-11-02 18:13:58 +0000
@@ -375,3 +375,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js 2009-11-02 18:13:58 +0000
@@ -12,4 +12,16 @@
$( this ).css( "background-color", "#2f2f2f" );
$( this ).css( "border", "1px solid #2f2f2f" );
});
+
+ $( "li.introItem" ).mouseover( function() // Over intro item
+ {
+ $( this ).css( "background-color", "#a4d2a3" );
+ $( this ).css( "border", "1px solid #ffffff" );
+ });
+
+ $( "li.introItem" ).mouseout( function() // Out intro item
+ {
+ $( this ).css( "background-color", "#d5efd5" );
+ $( this ).css( "border", "1px solid #d5efd5" );
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css 2009-07-07 18:41:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css 2009-11-02 18:13:58 +0000
@@ -379,3 +379,32 @@
border-bottom: 1px solid #cad5e5;
background-color: #ebf0f6;
}
+
+/*----------------------------------------------------------------------------*/
+/* Intro */
+/*----------------------------------------------------------------------------*/
+
+.introList
+{
+ list-style-type:none;
+ width: 450px;
+ background-color: #d5efd5;
+ border: 1px solid #a4d2a3;
+ padding-top: 15px;
+ padding-bottom: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.introItem
+{
+ padding: 15px;
+ cursor: pointer;
+ border: 1px solid #d5efd5;
+}
+
+.introItemHeader
+{
+ color: #3c533c;
+ font-weight: bold;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2009-11-02 13:07:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2009-11-02 18:13:58 +0000
@@ -93,3 +93,9 @@
#macro( openHelp $id )
<a href="javascript:openHelpForm('${id}')" title="$i18n.getString( 'help' )"><img src="../images/help.png" alt="$i18n.getString( 'help' )"></a>
#end
+
+#macro( introListItem $action $objectKey )
+<li class="introItem" onclick="window.location.href='${action}'">
+ <span class="introItemHeader">$i18n.getString( "${objectKey}" )</span><br>$i18n.getString( "intro_${objectKey}" )
+</li>
+#end
=== 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-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2009-11-02 18:13:58 +0000
@@ -359,4 +359,15 @@
update_indicatorgroupset = Update Indicator Group Set
available_indicatorgroup = Available Indicator Groups
selected_indicatorgroup = Selected Indicator Groups
-
+intro_data_element = Create, modify, view and delete data elements.
+intro_data_element_group = Create, modify, view and delete data element groups.
+intro_data_element_group_editor = Easily add or remove data elements to and from data element groups.
+intro_data_element_group_set = Create, modify, view and delete data element group sets.
+intro_data_element_category = Create, modify, view and delete data element categories.
+intro_data_element_category_combo = Create, modify, view and delete data element category combinations.
+intro_indicator = Create, modify, view and delete indicators.
+intro_indicator_type = Create, modify, view and delete indicator types.
+intro_indicator_group = Create, modify, view and delete indicator groups.
+intro_indicator_group_editor = Easily add or remove indicators to and from indicator groups.
+intro_indicator_group_set = Create, modify, view and delete indicator group sets.
+intro_data_dictionary = Create, modify, view and delete data dictionaries.
=== 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-30 07:06:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2009-11-02 18:13:58 +0000
@@ -232,7 +232,7 @@
<!-- Data Element Group Set -->
- <action name="listDataElementGroupSet"
+ <action name="dataElementGroupSet"
class="org.hisp.dhis.dd.action.dataelementgroupset.ListDataElementGroupSetAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm</param>
@@ -419,7 +419,7 @@
<!-- Indicator Group Set -->
- <action name="lisIndicatorGroupSet"
+ <action name="indicatorGroupSet"
class="org.hisp.dhis.dd.action.indicatorgroupset.ListIndicatorGroupSetAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm</param>
@@ -438,7 +438,7 @@
<action name="addIndicatorGroupSet"
class="org.hisp.dhis.dd.action.indicatorgroupset.AddIndicatorGroupSetAction">
- <result name="success" type="redirect">lisIndicatorGroupSet.action</result>
+ <result name="success" type="redirect">indicatorGroupSet.action</result>
<param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
</action>
@@ -458,7 +458,7 @@
<action name="updateIndicatorGroupSet"
class="org.hisp.dhis.dd.action.indicatorgroupset.UpdateIndicatorGroupSetAction">
- <result name="success" type="redirect">lisIndicatorGroupSet.action</result>
+ <result name="success" type="redirect">indicatorGroupSet.action</result>
<param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
@@ -472,7 +472,7 @@
<action name="deleteIndicatorGroupSet"
class="org.hisp.dhis.dd.action.indicatorgroupset.DeleteIndicatorGroupSetAction">
- <result name="success" type="redirect">lisIndicatorGroupSet.action</result>
+ <result name="success" type="redirect">indicatorGroupSet.action</result>
<param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2009-10-30 07:06:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2009-11-02 18:13:58 +0000
@@ -47,7 +47,7 @@
</tr>
</table>
-<p><input type="button" value="$i18n.getString( "add" )" style="width:10em" onclick="validateAddDataElementGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='listDataElementGroupSet.action'" style="width:10em"></p>
+<p><input type="button" value="$i18n.getString( "add" )" style="width:10em" onclick="validateAddDataElementGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataElementGroupSet.action'" style="width:10em"></p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2009-10-30 07:06:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2009-11-02 18:13:58 +0000
@@ -47,7 +47,7 @@
</tr>
</table>
-<p><input type="button" value="$i18n.getString( "add" )" style="width:10em" onclick="validateAddIndicatorGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='lisIndicatorGroupSet.action'" style="width:10em"></p>
+<p><input type="button" value="$i18n.getString( "add" )" style="width:10em" onclick="validateAddIndicatorGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='indicatorGroupSet.action'" style="width:10em"></p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.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/index.vm 2009-11-02 18:13:58 +0000
@@ -1,3 +1,17 @@
+
<h3>$i18n.getString("dhis-web-maintenance-datadictionary")</h3>
-<p>$i18n.getString("data_dictionary_intro")</p>
\ No newline at end of file
+<ul class="introList">
+ #introListItem( "dataElement.action" "data_element" )
+ #introListItem( "dataElementGroup.action" "data_element_group" )
+ #introListItem( "dataElementGroupEditor.action" "data_element_group_editor" )
+ #introListItem( "dataElementGroupSet.action" "data_element_group_set" )
+ #introListItem( "category.action" "data_element_category" )
+ #introListItem( "categoryCombo.action" "data_element_category_combo" )
+ #introListItem( "indicator.action" "indicator" )
+ #introListItem( "indicatorType.action" "indicator_type" )
+ #introListItem( "indicatorGroup.action" "indicator_group" )
+ #introListItem( "indicatorGroupEditor.action" "indicator_group_editor" )
+ #introListItem( "indicatorGroupSet.action" "indicator_group_set" )
+ #introListItem( "dataDictionary.action" "data_dictionary" )
+</ul>
\ 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/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2009-10-29 10:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2009-11-02 18:13:58 +0000
@@ -4,11 +4,9 @@
<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>
- <li><a href="listDataElementGroupSet.action">$i18n.getString( "data_element_group_set" ) </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
+ <li><a href="dataElementGroupSet.action">$i18n.getString( "data_element_group_set" ) </a></li>
+ <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>
</ul>
<h2>$i18n.getString( "indicator" ) </h2>
@@ -17,7 +15,7 @@
<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>
- <li><a href="lisIndicatorGroupSet.action">$i18n.getString( "indicator_group_set" ) </a></li>
+ <li><a href="indicatorGroupSet.action">$i18n.getString( "indicator_group_set" ) </a></li>
</ul>
<h2>$i18n.getString( "data_dictionary" ) </h2>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2009-10-30 07:06:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2009-11-02 18:13:58 +0000
@@ -48,7 +48,7 @@
</tr>
</table>
-<p><input type="button" value="$i18n.getString( "update" )" style="width:10em" onclick="validateUpdateDataElementGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='listDataElementGroupSet.action'" style="width:10em"></p>
+<p><input type="button" value="$i18n.getString( "update" )" style="width:10em" onclick="validateUpdateDataElementGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='dataElementGroupSet.action'" style="width:10em"></p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2009-10-30 07:06:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2009-11-02 18:13:58 +0000
@@ -48,7 +48,7 @@
</tr>
</table>
-<p><input type="button" value="$i18n.getString( "update" )" style="width:10em" onclick="validateUpdateIndicatorGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='lisIndicatorGroupSet.action'" style="width:10em"></p>
+<p><input type="button" value="$i18n.getString( "update" )" style="width:10em" onclick="validateUpdateIndicatorGroupSet()"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='indicatorGroupSet.action'" style="width:10em"></p>
</form>
