[mapguide-commits] r6279 - in trunk/MgDev/Web/src: mapviewerjava mapviewernet mapviewerphp

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-12-02 05:35:56 -0800 (Fri, 02 Dec 2011)
New Revision: 6279

Modified:
   trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
   trunk/MgDev/Web/src/mapviewernet/mainframe.aspx
   trunk/MgDev/Web/src/mapviewerphp/mainframe.php
Log:
#1129: Allow for task bar visibility while main toolbar is not visible

Modified: trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp	2011-12-02 13:02:55 UTC (rev 6278)
+++ trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp	2011-12-02 13:35:56 UTC (rev 6279)
@@ -109,10 +109,12 @@
 
     int taskPaneWidth = taskPane.GetWidth();
     int toolbarHeight = 30;
+    int taskBarHeight = 30;
     int statusbarHeight = 26;
 
     taskPaneWidth = showTaskPane? taskPaneWidth: 0;
     toolbarHeight = showToolbar? toolbarHeight: 0;
+    taskBarHeight = showTaskBar ? taskBarHeight : 0;
     statusbarHeight = showStatusbar? statusbarHeight: 0;
 
     //Encode the initial url so that it does not trip any sub-frames (especially if this url has parameters)
@@ -436,7 +438,7 @@
                         webLayout.IsZoomControlVisible()? "1": "0",
                         sessionParam,
                         vpath + "formframe.jsp",
-                        String.valueOf(toolbarHeight),
+                        String.valueOf(taskBarHeight),
                         srcTaskBar,
                         srcTaskFrame,
                         srcStatusbar

Modified: trunk/MgDev/Web/src/mapviewernet/mainframe.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/mainframe.aspx	2011-12-02 13:02:55 UTC (rev 6278)
+++ trunk/MgDev/Web/src/mapviewernet/mainframe.aspx	2011-12-02 13:35:56 UTC (rev 6279)
@@ -108,10 +108,12 @@
 
         int taskPaneWidth = taskPane.GetWidth();
         int toolbarHeight = 30;
+        int taskBarHeight = 30;
         int statusbarHeight = 26;
 
         int taskWidth = showTaskPane ? taskPaneWidth : 0;
         toolbarHeight = showToolbar ? toolbarHeight : 0;
+        taskBarHeight = showTaskBar ? taskBarHeight : 0;
         statusbarHeight = showStatusbar ? statusbarHeight : 0;
 
         //Encode the initial url so that it does not trip any sub-frames (especially if this url has parameters)
@@ -440,7 +442,7 @@
                         webLayout.IsZoomControlVisible()? "1": "0",
                         sessionParam,
                         vpath + "formframe.aspx",
-                        toolbarHeight.ToString(NumberFormatInfo.InvariantInfo),
+                        taskBarHeight.ToString(NumberFormatInfo.InvariantInfo),
                         srcTaskBar,
                         srcTaskFrame,
                         srcStatusbar

Modified: trunk/MgDev/Web/src/mapviewerphp/mainframe.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/mainframe.php	2011-12-02 13:02:55 UTC (rev 6278)
+++ trunk/MgDev/Web/src/mapviewerphp/mainframe.php	2011-12-02 13:35:56 UTC (rev 6279)
@@ -126,10 +126,12 @@
 
         $taskPaneWidth = $taskPane->GetWidth();
         $toolbarHeight = 30;
+        $taskbarHeight = 30;
         $statusbarHeight = 26;
 
         $taskWidth = $showTaskPane? $taskPaneWidth: 0;
         $toolbarHeight = $showToolbar? $toolbarHeight: 0;
+        $taskbarHeight = $showTaskBar ? $taskbarHeight : 0;
         $statusbarHeight = $showStatusbar? $statusbarHeight: 0;
 
         //Encode the initial url so that it does not trip any sub-frames (especially if this url has parameters)
@@ -442,7 +444,7 @@
                                     $webLayout->IsZoomControlVisible()? 1: 0,
                                     $sessionParam,
                                     $vpath . "formframe.php",
-                                    $toolbarHeight+1, $srcTaskBar,
+                                    $taskbarHeight+1, $srcTaskBar,
                                     $srcTaskFrame,
                                     $srcStatusbar);
         }