dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4917: (mobile) made dashboard work again, also fixed some paths

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 12 Oct 2011 21:46:13 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Morten Olav Hansen (mortenoh)
------------------------------------------------------------
revno: 4917 [merge]
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-12 23:44:45 +0200
message:
  (mobile) made dashboard work again, also fixed some paths
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.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-light/src/main/webapp/dhis-web-light/dashboard_page.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm	2011-10-12 17:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm	2011-10-12 21:21:30 +0000
@@ -4,14 +4,14 @@
 	<title>$i18n.getString("DHIS_2")</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
-	<link type="text/css" rel="stylesheet" media="screen" href="style/dashboard.css">
+	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-light/style/dashboard.css">
 	
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/commons.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/javascripts/commons.ajax.js"></script>
 	<script type="text/javascript" src="../dhis-web-commons/oust/oust.js"></script>
 	<script type="text/javascript" src="../request.js"></script>
-	<script type="text/javascript" src="javascript/dashboard.js"></script>
+	<script type="text/javascript" src="../dhis-web-light/javascript/dashboard.js"></script>
   </head>
 <head>
 <body>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-10-12 21:08:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-10-12 21:21:30 +0000
@@ -3,7 +3,7 @@
 <head>
 <title>$i18n.getString("district_health_information_software")</title>
 <meta name="viewport" content="width=device-width, user-scalable=yes" />
-<link rel="stylesheet" href="/dhis-web-light/style/light.css" />
+<link rel="stylesheet" href="../dhis-web-light/style/light.css" />
 </head>
 
 <body>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm	2011-10-12 21:08:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm	2011-10-12 21:21:30 +0000
@@ -6,7 +6,7 @@
 #foreach( $period in $periods )
 <li>
 	<a href="dataEntry.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId&periodId=$period.getExternalId()">$!encoder.jsonEncode( ${period.name} )</a>
-	#if( $periodCompletedMap.get($period) )<img src="/dhis-web-light/images/check.jpg" />#end
+	#if( $periodCompletedMap.get($period) )<img src="../dhis-web-light/images/check.jpg" />#end
 </li>
 #end
 </ul>