[fusion-commits] r1699 - in trunk: . layers/MapGuide/php templates/mapserver/standard

[svn_fusion at osgeo.org]

Author: pagameba
Date: 2008-12-01 10:19:50 -0500 (Mon, 01 Dec 2008)
New Revision: 1699

Modified:
   trunk/build.xml
   trunk/layers/MapGuide/php/LoadMap.php
   trunk/templates/mapserver/standard/index.html
Log:
Re #186, convert one more string boolean value to a real boolean value.

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-11-28 20:13:40 UTC (rev 1698)
+++ trunk/build.xml	2008-12-01 15:19:50 UTC (rev 1699)
@@ -224,11 +224,11 @@
     </concat>
     
     <replace file="${buildOutput}.js" token="lib/fusion" value="lib/${sfName}"/>
-   
+    <copy file="${buildOutput}.js" todir="${basedir}/lib"/>
   </target>
 
 <!-- =================== concat all support files (no appdef supplied) ================================== -->
-  <target description="concatenate core files into a single file" name="concatNoAppDef" depends="prepare" unless="appDef">
+  <target description="concatenate core files into a single file" name="concatNoAppDef" unless="appDef">
     <echo message="concatenating all widget and map layer files"/>
     
     <!-- merge everything into a single file -->
@@ -239,7 +239,7 @@
   </target>
 
 <!-- =================== concat support files included in AppDef ================================== -->
-  <target description="concatenate core files into a single file" name="concatWithAppDef" depends="prepare,appDef2Json" if="appDef">
+  <target description="concatenate core files into a single file" name="concatWithAppDef" depends="appDef2Json" if="appDef">
     <echo message="preparing single file build for ${appDef}"/>
     
     <!-- merge everything into a single file -->
@@ -260,6 +260,8 @@
           output="${buildOutput}-compressed.js">
         <arg value="${buildOutput}.js"/>
     </java>
+    <copy file="${buildOutput}-compressed.js" todir="${basedir}/lib"/>
+    
   </target>
 
 <!-- =================== concat all CSS files ================================== -->
@@ -352,8 +354,8 @@
 
   <target description="Delete old build and dist directories" name="clean">
     <echo message="Removing build directories"/>
-    <delete dir="${build.home}"/>
-    <delete dir="${dist.home}"/>
+    <!--delete dir="${build.home}"/>
+    <delete dir="${dist.home}"/-->
   </target>
 
 

Modified: trunk/layers/MapGuide/php/LoadMap.php
===================================================================
--- trunk/layers/MapGuide/php/LoadMap.php	2008-11-28 20:13:40 UTC (rev 1698)
+++ trunk/layers/MapGuide/php/LoadMap.php	2008-12-01 15:19:50 UTC (rev 1699)
@@ -131,7 +131,7 @@
         $layerObj->selectable = $layer->GetSelectable();
         $layerObj->visible = $layer->GetVisible();
         $layerObj->actuallyVisible = $layer->isVisible();
-        $layerObj->editable = IsLayerEditable($resourceService, $layer) ? 'true' : 'false';
+        $layerObj->editable = IsLayerEditable($resourceService, $layer);
 
 
         $layerObj->legendLabel = addslashes($layer->GetLegendLabel());
@@ -339,13 +339,13 @@
 
 // Converts a boolean to "yes" or "no"
 // --from MG Web Tier API Reference
-function BooleanToString($boolean)
-{
-    if (is_bool($boolean))
-        return ($boolean ? "true" : "false");
-    else
-        return "'ERROR in BooleanToString.'";
-}
+// function BooleanToString($boolean)
+// {
+//     if (is_bool($boolean))
+//         return ($boolean ? "true" : "false");
+//     else
+//         return "'ERROR in BooleanToString.'";
+// }
 
 function OutputGroupInfo($group)
 {

Modified: trunk/templates/mapserver/standard/index.html
===================================================================
--- trunk/templates/mapserver/standard/index.html	2008-11-28 20:13:40 UTC (rev 1698)
+++ trunk/templates/mapserver/standard/index.html	2008-12-01 15:19:50 UTC (rev 1699)
@@ -6,7 +6,7 @@
 <!-- change the source of the following tag to point to your fusion installation
     <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>
  -->    
-<script type="text/javascript" src="../../../lib/fusion.js"></script>
+<script type="text/javascript" src="../../../lib/fusionSF-compressed.js"></script>
 <link rel="stylesheet" href="themes/delicious/jxtheme.uncompressed.css" type="text/css" media="screen" charset="utf-8">
 <link rel="stylesheet" href="icons.css" type="text/css" media="screen" charset="utf-8">
 <style type="text/css">