dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #00753
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 196: Minor fixes/decorations. Sample strings were added for Datasets->Dataset management into i18n_glo...
------------------------------------------------------------
revno: 196
committer: Miri <murodlatifov@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-04-20 13:52:57 +0200
message:
Minor fixes/decorations. Sample strings were added for Datasets->Dataset management into i18n_global_en_GB.properties under dhis-web-commons. It is also noticeable that HTML tags can be used, which are valid inside <body></body> tags. In order to add new locale string click on easy help icon [?] and copy given string and paste into i18n_global_en_GB.properties under dhis-web-commons. Provide text, test if it is being propery used.
removed:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpService.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/reponseSuccess.vm
added:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpContent.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/helpPopup.vm
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/PopupHelpAction.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_en_GB.properties
=== added file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpContent.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpContent.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpContent.java 2009-04-20 11:52:57 +0000
@@ -0,0 +1,52 @@
+package org.hisp.dhis.system.help;
+
+/*
+ * Copyright (c) 2004-2009, 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.
+ */
+
+/**
+ * @author Murodillo Latifov Abdusamadovich
+ * @version $Id: PopupHelpAction.java 08-04-2009 $
+ */
+
+public class HelpContent {
+
+ private String header;
+ private String content;
+ public String getHeader() {
+ return header;
+ }
+ public void setHeader(String header) {
+ this.header = header;
+ }
+ public String getContent() {
+ return content;
+ }
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+}
=== removed file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpService.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpService.java 2009-04-18 14:42:14 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpService.java 1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-package org.hisp.dhis.system.help;
-
-/*
- * Copyright (c) 2004-2009, 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.
- */
-
-/**
- * @author Murodillo Latifov Abdusamadovich
- * @version $Id: PopupHelpAction.java 08-04-2009 $
- */
-
-public class HelpService {
-
- private String header;
- private String content;
- public String getHeader() {
- return header;
- }
- public void setHeader(String header) {
- this.header = header;
- }
- public String getContent() {
- return content;
- }
- public void setContent(String content) {
- this.content = content;
- }
-
-}
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/helpPopup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/helpPopup.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/helpPopup.vm 2009-04-20 11:52:57 +0000
@@ -0,0 +1,2 @@
+<p><b>$i18n.getString( $helpContent.getHeader() )</b></p>
+<p>$i18n.getString( $helpContent.getContent() )</p>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/reponseSuccess.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/reponseSuccess.vm 2009-04-18 14:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/help/reponseSuccess.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<p>$i18n.getString( $helpService.getHeader() )</p>
-<p>$i18n.getString( $helpService.getContent() )</p>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/PopupHelpAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/PopupHelpAction.java 2009-04-18 14:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/PopupHelpAction.java 2009-04-20 11:52:57 +0000
@@ -27,7 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.system.help.HelpService;
+import org.hisp.dhis.system.help.HelpContent;
import com.opensymphony.xwork.Action;
@@ -40,16 +40,16 @@
public class PopupHelpAction
implements Action
{
+
+ public HelpContent helpContent;
+
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
- private HelpService helpService;
-
private String id;
-
- public String getId() {
+ public String getId() {
return id;
}
@@ -57,21 +57,12 @@
this.id = id;
}
- public void setHelpService( HelpService helpService )
- {
- this.helpService = helpService;
- }
-
- public HelpService getHelpService() {
- return helpService;
- }
-
-
public String execute()
throws Exception
{
- helpService.setHeader("help."+id);
- helpService.setContent("help."+id+".content");
+ helpContent = new HelpContent();
+ helpContent.setHeader("help."+id);
+ helpContent.setContent("help."+id+".content");
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2009-04-18 14:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2009-04-20 11:52:57 +0000
@@ -559,7 +559,6 @@
<bean id="org.hisp.dhis.help.action.PopupHelpAction"
class="org.hisp.dhis.help.action.PopupHelpAction"
scope="prototype">
- <property name="helpService" ref="org.hisp.dhis.system.help.HelpService" />
</bean>
<!-- Common actions -->
@@ -611,7 +610,4 @@
<bean id="org.hisp.dhis.commons.action.NoAction"
class="org.hisp.dhis.commons.action.NoAction"/>
- <bean id="org.hisp.dhis.system.help.HelpService"
- class="org.hisp.dhis.system.help.HelpService"/>
-
</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2009-04-18 14:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2009-04-20 11:52:57 +0000
@@ -186,8 +186,7 @@
<!-- Dynamic Help Action MLA-->
<action name="viewDynamicHelp"
class="org.hisp.dhis.help.action.PopupHelpAction">
- <result name="success" type="velocity">/dhis-web-commons/help/reponseSuccess.vm</result>
- <result name="error" type="velocity">/dhis-web-commons/help/reponseError.vm</result>
+ <result name="success" type="velocity">/dhis-web-commons/help/helpPopup.vm</result>
</action>
</package>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_en_GB.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_en_GB.properties 2009-03-10 06:42:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_en_GB.properties 2009-04-20 11:52:57 +0000
@@ -392,3 +392,5 @@
log_out=Log out
hide_details=Hide details
format.Survey.endDate=
+help.datasetsecmanfilter = Dataset Management Menu
+help.datasetsecmanfilter.content = Clicking "Dataset Management Menu" will list existing data sets for management. User can do the following: <p>Assign organisation units<br>Assign data elements<br>Translate to other languages<br>Design custom data entry form<br>Delete data set
\ No newline at end of file
--
Trunk
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.
