From: <fg...@us...> - 2010-06-21 20:14:29
|
Revision: 2706 http://openutils.svn.sourceforge.net/openutils/?rev=2706&view=rev Author: fgiust Date: 2010-06-21 20:14:23 +0000 (Mon, 21 Jun 2010) Log Message: ----------- MEDIA-153 broken image on IE/chrome Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-06-21 16:21:05 UTC (rev 2705) +++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-06-21 20:14:23 UTC (rev 2706) @@ -1,7 +1,7 @@ [#if !alreadyrendered] <script type="text/javascript"> // <![CDATA[ - function selectMedia(name, value, mediaType) { + function selectMedia(name, value, mediaType) { var url = "${request.contextPath}/.magnolia/pages/mediaBrowser.html?nodeid=" + name + "&selectMedia=true&mgnlCK="+ mgnlGetCacheKiller(); if (mediaType != null && mediaType != 'null') @@ -14,34 +14,34 @@ } var selectMediaWin = window.open(url, 'selectMedia', "width=800,height=500,scrollbars=no,status=yes,resizable=yes"); - selectMediaWin.opener = window; - } - - function removeMedia(name) { + selectMediaWin.opener = window; + } + + function removeMedia(name) { document.getElementById(name).value = ""; - + document.getElementById("dispRem"+ name + "Img").style.display = "none"; document.getElementById("dispRemBtn"+ name).style.display = "none"; document.getElementById("dispRem"+ name + "Txt").innerHTML = ""; - document.getElementById("dispSel"+ name).style.display = "inline"; - } - - function setNewMedia(name, uuid, filename, thumbnailurl) { - document.getElementById(name).value = uuid; - + document.getElementById("dispSel"+ name).style.display = "inline"; + } + + function setNewMedia(name, uuid, filename, thumbnailurl) { + document.getElementById(name).value = uuid; + document.getElementById("dispRem"+ name).style.display = "block"; document.getElementById("dispRemBtn"+ name).style.display = "block"; document.getElementById("dispSel"+ name).style.display = "none"; - + document.getElementById("dispRem"+ name + "Img").src = ""; document.getElementById("dispRem"+ name + "Img").src = thumbnailurl; - + // reset with in case of old binary values document.getElementById("dispRem"+ name + "Img").style.width = "auto"; document.getElementById("dispRem"+ name + "Img").style.height = "auto"; document.getElementById("dispRem"+ name + "Img").style.display = "inline"; document.getElementById("dispRem"+ name + "Txt").innerHTML = filename; - + } // ]]> </script> @@ -55,10 +55,10 @@ [/#if] <input type="hidden" id="${name}" name="${name}" value="${valuemediacontent}" /> -[#if value?exists && value?length > 0] - [#assign dispRem = "block"] +[#if value?exists && value?length > 0] + [#assign dispRem = "block"] [#assign dispSel = "none"] -[#else] +[#else] [#assign dispRem = "none"] [#assign dispSel = "block"] [/#if] @@ -83,26 +83,26 @@ style="width: 106px; height: 106px;b order: 1px solid #999; display: table-cell; text-align: center; vertical-align: middle; background-image: url(${request.contextPath}/.resources/media/assets/squares.png);"> <a href="#" onclick="selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}')" title="Select media" style="height: 106px; width: 106px; display: table-cell; vertical-align: middle; text-align: center; color:#396101; text-decoration:none"> - + <span style="vertical-align: middle;"></span> - <img id="dispRem${name}Img" src="${thumbnailUrl!''}" - style="text-align:center; border: none; vertical-align: middle; display:inline; [#if binaryfield?exists] width: 106px; height: 106px[/#if]" + <img id="dispRem${name}Img" src="${thumbnailUrl!''}" + style="text-align:center; border: none; vertical-align: middle; display:[#if thumbnailUrl?exists] inline [#else] none [/#if]; [#if binaryfield?exists] width: 106px; height: 106px[/#if]" alt="" /> - - <span id="dispSel${name}" style="text-align:center; display:${dispSel}; vertical-align: middle; color:#396101; text-decoration:none; cursor: pointer;height: 20px; width:102px">${msgs.get("media.select")}</span> - - + + <span id="dispSel${name}" style="text-align:center; display:${dispSel}; vertical-align: middle; color:#396101; text-decoration:none; cursor: pointer;height: 20px; width:102px">${msgs.get("media.select")}</span> + + </a> </div> </div> </div> <div class="mediaright" style="margin-left: 120px;height: 106px;"> - - + + <div> <div id="dispRem${name}Txt" style="height: 18px; overflow: hidden">${filename!''}</div> - + <div id="dispResize${name}" style="display:${dispResize}"> <table> <tbody> @@ -128,7 +128,7 @@ onmousedown="mgnlShiftPushButtonDown(this);" >${msgs.get("media.remove")}</span> </div> - + </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |