dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13301
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-12-18 11:48:39 +0100
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.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-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2013-12-18 09:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2013-12-18 10:48:39 +0000
@@ -6,7 +6,7 @@
     <meta name="keywords" content="DHIS 2">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link type="text/css" rel="stylesheet" href="../dhis-web-commons/font-awesome/css/font-awesome.min.css" />
-	  <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css" />
     <link type="text/css" rel="stylesheet" media="screen,print" href="../dhis-web-commons/css/${stylesheet}" />
     <link type="text/css" rel="stylesheet" media="screen,print" href="../dhis-web-commons/css/widgets.css" />
     <link type="text/css" rel="stylesheet" media="print" href="../dhis-web-commons/css/print.css" />

=== 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-12-18 08:26:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2013-12-18 10:48:39 +0000
@@ -18,7 +18,6 @@
 
   <package name="dhis-web-commons" extends="struts-default" namespace="/dhis-web-commons">
 
-	
     <result-types>
       <result-type name="plainTextErrorResult" class="org.hisp.dhis.result.PlainTextErrorResult" />
       <result-type name="chart" class="org.hisp.dhis.result.ChartResult" />
@@ -291,7 +290,6 @@
   <!-- i18n -->
 
   <package name="dhis-web-commons-i18n" extends="dhis-web-commons" namespace="/dhis-web-commons">
-
     <!-- TODO give i18n its own namespace and move cacheManifest action to dhis-web-commons package -->
 
     <action name="cacheManifest" class="org.hisp.dhis.appcache.AppCacheAction">
@@ -855,11 +853,11 @@
     </action>
 
     <action name="getHelpContent" class="org.hisp.dhis.help.action.GetHelpContentAction">
-      <result name="success" type="outputStreamResult"></result>
+      <result name="success" type="outputStreamResult" />
     </action>
 
     <action name="getHelpItems" class="org.hisp.dhis.help.action.GetHelpItemsAction">
-      <result name="success" type="outputStreamResult"></result>
+      <result name="success" type="outputStreamResult" />
     </action>
 
     <action name="showUpdateUserAccountForm" class="org.hisp.dhis.useraccount.action.GetCurrentUserAction">