dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 656
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-09-10 00:28:50 +0700
message:
  (GIS) Moved folders 'mapping' and 'resources'  into dhis-web-mapping folder to clean up webapps/dhis.
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/loader2.gif
renamed:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/ => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/ => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js


--
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/images/loader2.gif'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/loader2.gif	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/loader2.gif	2009-09-09 17:28:50 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm	2009-09-06 09:30:04 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm	2009-09-09 17:28:50 +0000
@@ -6,7 +6,7 @@
     #foreach ( $view in $mapViews )
     <tr>
         <td>
-            <a href="javascript:window.location.href='../mapping/index.html?view=$view.id'">$encoder.htmlEncode( $view.name )</a>
+            <a href="javascript:window.location.href='../dhis-web-mapping/mapping/index.html?view=$view.id'">$encoder.htmlEncode( $view.name )</a>
         </td>
         <td style="width:16px">
             <a href="javascript:window.location.href='removeMapView.action?id=$view.id'" title="$i18n.getString( 'remove' )">

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml	2009-09-09 15:59:40 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml	2009-09-09 17:28:50 +0000
@@ -12,7 +12,7 @@
     <!-- Default -->
   
     <action name="index" class="org.hisp.dhis.mapping.action.NoAction">
-      <result name="success" type="redirect">../mapping/index.html</result>
+      <result name="success" type="redirect">mapping/index.html</result>
     </action>
     
     <!-- OrganisationUnit -->

=== renamed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping' => 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping'
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/index.html	2009-09-06 08:22:58 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2009-09-09 17:28:50 +0000
@@ -49,8 +49,8 @@
     <style>
         .row-assigned {background-color:#72FF63;}
         .row-not-assigned {background-color:#FFFFFF;}
-        .icon-exit {background-image:url(../images/exit.png);}
-		.x-mask-loading2 div {padding:2px 11px 3px 32px; background:#fbfbfb url('../images/loader.gif') no-repeat 5px 2px; line-height:20px; font-weight:normal}
+        .icon-exit {background-image:url(../../images/exit.png);}
+		.x-mask-loading2 div {padding:2px 11px 3px 32px; background:#fbfbfb url('../../images/loader.gif') no-repeat 5px 2px; line-height:20px; font-weight:normal}
     </style>
 </head>
 

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/index.js	2009-09-09 06:23:49 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2009-09-09 17:28:50 +0000
@@ -2041,7 +2041,7 @@
 	var zoomInButton = new Ext.Button({
 		text: 'Zoom in',
 		cls: 'x-btn-text-icon',
-		icon: '../images/zoom_in.png',
+		icon: '../../images/zoom_in.png',
 		handler:function() {
 			this.map.zoomIn();
 		},
@@ -2051,7 +2051,7 @@
 	var zoomOutButton = new Ext.Button({
 		text: 'Zoom out',
 		cls: 'x-btn-text-icon',
-		icon: '../images/zoom_out.png',
+		icon: '../../images/zoom_out.png',
 		handler:function() {
 			this.map.zoomOut();
 		},
@@ -2061,7 +2061,7 @@
 	var zoomMaxExtentButton = new Ext.Button({
 		text: 'Max extent',
 		cls: 'x-btn-text-icon',
-		icon: '../images/zoom_min.png',
+		icon: '../../images/zoom_min.png',
 		handler:function() {
 			this.map.zoomToMaxExtent();
 		},
@@ -2071,7 +2071,7 @@
 	var exitButton = new Ext.Button({
 		text: 'Exit GIS',
 		cls: 'x-btn-text-icon',
-		icon: '../images/exit.png',
+		icon: '../../images/exit.png',
 		handler: function() {
 			window.location.href = '../dhis-web-portal/redirect.action'
 		}

=== renamed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources' => 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources'
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/core/GeoStat.js	2009-09-09 05:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js	2009-09-09 17:28:50 +0000
@@ -492,7 +492,7 @@
                     Ext.messageRed.msg('Fixed bounds', 'Class breaks must be higher than ' + msg_highlight_start + this.minVal + msg_highlight_end + ' and lower than ' + msg_highlight_start + this.maxVal + msg_highlight_end + '.');
                 }
             }
-            
+			
             bounds.unshift(this.minVal);
             bounds.push(this.maxVal);
         }