[mapguide-commits] r5448 - trunk/MgDev/Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Dec 8 05:11:54 EST 2010
Author: hubu
Date: 2010-12-08 02:11:54 -0800 (Wed, 08 Dec 2010)
New Revision: 5448
Modified:
trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
trunk/MgDev/Web/src/viewerfiles/toolbar.templ
Log:
Fix ticket: https://trac.osgeo.org/mapguide/ticket/1560
Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2010-12-08 05:56:32 UTC (rev 5447)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2010-12-08 10:11:54 UTC (rev 5448)
@@ -4355,31 +4355,31 @@
oncontextmenu = "return OnContextMenu(event)" onclick="return OnClick(event)" ondblclick="return OnDblClick(event)">
<table id="tbMap" width="100%%" height="100%%" cellpadding="0" cellspacing="0" id="tb">
<tr>
- <td id="InfoBand" align="left" valign="top" width="1" bgcolor="white">
+ <td id="InfoBand" align="left" valign="top" width="1px" bgcolor="white">
<div id="InfoDiv" style="visibility: hidden; display: none; width: 0px;">
<div></div>
<div class="legendCaption" id="LayerCaption">
<table width="100%%" height="100%%" cellpadding="0" cellspacing="0">
<tr id="LayerCell">
- <td><span class="legendCaptionText" id="LayerText">__#VIEWERLAYERS#__</span></td><td width="20" onclick="ToggleLegend()"><img class="legendIcon" id="legendIcon" src="../stdicons/nav_band_contract.gif"></td>
+ <td><span class="legendCaptionText" id="LayerText">__#VIEWERLAYERS#__</span></td><td width="20px" onclick="ToggleLegend()"><img class="legendIcon" id="legendIcon" src="../stdicons/nav_band_contract.gif"></td>
</tr>
</table>
</div>
<div class="legendCtrl" id="LegendCtrlDiv" style="visibility: hidden;">
- <iframe id="LegendCtrl" name="LegendCtrl" src="%s?MAPNAME=%s&SESSION=%s&LOCALE=%s" frameborder="0" width="0">
+ <iframe id="LegendCtrl" name="LegendCtrl" src="%s?MAPNAME=%s&SESSION=%s&LOCALE=%s" frameborder="0" width="0px">
</iframe>
</div>
<div class="legendCaption" id="PropertyCaption">
<table width="100%%" height="100%%" cellpadding="0" cellspacing="0">
<tr id="PropCell">
- <td class="LegendResizer" id="LegendResizer"><span class="legendCaptionText" id="PropText">__#VIEWERPROPS#__</span></td><td width="20" onclick="ToggleProperties()"><img class="legendIcon" id="propIcon" src="../stdicons/nav_band_contract.gif"></td>
+ <td class="LegendResizer" id="LegendResizer"><span class="legendCaptionText" id="PropText">__#VIEWERPROPS#__</span></td><td width="20px" onclick="ToggleProperties()"><img class="legendIcon" id="propIcon" src="../stdicons/nav_band_contract.gif"></td>
</tr>
</table>
</div>
<div class="propertyCtrl" id="PropertyCtrlDiv" style="visibility: hidden;">
<div id="PropertyPaneToolbar" class="Toolbar" style="display:none">
- <table width=100 height=30 border=0 cellpadding=0 cellspacing=0>
- <tr height=30>
+ <table width=100px height=30px border=0 cellpadding=0 cellspacing=0>
+ <tr height=30px>
<td align=center valign=center>
<select id="selLayers" onchange="OnSelectedFeatureLayerChanged()" onmousedown="return OnPropertyPaneDropDownClick(event)"></select>
</td>
@@ -4388,18 +4388,18 @@
</td>
<td align=right>
<span class="btn" id="btnZoomSelectedFeature" style="position: absolute; right: 2px;" onmouseover="HoverButton('btnZoomSelectedFeature', '')" onmouseout="LeaveButton('btnZoomSelectedFeature', '')" onclick="ZoomSelectedFeature()">
- <img class="btnImg" id="imgZoomFeature" title="" src="../stdicons/icon_zoomselect.gif" width=16 height=16>
+ <img class="btnImg" id="imgZoomFeature" title="" src="../stdicons/icon_zoomselect.gif" width=16px height=16px>
</span>
</td>
</tr>
</table>
</div>
- <iframe id="PropertyCtrl" name="PropertyCtrl" src="%s?LOCALE=%s" frameborder="0" width="0">
+ <iframe id="PropertyCtrl" name="PropertyCtrl" src="%s?LOCALE=%s" frameborder="0" width="0px">
</iframe>
</div>
</div>
</td>
- <td class="tbSplitter" id="tbSplitter" style="width: 5px;" width="5" bgcolor="#f0f0f0" onmousedown="return StartResizing(event)"></td>
+ <td class="tbSplitter" id="tbSplitter" style="width: 5px;" width="5px" bgcolor="#f0f0f0" onmousedown="return StartResizing(event)"></td>
<td id="map" onmouseout="return ExitMap(event)" style="vertical-align: top;">
<div>
<div id="mapSpace">
@@ -4420,8 +4420,8 @@
</td>
</tr>
</table>
- <div id="sliderscale" ><img id="sliderscaleimg" src="../stdicons/sliderscale.png" border=0 vspace=0 hspace=0 usemap="#scalemap" width="51" height="204" onload="OnSliderImageLoaded('sliderscaleimg')"></div>
- <div id="slider"><img id="sliderimg" src="../stdicons/slider.png" border=0 vspace=0 hspace=0 usemap="#slidermap" width="31" height="14" onload="OnSliderImageLoaded('sliderimg')"></div>
+ <div id="sliderscale" ><img id="sliderscaleimg" src="../stdicons/sliderscale.png" border=0 vspace=0 hspace=0 usemap="#scalemap" width="51px" height="204px" onload="OnSliderImageLoaded('sliderscaleimg')"></div>
+ <div id="slider"><img id="sliderimg" src="../stdicons/slider.png" border=0 vspace=0 hspace=0 usemap="#slidermap" width="31px" height="14px" onload="OnSliderImageLoaded('sliderimg')"></div>
<div id="scaleTip" class="tip"><span id="scaleTipText" class="tipText"></span></div>
<div id="selTip" class="tip"><span id="selTipText" class="tipText"></span></div>
<div id="hlph"></div>
Modified: trunk/MgDev/Web/src/viewerfiles/toolbar.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/toolbar.templ 2010-12-08 05:56:32 UTC (rev 5447)
+++ trunk/MgDev/Web/src/viewerfiles/toolbar.templ 2010-12-08 10:11:54 UTC (rev 5448)
@@ -23,8 +23,8 @@
border-width: 1px;
border-style: solid;
border-color: #f0f0f0;
- width: 26;
- height: %s;
+ width: 26px;
+ height: %spx;
top: 3px;
cursor: pointer;
/* font-family: __#@font#__; */
@@ -35,8 +35,8 @@
position: absolute;
right:5px;
top:3px;
- width: 26;
- height:25;
+ width: 26px;
+ height:25px;
border-width: 1px;
border-style: solid;
border-color: #f0f0f0;
@@ -200,7 +200,7 @@
var toolbarDef = parent.toolbarItems;
var cell = "";
- var table = "<table height=26 border=0 cellpadding=0 cellspacing=0><tr>";
+ var table = "<table height=26px border=0 cellpadding=0 cellspacing=0><tr>";
var curPosX = 5;
var flyoutIndex = 0;
for(var i = 0; i < toolbarDef.length; i++)
@@ -223,10 +223,10 @@
var execCall = "ExecuteCommand(" + tbItem.cmdIndex + ", IsToggle(" + cmd.action + "), '" + i + "')";
var icon = cmd.enabled? cmd.icon: (cmd.iconDisabled != ""? cmd.iconDisabled: cmd.icon);
- cell = "<td align=center width=30 valign=center>\n" +
+ cell = "<td align=center width=30px valign=center>\n" +
" <span class=\"btn\" id=\"" + i + "\" style=\"position: absolute; left: " + curPosX + "px;\" onclick=\"javascript: void " + execCall + ";\" onmouseover=\"HoverButton('" + i + "', " + tbItem.cmdIndex + "); return true;\" onmouseout=\"LeaveButton('" + i + "')\" >\n" +
" <a name=\"\">\n" +
- " <img class=\"btnImg\" id=\"I" + tbItem.cmdIndex + "\" title=\"" + cmd.tooltip + "\" src=\"" + encodeURI(icon) + "\" width=16 height=16>\n" +
+ " <img class=\"btnImg\" id=\"I" + tbItem.cmdIndex + "\" title=\"" + cmd.tooltip + "\" src=\"" + encodeURI(icon) + "\" width=16px height=16px>\n" +
" </a>\n" +
" </span>\n" +
"</td>\n";
@@ -240,11 +240,11 @@
var hasIcon = tbItem.iconUrl != "";
var cellW = MeasureText(tbItem.name) + (hasIcon? 42: 26);
- cell = "<td id=\"cell" + i + "\" align=right valign=top width=" + cellW + " style=\"position: absolute; left: " + curPosX + "px;\">\n" +
- " <span class=\"btnFlyout\" id=\"btn" + i + "\" style=\"width: " + cellW + "; cursor: pointer;\" onmouseover=\"HoverButton('btn" + i + "', null)\" onmouseout=\"LeaveButton('btn" + i + "', '')\" onclick=\"OpenFlyout('cell" + i + "', " + i + ")\">\n" +
- (hasIcon ? " <img class=\"iconFlyout\" title=\"\" id=\"" + i + "\" src=\"" + encodeURI(tbItem.iconUrl) + "\" width=16 height=16 Hspace=2 VSpace=2>\n" : "\n") +
+ cell = "<td id=\"cell" + i + "\" align=right valign=top width=" + cellW + "px style=\"position: absolute; left: " + curPosX + "px;\">\n" +
+ " <span class=\"btnFlyout\" id=\"btn" + i + "\" style=\"width: " + cellW + "px; cursor: pointer;\" onmouseover=\"HoverButton('btn" + i + "', null)\" onmouseout=\"LeaveButton('btn" + i + "', '')\" onclick=\"OpenFlyout('cell" + i + "', " + i + ")\">\n" +
+ (hasIcon ? " <img class=\"iconFlyout\" title=\"\" id=\"" + i + "\" src=\"" + encodeURI(tbItem.iconUrl) + "\" width=16px height=16px Hspace=2 VSpace=2>\n" : "\n") +
" <span class=\"txtFlyout\" style=\"left: " + (hasIcon? 24: 4) + "px;\"> " + tbItem.name + " </span>\n" +
- " <img class=\"arrowFlyout\" src=\"../stdicons/icon_menuarrow.gif\" style=\"left: " + (cellW - 20) + "px;\" width=16 height=16 Hspace=2 VSpace=2>\n" +
+ " <img class=\"arrowFlyout\" src=\"../stdicons/icon_menuarrow.gif\" style=\"left: " + (cellW - 20) + "px;\" width=16px height=16px Hspace=2 VSpace=2>\n" +
" </span>\n" +
"</td>\n";
@@ -270,7 +270,7 @@
<img alt="loading" src="../stdicons/icon_loading.gif">
</div>
<div id="divOpenTaskbarBtn" name="divOpenTaskbarBtn" class="cssOpenTaskbarBtn" style="display:none;" onmouseover="HoverButton('divOpenTaskbarBtn', null)" onmouseout="LeaveButton('divOpenTaskbarBtn')" onclick="OpenTaskPane()">
- <img id="imgOpen" title="__#TASKBAROPENBUTTONTEXT#__" src="../stdicons/openButton.gif" style="margin: 4px 0px 0px 5px;" width=16 height=16>
+ <img id="imgOpen" title="__#TASKBAROPENBUTTONTEXT#__" src="../stdicons/openButton.gif" style="margin: 4px 0px 0px 5px;" width=16px height=16px>
</div>
<span id="ToolbarContent">
</span>
More information about the mapguide-commits
mailing list