[fusion-commits] r2311 - in branches/fusion-2.2/widgets: Query Theme
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Mon Dec 27 21:02:45 EST 2010
Author: hubu
Date: 2010-12-27 18:02:45 -0800 (Mon, 27 Dec 2010)
New Revision: 2311
Modified:
branches/fusion-2.2/widgets/Query/querymain.php
branches/fusion-2.2/widgets/Theme/thememain.php
Log:
Submit on behalf of Ted Yang.
fix ticket: https://trac.osgeo.org/fusion/ticket/420
The width=100% doesn't work on IE9 beta, this is a workaround.
Modified: branches/fusion-2.2/widgets/Query/querymain.php
===================================================================
--- branches/fusion-2.2/widgets/Query/querymain.php 2010-12-21 01:10:35 UTC (rev 2310)
+++ branches/fusion-2.2/widgets/Query/querymain.php 2010-12-28 02:02:45 UTC (rev 2311)
@@ -398,17 +398,32 @@
{
OnLayerChange();
OnResultChange();
+
+ AdjustTextInputWidth();
}
function OnUnload()
{
ToggleSpatialFilter(false);
}
+
+ function OnResize()
+ {
+ AdjustTextInputWidth();
+ }
+
+ //fix the defects in IE9 beta, it is a workaround for IE9beta,
+ //it is because style="width: 100%" doesn't work in IE9 beta for input type="text" under the frame, its length will be 0 when you input anything
+ //if in the final release of IE9 doesn't have this problem, maybe we can remove this fix
+ function AdjustTextInputWidth()
+ {
+ document.getElementById("valueInput").style.width = (document.body.clientWidth-8)+"px";
+ }
</script>
</head>
-<body onLoad="OnLoad();" onUnload="OnUnload();" marginwidth=5 marginheight=5 leftmargin=5 topmargin=5 bottommargin=5 rightmargin=5>
+<body onLoad="OnLoad();" onUnload="OnUnload();" onResize="OnResize();" marginwidth=5 marginheight=5 leftmargin=5 topmargin=5 bottommargin=5 rightmargin=5>
<?php if ($errorMsg == null) { ?>
@@ -450,7 +465,7 @@
<tr><td><?php echo $valueLocal ?></td></tr>
<tr>
<td class="RegText">
- <input maxlength="100" class="Ctrl" id="valueInput" style="width: 100%">
+ <input type="Text" maxlength="100" class="Ctrl" id="valueInput"/>
</td>
</tr>
<tr><td class="Spacer"></td></tr>
Modified: branches/fusion-2.2/widgets/Theme/thememain.php
===================================================================
--- branches/fusion-2.2/widgets/Theme/thememain.php 2010-12-21 01:10:35 UTC (rev 2310)
+++ branches/fusion-2.2/widgets/Theme/thememain.php 2010-12-28 02:02:45 UTC (rev 2311)
@@ -368,12 +368,31 @@
{
OnLayerChange();
UpdateColors();
+
+ AdjustTextInputWidth();
}
+
+ function OnResize()
+ {
+ AdjustTextInputWidth();
+ }
+
+ //fix the defects in IE9 beta, it is a workaround for IE9beta,
+ //it is because style="width: 100%" doesn't work in IE9 beta for input type="text" under the frame, its length will be 0 when you input anything
+ //if in the final release of IE9 doesn't have this problem, maybe we can remove this fix
+ function AdjustTextInputWidth()
+ {
+ document.getElementById("themeName").style.width = (document.body.clientWidth-8)+"px";
+ document.getElementById("minValue").style.width = (document.body.clientWidth-8)+"px";
+ document.getElementById("maxValue").style.width = (document.body.clientWidth-8)+"px";
+ document.getElementById("fillTrans").style.width = (document.body.clientWidth-23)+"px";
+ }
+
</script>
</head>
-<body onLoad="OnLoad()" marginwidth=5 marginheight=5 leftmargin=5 topmargin=5 bottommargin=5 rightmargin=5>
+<body onLoad="OnLoad();" OnResize="OnResize();" marginwidth=5 marginheight=5 leftmargin=5 topmargin=5 bottommargin=5 rightmargin=5>
<?php if ($errorMsg == null) { ?>
@@ -399,7 +418,7 @@
<tr><td colspan="2"><?php echo $nameLocal ?></td></tr>
<tr>
<td colspan="2" class="RegText">
- <input maxlength="100" class="Ctrl" id="themeName" style="width: 100%">
+ <input type="Text" maxlength="100" id="themeName" class="Ctrl"/>
</td>
</tr>
<tr><td colspan="2" class="Spacer"></td></tr>
@@ -414,13 +433,13 @@
<tr><td colspan="2"><?php echo $minLocal ?></td></tr>
<tr>
<td colspan="2" class="RegText">
- <input maxlength="100" class="Ctrl" id="minValue" style="width: 100%">
+ <input type="Text" maxlength="100" class="Ctrl" id="minValue"/>
</td>
</tr>
<tr><td colspan="2"><?php echo $maxLocal ?></td></tr>
<tr>
<td colspan="2" class="RegText">
- <input maxlength="100" class="Ctrl" id="maxValue" style="width: 100%">
+ <input type="Text" maxlength="100" class="Ctrl" id="maxValue">
</td>
</tr>
<tr><td colspan="2"><?php echo $distributionLocal ?></td></tr>
@@ -449,7 +468,7 @@
<tr><td><?php echo $fillTransparencyLocal ?></td></tr>
<tr>
<td colspan="2" class="RegText">
- <input class="Ctrl" id="fillTrans" type="text" maxlength="3" value="0" style="width:90%"> %
+ <input class="Ctrl" id="fillTrans" type="text" maxlength="3" value="0"/> %
</td>
</tr>
<tr><td colspan="2" class="Spacer"></td></tr>
@@ -457,12 +476,12 @@
<tr>
<td valign="top">
<?php echo $fromLocal ?><br>
- <span class="Swatch" id="fillFromSwatch" style="color: #FF0000; background-color: #FF0000"> transparent </span>
+ <span class="Swatch" id="fillFromSwatch" style="color: #FF0000; background-color: #FF0000"> transpar </span>
<input class="Ctrl" type="button" value="..." style="width: 22px;" onClick="PickColor(SET_FILL_FROM_COLOR,false,false)">
</td>
<td valign="top">
<?php echo $toLocal ?><br>
- <span class="Swatch" id="fillToSwatch" style="color: #0000FF; background-color: #0000FF"> transparent </span>
+ <span class="Swatch" id="fillToSwatch" style="color: #0000FF; background-color: #0000FF"> transpar </span>
<input class="Ctrl" type="button" value="..." style="width: 22px;" onClick="PickColor(SET_FILL_TO_COLOR,false,false)">
</td>
</tr>
@@ -471,12 +490,12 @@
<tr>
<td valign="top">
<?php echo $fromLocal ?><br>
- <span class="Swatch" id="lineFromSwatch" style="color: #000000; background-color: #000000"> transparent </span>
+ <span class="Swatch" id="lineFromSwatch" style="color: #000000; background-color: #000000"> transpar </span>
<input class="Ctrl" type="button" value="..." style="width: 22px;" onClick="PickColor(SET_LINE_FROM_COLOR,false,false)">
</td>
<td valign="top">
<?php echo $toLocal ?><br>
- <span class="Swatch" id="lineToSwatch" style="color: #000000; background-color: #000000"> transparent </span>
+ <span class="Swatch" id="lineToSwatch" style="color: #000000; background-color: #000000"> transpar </span>
<input class="Ctrl" type="button" value="..." style="width: 22px;" onClick="PickColor(SET_LINE_TO_COLOR,false,false)">
</td>
</tr>
More information about the fusion-commits
mailing list