[mapguide-commits] r7146 - sandbox/jng/weblayout/Web/src/viewerfiles

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-10-19 11:54:17 -0700 (Fri, 19 Oct 2012)
New Revision: 7146

Modified:
   sandbox/jng/weblayout/Web/src/viewerfiles/ajaxmappane.templ
   sandbox/jng/weblayout/Web/src/viewerfiles/framesetnotaskbar.templ
   sandbox/jng/weblayout/Web/src/viewerfiles/framesettaskbar.templ
   sandbox/jng/weblayout/Web/src/viewerfiles/mainframe.templ
Log:
viewer file updates to support passing and plugging in the new Web Layout properties

Modified: sandbox/jng/weblayout/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- sandbox/jng/weblayout/Web/src/viewerfiles/ajaxmappane.templ	2012-10-19 18:01:14 UTC (rev 7145)
+++ sandbox/jng/weblayout/Web/src/viewerfiles/ajaxmappane.templ	2012-10-19 18:54:17 UTC (rev 7146)
@@ -339,15 +339,15 @@
 var cancelTgt;
 var locale = '%s';
 var openHlinkText = macOS ? "__#OPENHYPERLINKMAC#__" : "__#OPENHYPERLINK#__";
-var selectionColor = '0x0000FFFF'; // Blue
 var lastLegendScaleUpdate = curScale;
 var featureRequestUrl = '%s';
 %s
 var isAlertShow = false;
-var mapImgFormat = "PNG";
-var selectionImgFormat = "PNG";
+var selectionColor = '0x%s';
+var mapImgFormat = "%s";
+var selectionImgFormat = "%s";
 var queryVariant = "INTERSECTS";
-var bufferPx = 2;
+var bufferPx = %s;
 
 var simulateCirclePoints = [];
 var simulateCircleHalfPointNumber = 40;

Modified: sandbox/jng/weblayout/Web/src/viewerfiles/framesetnotaskbar.templ
===================================================================
--- sandbox/jng/weblayout/Web/src/viewerfiles/framesetnotaskbar.templ	2012-10-19 18:01:14 UTC (rev 7145)
+++ sandbox/jng/weblayout/Web/src/viewerfiles/framesetnotaskbar.templ	2012-10-19 18:54:17 UTC (rev 7146)
@@ -1,7 +1,7 @@
 <frameset rows="%s,*,%s" frameborder=0 border=0>
     <frame name="tbFrame" %s noresize scrolling=no>
     <frameset name="maparea" cols="*,%s,0,0" frameborder=0 border=0>
-        <frame id="mapFrame" name="mapFrame" src="%s?MAPDEFINITION=%s&TYPE=%s&SHOWLEGEND=%s&SHOWPROP=%s&INFOWIDTH=%s&LOCALE=%s&HLTGT=%s&HLTGTNAME=%s&SHOWSLIDER=%s%s" noresize scrolling=no>
+        <frame id="mapFrame" name="mapFrame" src="%s?MAPDEFINITION=%s&TYPE=%s&SHOWLEGEND=%s&SHOWPROP=%s&INFOWIDTH=%s&LOCALE=%s&HLTGT=%s&HLTGTNAME=%s&SHOWSLIDER=%s&SELCOLOR=%s&MAPIMGFORMAT=%s&SELIMGFORMAT=%s&POINTBUFFERSIZE=%s%s" noresize scrolling=no>
         <frame id="taskFrame" name="taskFrame" %s noresize frameborder=1 border=1 scrolling=no>
         <frame id="formFrame" name="formFrame" noresize src="%s">
         <frame id="scriptFrame" name="scriptFrame" src="../viewerfiles/blank.html" noresize>

Modified: sandbox/jng/weblayout/Web/src/viewerfiles/framesettaskbar.templ
===================================================================
--- sandbox/jng/weblayout/Web/src/viewerfiles/framesettaskbar.templ	2012-10-19 18:01:14 UTC (rev 7145)
+++ sandbox/jng/weblayout/Web/src/viewerfiles/framesettaskbar.templ	2012-10-19 18:54:17 UTC (rev 7146)
@@ -2,7 +2,7 @@
     <frameset id="mainappFrame" name="mainappFrame" cols="*,%s" frameborder=0 border=0>
         <frameset id="maparea" name="maparea" rows="%s,*,0,0" frameborder=0 border=0>
             <frame id="tbFrame" name="tbFrame" %s noresize scrolling=no>
-            <frame id="mapFrame" name="mapFrame" src="%s?MAPDEFINITION=%s&TYPE=%s&SHOWLEGEND=%s&SHOWPROP=%s&INFOWIDTH=%s&LOCALE=%s&HLTGT=%s&HLTGTNAME=%s&SHOWSLIDER=%s%s" scrolling=no border=3>
+            <frame id="mapFrame" name="mapFrame" src="%s?MAPDEFINITION=%s&TYPE=%s&SHOWLEGEND=%s&SHOWPROP=%s&INFOWIDTH=%s&LOCALE=%s&HLTGT=%s&HLTGTNAME=%s&SHOWSLIDER=%s&SELCOLOR=%s&MAPIMGFORMAT=%s&SELIMGFORMAT=%s&POINTBUFFERSIZE=%s%s" scrolling=no border=3>
             <frame id="formFrame" name="formFrame" noresize src="%s">
             <frame id="scriptFrame" name="scriptFrame" src="../viewerfiles/blank.html" noresize>
         </frameset>

Modified: sandbox/jng/weblayout/Web/src/viewerfiles/mainframe.templ
===================================================================
--- sandbox/jng/weblayout/Web/src/viewerfiles/mainframe.templ	2012-10-19 18:01:14 UTC (rev 7145)
+++ sandbox/jng/weblayout/Web/src/viewerfiles/mainframe.templ	2012-10-19 18:54:17 UTC (rev 7146)
@@ -168,6 +168,10 @@
 var selectionAwareCmds = new Array();
 %s
 
+function StartupFunc() {
+%s
+}
+
 // public functions -----------------------------------------------
 //
 
@@ -442,6 +446,7 @@
     DisplayMapSize();
     //ping server
     pingServerFailTime = 0;
+    StartupFunc();
     if(enablePingServer)
     {
         var pingServerInterval = serverSessionTimeout / 5 * 1000;  //Ping server 5 times each period. Timeout is returned in seconds.