← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8900: Made dashboard search user maps instead of map views

 

------------------------------------------------------------
revno: 8900
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-06 15:30:31 +0300
message:
  Made dashboard search user maps instead of map views
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/hits.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css


--
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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/hits.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/hits.vm	2012-10-10 13:23:23 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/hits.vm	2012-11-06 12:30:31 +0000
@@ -6,8 +6,8 @@
 <li><a href="profile.action?id=${o.uid}"><img src="../images/user_small.png">&nbsp; $encoder.htmlEncode( $o.name )</a></li>
 #elseif( "Chart" == $o.getClass().getSimpleName() )
 <li><a href="../dhis-web-visualizer/app/index.html?id=${o.uid}"><img src="../images/chart_small.png">&nbsp; $encoder.htmlEncode( $o.name )</a></li>
-#elseif( "MapView" == $o.getClass().getSimpleName() )
-<li><a href="../dhis-web-mapping/mapping/index.html?id=${o.uid}"><img src="../images/map_small.png">&nbsp; $encoder.htmlEncode( $o.name )</a></li>
+#elseif( "Map" == $o.getClass().getSimpleName() )
+<li><a href="../dhis-web-mapping/app/index.html?id=${o.uid}"><img src="../images/map_small.png">&nbsp; $encoder.htmlEncode( $o.name )</a></li>
 #elseif( "Report" == $o.getClass().getSimpleName() )
 <li><a href="../dhis-web-reporting/getReportParams.action?uid=${o.uid}&mode=report"><img src="../images/table_small.png">&nbsp; $encoder.htmlEncode( $o.name )</a></li>
 #elseif( "ReportTable" == $o.getClass().getSimpleName() )

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-23 10:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-11-06 12:30:31 +0000
@@ -87,9 +87,9 @@
 #searchDiv
 {
   position: absolute;
-  left: 330px;
+  left: 331px;
   height: 24px;
-  width: 350px;
+  width: 335px;
   border: 1px solid #ccc;
   padding: 3px 6px 0 6px;
 }