dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10231
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-14 20:05:13 +0100
message:
  Impl page for overview of functions under help and profile top menu items. Useful for touch-devices.
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-about-dhis2.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-account.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-help-center.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-log-out.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-profile.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-settings.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-supportive-software.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-system-overview.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-web-api.png
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
  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.properties


--
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

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm	2013-03-14 19:05:13 +0000
@@ -0,0 +1,24 @@
+<table cellspacing="0" cellpadding="0">
+<tr>
+	
+<td valign="top">
+<ul class="introList" style="width:340px; margin-top:0px; margin-right:15px;">
+	#introListImgItem( "../dhis-web-commons-about/help.action", "help_center", "function-help-center" )
+    #introListImgItem( "../dhis-web-commons-about/software.action", "supportive_software", "function-supportive-software" )
+    #introListImgItem( "../dhis-web-commons-about/modules.action", "system_overview", "function-system-overview" )
+    #introListImgItem( "../api", "web_api", "function-web-api" )
+    #introListImgItem( "../dhis-web-commons-about/about.action", "about_dhis2", "function-about-dhis2" )
+</ul>
+</td>
+
+<td valign="top">
+<ul class="introList" style="width:340px; margin-top:0px; margin-right:15px;">
+    #introListImgItem( "../dhis-web-commons-about/userSettings.action", "settings", "function-settings" )
+    #introListImgItem( "../dhis-web-commons-about/showUpdateUserProfileForm.action", "profile", "function-profile" )
+    #introListImgItem( "../dhis-web-commons-about/showUpdateUserAccountForm.action", "account", "function-account" )
+    #introListImgItem( "../dhis-web-commons-security/logout.action", "log_out", "function-log-out" )
+</ul>
+</td>
+
+</tr>
+</table>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-about-dhis2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-about-dhis2.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-about-dhis2.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-account.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-account.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-account.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-help-center.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-help-center.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-help-center.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-log-out.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-log-out.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-log-out.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-profile.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-profile.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-profile.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-settings.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-settings.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-settings.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-supportive-software.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-supportive-software.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-supportive-software.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-system-overview.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-system-overview.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-system-overview.png	2013-03-14 19:05:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-web-api.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-web-api.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/function-web-api.png	2013-03-14 19:05:13 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-10-22 16:02:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2013-03-14 19:05:13 +0000
@@ -31,11 +31,11 @@
     } );
 
     $( "#menuLink3" ).click( function() {
-    	window.location.href = "../dhis-web-commons-about/help.action";
+    	window.location.href = "../dhis-web-commons-about/functions.action";
     } );
 
     $( "#menuLink4" ).click( function() {
-    	window.location.href = "../dhis-web-dashboard-integration/profile.action";
+    	window.location.href = "../dhis-web-commons-about/functions.action";
     } );
 	
 	// Set show and hide drop down events on top menu

=== 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	2013-02-22 11:39:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2013-03-14 19:05:13 +0000
@@ -900,6 +900,12 @@
       <param name="menu">/dhis-web-commons/about/menu.vm</param>
     </action>
 
+    <action name="functions" class="org.hisp.dhis.commons.action.NoAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-commons/about/functions.vm</param>
+      <param name="menu">/dhis-web-commons/about/menu.vm</param>
+    </action>
+
     <action name="userSettings" class="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-commons/settings/userGeneralSettings.vm</param>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-03-13 11:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-03-14 19:05:13 +0000
@@ -63,7 +63,7 @@
 dhis-web-maintenance-in=Configuration
 dhis-web-linelisting-mp=Manpower
 
-#-- Intro ----------------------------------------------------------------------#
+#-- Intro modules -------------------------------------------------------------#
 
 intro_dhis-web-maintenance-datadictionary=Maintain data elements, indicators, data dictionaries, categories and groups.
 intro_dhis-web-maintenance-dataset=Maintain data sets, custom forms, sections and compulsory data elements.
@@ -87,6 +87,18 @@
 intro_dhis-web-sms=Send reminders and notifications as SMS to phones, manually or as scheduled tasks.
 intro_dhis-web-spreadsheet-reporting=Generate and import data to/from reports based on the predefined Excel template files.
 
+#-- Intro functions -------------------------------------------------------------#
+
+intro_help_center=Get help on a various of topics related to setting up and using the DHIS 2.
+intro_supportive_software=Get an overview of useful software like report designers, myDatamart and mobile clients.
+intro_system_overview=Visit the system overview page to get a complete list of modules and their purpose.
+intro_web_api=Go to the Web API entry point, which is an interface for other computer systems.
+intro_about_dhis2=Visit the about page to get information about the system version and runtime environment.
+intro_settings=Set your personal preferences for interface language, style and email settings.
+intro_profile=Set up your personal profile with information about yourself like job title and interests.
+intro_account=Manage your user account including name, password, email and mobile phone number.
+intro_log_out=Go here to log out of the system and deny others to access your user account.
+
 #-- Common ---------------------------------------------------------------------#
 
 offline=Offline