dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5939
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-13 15:30:59 +0100
message:
  Added link to web api under help menu
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java
  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.vm
  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

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java	2012-02-12 17:33:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java	2012-02-13 14:30:59 +0000
@@ -171,11 +171,11 @@
         try
         {
             Date date = new SimpleDateFormat( ISO_FORMAT ).parse( isoDate );
-            return createPeriod(date);
+            return createPeriod( date );
         }
-        catch ( ParseException e )
+        catch ( ParseException ex )
         {
-            throw new RuntimeException( e );
+            throw new RuntimeException( ex );
         }
     }
 

=== 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	2011-09-29 12:57:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-02-13 14:30:59 +0000
@@ -39,38 +39,37 @@
 	var currentPath = '../dhis-web-commons-about/';
 	var backURL = '?backUrl=' + window.location;
 
-	$( "#menuDropDownHelpCenter" ).click(
-		function()
+	$( "#menuDropDownHelpCenter" ).click( function()
 		{
 			window.location.href = currentPath + 'help.action' + backURL;
 		});
 		
-	$( "#menuDropDownFeedBack" ).click(
-		function()
+	$( "#menuDropDownFeedBack" ).click(	function()
 		{
 			window.location.href = currentPath + 'displayFeedbackForm.action' + backURL;
 		});
 		
-	$( "#menuDropDownChangeLog" ).click(
-		function()
+	$( "#menuDropDownChangeLog" ).click( function()
 		{
 			window.location.href = currentPath + 'displayChangeLog.action' + backURL;
 		});
 		
-	$( "#menuDropDownSupportiveSoftware" ).click(
-		function()
+	$( "#menuDropDownSupportiveSoftware" ).click( function()
 		{
 			window.location.href= currentPath + 'displaySupportiveSoftware.action' + backURL;
 		});
 	
-	$( "#menuDropDownUserAccount" ).click(
-		function()
+	$( "#menuDropDownUserAccount" ).click( function()
 		{
 			window.location.href = currentPath + 'showUpdateUserAccountForm.action' + backURL;
 		});
 		
-	$( "#menuDropDownAboutDHIS2" ).click(
-		function()
+	$( "#menuDropDownWebApi" ).click( function()
+		{
+			window.location.href = '../api';
+		});
+		
+	$( "#menuDropDownAboutDHIS2" ).click( function()
 		{
 			window.location.href = currentPath + 'about.action' + backURL;
 		});

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2011-10-06 15:53:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-02-13 14:30:59 +0000
@@ -148,6 +148,7 @@
           <li class="menuDropDownItem" id="menuDropDownChangeLog">$i18n.getString( "change_log" )&nbsp;</li>
           <li class="menuDropDownItem" id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" )&nbsp;</li>
           <li class="menuDropDownItem" id="menuDropDownUserAccount">$i18n.getString( "user_account" )&nbsp;</li>
+          <li class="menuDropDownItem" id="menuDropDownWebApi">$i18n.getString( "web_api" )&nbsp;</li>
           <li class="menuDropDownItem" id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" )&nbsp;</li>
         </ul>
       </div>

=== 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	2012-02-12 19:23:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-02-13 14:30:59 +0000
@@ -282,6 +282,7 @@
 my_datamart_description=Local data mart for off-line data analysis
 mobile_client=Mobile client
 mobile_client_description=Client for data capture on mobile devices
+web_api = Web API
 
 #-- Change Log------------------------------------------------------------------#