[fusion-commits] r1714 - in branches: . fusion2-mg21 fusion2-mg21/layers/MapServer fusion2-mg21/templates/mapserver/standard fusion2-mg21/widgets

[svn_fusion at osgeo.org]

Author: pagameba
Date: 2008-12-15 08:30:33 -0500 (Mon, 15 Dec 2008)
New Revision: 1714

Added:
   branches/fusion2-mg21/
Modified:
   branches/fusion2-mg21/build.xml
   branches/fusion2-mg21/layers/MapServer/MapServer.js
   branches/fusion2-mg21/templates/mapserver/standard/ApplicationDefinition.xml
   branches/fusion2-mg21/widgets/LayerManager.js
Log:
make branch from trunk for mapguide 2.1

Copied: branches/fusion2-mg21 (from rev 1713, trunk)

Modified: branches/fusion2-mg21/build.xml
===================================================================
--- trunk/build.xml	2008-12-12 19:53:36 UTC (rev 1713)
+++ branches/fusion2-mg21/build.xml	2008-12-15 13:30:33 UTC (rev 1714)
@@ -17,7 +17,7 @@
      from which Ant executes the requested task.  This is normally
      set to the current working directory.
 -->
-  <project basedir="." default="deploy" name="fusion">
+  <project basedir="." default="compress" name="fusion">
 
 <!-- ===================== Property Definitions =========================== -->
 <!--
@@ -76,7 +76,7 @@
   <property name="app.path" value="/${app.name}"/>
   <property name="app.version" value="1.1.x"/>
   <property name="build.home" value="${basedir}/build"/>
-  <property name="deploy.home" value="${env.HTDOCS}/${app.name}"/>
+  <property name="deploy.home" value="."/>
   <property name="dist.home" value="${basedir}/dist"/>
   <property name="docs.home" value="${build.home}/docs"/>
 

Modified: branches/fusion2-mg21/layers/MapServer/MapServer.js
===================================================================
--- trunk/layers/MapServer/MapServer.js	2008-12-12 19:53:36 UTC (rev 1713)
+++ branches/fusion2-mg21/layers/MapServer/MapServer.js	2008-12-15 13:30:33 UTC (rev 1714)
@@ -760,11 +760,11 @@
       }
   },
 
-    getLegendImageURL: function(fScale, layer) {
+    getLegendImageURL: function(fScale, layer, style) {
         var sl = Fusion.getScriptLanguage();
         var url = Fusion.getFusionURL() + '/layers/' + this.arch + '/' + sl  + '/LegendIcon.' + sl;
         var sessionid = this.getSessionID();
-        var params = 'mapname='+this._sMapname+"&session="+sessionid + '&layername='+layer.resourceId + '&classindex='+this.index;
+        var params = 'mapname='+this._sMapname+"&session="+sessionid + '&layername='+layer.resourceId + '&classindex='+style.index;
         return url + '?'+params;
     }
 

Modified: branches/fusion2-mg21/templates/mapserver/standard/ApplicationDefinition.xml
===================================================================
--- trunk/templates/mapserver/standard/ApplicationDefinition.xml	2008-12-12 19:53:36 UTC (rev 1713)
+++ branches/fusion2-mg21/templates/mapserver/standard/ApplicationDefinition.xml	2008-12-15 13:30:33 UTC (rev 1714)
@@ -9,6 +9,15 @@
  ****************************************** -->
 
   <MapSet xsi:type="MapSetType">
+    <MapGroup id="hawaii" xsi:type="MapType">
+      <Map xsi:type="MapLayerType">
+        <Type>MapServer</Type>
+        <SingleTile>true</SingleTile>
+        <Extension>
+            <MapFile>/ms4w/apps/dmsg/hawaii/map/hawaii.map</MapFile>
+        </Extension>
+      </Map>
+    </MapGroup>
     <MapGroup id="reliance-roads" xsi:type="MapType">
       <Map xsi:type="MapLayerType">
         <Type>MapServer</Type>
@@ -1120,7 +1129,7 @@
       <Extension xsi:type="CustomContentType">
         <MenuContainer>MapContextMenu</MenuContainer>
       </Extension>
-      <MapId>reliance-roads</MapId>
+      <MapId>hawaii</MapId>
     </MapWidget>
 
 <!-- OVERVIEW MAP    

Modified: branches/fusion2-mg21/widgets/LayerManager.js
===================================================================
--- trunk/widgets/LayerManager.js	2008-12-12 19:53:36 UTC (rev 1713)
+++ branches/fusion2-mg21/widgets/LayerManager.js	2008-12-15 13:30:33 UTC (rev 1714)
@@ -102,7 +102,7 @@
       var map = this.getMap();
       for (var i=0; i<map.aMaps.length; ++i) {
         var mapBlock = document.createElement('li');
-        this.mapBlock.className = 'jxLmanMap';
+        mapBlock.className = 'jxLmanMap';
         mapBlock.id = 'mapBlock_'+i;
         
         //add a handle so the map blocks can be re-arranged