Author: bpapez
Date: Fri Dec 7 12:11:36 2007
New Revision: 19348
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19348&repname=
=3Djahia
Log:
POSTE-39: Fix color picker for IE6
Modified:
trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/smalltext_field.jsp&rev=3D19348&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp (ori=
ginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp Fri =
Dec 7 12:11:36 2007
@@ -97,6 +97,7 @@
<script type=3D"text/javascript" src=3D"<%=3DtheURL%>jahiatools/javasc=
ript/dynapi.js"></script>
=
<script type=3D"text/javascript">
+ <!--
DynAPI.setLibraryPath('<%=3DtheURL%>jahiatools/javascript/lib/');
DynAPI.include('dynapi.api.*');
=
@@ -107,15 +108,17 @@
else
return el.offsetTop;
}
+ //-->
</script>
</logic:notEqual>
=
<script type=3D"text/javascript">
+<!--
var ViewColorBG_<%=3DcontextID%>;
var ViewColorPick_<%=3DcontextID%>;
=
function addDynLayer_<%=3DcontextID%>() {
- y =3D getPageOffsetTop(document.imgcolmap_<%=3DcontextID%>);
+ y =3D getPageOffsetTop(document.getElementById("imgcolmap_<%=3Dcon=
textID%>"));
if (document.layers) {
ViewColorBG_<%=3DcontextID%> =3D new DynLayer(null, 569, y, 67=
, 67, '#000000');
ViewColorPick_<%=3DcontextID%> =3D new DynLayer(null, 570, y +=
1, 65, 65, '#000000');
@@ -123,8 +126,8 @@
ViewColorBG_<%=3DcontextID%> =3D new DynLayer(null, 564, y, 67=
, 67, '#000000');
ViewColorPick_<%=3DcontextID%> =3D new DynLayer(null, 565, y +=
1, 65, 65, '#000000');
} else {
- ViewColorBG_<%=3DcontextID%> =3D new DynLayer(null, 564, y, 67=
, 67, '#000000');
- ViewColorPick_<%=3DcontextID%> =3D new DynLayer(null, 565, y +=
1, 65, 65, '#000000');
+ ViewColorBG_<%=3DcontextID%> =3D new DynLayer(null, 560, y + 1=
, 67, 67, '#000000');
+ ViewColorPick_<%=3DcontextID%> =3D new DynLayer(null, 561, y +=
2, 65, 65, '#000000');
}
=
DynAPI.document.addChild(ViewColorBG_<%=3DcontextID%>);
@@ -136,9 +139,10 @@
DynAPI.addLoadFunction("addDynLayer_<%=3DcontextID%>();");
=
function setTextColor_<%=3DcontextID%>(color) {
- document.mainForm.elements["_<%=3DtheField.getID()%>"].value =3D c=
olor;
+ document.getElementById("field_<%=3DtheField.getID()%>").value =3D=
color;
ViewColorPick_<%=3DcontextID%>.setBgColor(color);
}
+//-->
</script>
=
<table width=3D"377" border=3D"1" cellpadding=3D"5" cellspacing=3D"0" bgco=
lor=3D"#4D4E6D">
@@ -174,7 +178,7 @@
}
}
%>
- </map><img id=3D"imgcolmap_<%=3DcontextID%>" usemap=3D"#colmap=
_<%=3DcontextID%>"
+ </map><img id=3D"imgcolmap_<%=3DcontextID%>" name=3D"imgcolmap=
_<%=3DcontextID%>" usemap=3D"#colmap_<%=3DcontextID%>"
src=3D"<jahia:serverHttpPath/><jahia:engineResource=
Bundle resourceName=3D"org.jahia.engines.jahiaTools.colorTable.image"/>"
border=3D"0" width=3D"289" height=3D"67"><img alt=
=3D""
src=3D"<jah=
ia:serverHttpPath/><jahia:engineResourceBundle resourceName=3D"org.jahia.pi=
x.image"/>"
@@ -185,7 +189,7 @@
=
height=3D"4"><br>
<input id=3D"field_<%=3DtheField.getID()%>" name=3D"_<%=3DtheF=
ield.getID()%>"
type=3D"text" size=3D"12" value=3D"<%=3DtheField.getVal=
ue()%>"
- onchange=3D"setTextColor_<%=3DcontextID%>(document.main=
Form.elements['_<%=3DtheField.getID()%>'].value)" <% if ( readOnly ){%>
+ onchange=3D"setTextColor_<%=3DcontextID%>(document.getE=
lementById('field_<%=3DtheField.getID()%>').value)" <% if ( readOnly ){%>
readonly=3D"readonly"<%}%>>
</td>
</tr>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
