Menu
▾
▴
openutils-svn
|
From: <mol...@us...> - 2009-08-21 14:55:28
|
Revision: 1289
http://openutils.svn.sourceforge.net/openutils/?rev=1289&view=rev
Author: molaschi
Date: 2009-08-21 14:55:21 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
rename js_included to js_media_included
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 2009-08-21 14:54:26 UTC (rev 1288)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2009-08-21 14:55:21 UTC (rev 1289)
@@ -1,4 +1,4 @@
-[#if !reqGet(request, "js_included")?exists]
+[#if !reqGet(request, "js_media_included")?exists]
<script type="text/javascript">
function selectMedia(name, value, mediaType) {
var url = "${request.contextPath}/.magnolia/pages/mediaBrowser.html?nodeid=" + name + "&selectMedia=true&mgnlCK="+
@@ -33,7 +33,7 @@
document.getElementById("dispRem"+ name + "Txt").innerHTML = filename;
}
</script>
-${reqSet(request, "js_included", 1)}
+${reqSet(request, "js_media_included", 1)}
[/#if]
<input type="hidden" id="${name}" name="${name}" value="${value}" />
[#if value?exists && value?length > 0]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 13:36:22
|
Revision: 1986
http://openutils.svn.sourceforge.net/openutils/?rev=1986&view=rev
Author: diego_schivo
Date: 2010-02-18 13:36:16 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-100 media selection control: new property "resizing" (true/false) for allowing configuration of width/height
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-02-18 11:57:28 UTC (rev 1985)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-02-18 13:36:16 UTC (rev 1986)
@@ -38,10 +38,10 @@
<input type="hidden" id="${name}" name="${name}" value="${value}" />
[#if value?exists && value?length > 0]
[#assign dispRem = "block"]
- [#assign dispSel = "none"]
+ [#assign dispSel = "none"]
[#else]
[#assign dispRem = "none"]
- [#assign dispSel = "block"]
+ [#assign dispSel = "block"]
[/#if]
<div id="dispRem${name}" style="display:${dispRem}">
<div><a href="#" onclick="selectMedia('${name}', '${value!'null'}', '${configuration['mediaType']!'null'}')" title="Seleziona media">
@@ -56,6 +56,14 @@
</span>
</div>
</div>
+[#if dispRem == "block" && (configuration['resizing']!false)?string == 'true']
+ [#assign dispResize = "block"]
+[#else]
+ [#assign dispResize = "none"]
+[/#if]
+<div id="dispResize${name}" style="display:${dispResize}">
+TODO: RESIZING
+</div>
<div id="dispSel${name}" style="display:${dispSel}">
<span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);selectMedia('${name}', '${value!'null'}', '${configuration['mediaType']!'null'}');"
onmouseout="mgnlShiftPushButtonOut(this);" onmousedown="mgnlShiftPushButtonDown(this);" style="">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 13:48:16
|
Revision: 1987
http://openutils.svn.sourceforge.net/openutils/?rev=1987&view=rev
Author: diego_schivo
Date: 2010-02-18 13:48:10 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-100 width & height text inputs
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-02-18 13:36:16 UTC (rev 1986)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-02-18 13:48:10 UTC (rev 1987)
@@ -62,7 +62,22 @@
[#assign dispResize = "none"]
[/#if]
<div id="dispResize${name}" style="display:${dispResize}">
-TODO: RESIZING
+ <table>
+ <tbody>
+ <tr>
+ <td class="mgnlDialogBoxLabel">Width</td>
+ <td class="mgnlDialogBoxInput">
+ <input type="text" style="width: 60px;" class="mgnlDialogControlEdit" value="" id="${name}_width" name="${name}_width">
+ </td>
+ </tr>
+ <tr>
+ <td class="mgnlDialogBoxLabel">Height</td>
+ <td class="mgnlDialogBoxInput">
+ <input type="text" style="width: 60px;" class="mgnlDialogControlEdit" value="" id="${name}_height" name="${name}_height">
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
<div id="dispSel${name}" style="display:${dispSel}">
<span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);selectMedia('${name}', '${value!'null'}', '${configuration['mediaType']!'null'}');"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 15:54:59
|
Revision: 1997
http://openutils.svn.sourceforge.net/openutils/?rev=1997&view=rev
Author: diego_schivo
Date: 2010-02-18 15:54:53 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-100 allow setting width/height just after having selected the media
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-02-18 15:38:27 UTC (rev 1996)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-02-18 15:54:53 UTC (rev 1997)
@@ -55,30 +55,30 @@
${msgs.get("media.remove")}
</span>
</div>
+ [#if (configuration['resizing']!false)?string == 'true']
+ [#assign dispResize = "block"]
+ [#else]
+ [#assign dispResize = "none"]
+ [/#if]
+ <div id="dispResize${name}" style="display:${dispResize}">
+ <table>
+ <tbody>
+ <tr>
+ <td class="mgnlDialogBoxLabel">Width</td>
+ <td class="mgnlDialogBoxInput">
+ <input type="text" id="${name}_width" name="${name}_width" value="${width!''}" class="mgnlDialogControlEdit" style="width: 60px;">
+ </td>
+ </tr>
+ <tr>
+ <td class="mgnlDialogBoxLabel">Height</td>
+ <td class="mgnlDialogBoxInput">
+ <input type="text" id="${name}_height" name="${name}_height" value="${height!''}" class="mgnlDialogControlEdit" style="width: 60px;">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
-[#if dispRem == "block" && (configuration['resizing']!false)?string == 'true']
- [#assign dispResize = "block"]
-[#else]
- [#assign dispResize = "none"]
-[/#if]
-<div id="dispResize${name}" style="display:${dispResize}">
- <table>
- <tbody>
- <tr>
- <td class="mgnlDialogBoxLabel">Width</td>
- <td class="mgnlDialogBoxInput">
- <input type="text" id="${name}_width" name="${name}_width" value="${width!''}" class="mgnlDialogControlEdit" style="width: 60px;">
- </td>
- </tr>
- <tr>
- <td class="mgnlDialogBoxLabel">Height</td>
- <td class="mgnlDialogBoxInput">
- <input type="text" id="${name}_height" name="${name}_height" value="${height!''}" class="mgnlDialogControlEdit" style="width: 60px;">
- </td>
- </tr>
- </tbody>
- </table>
-</div>
<div id="dispSel${name}" style="display:${dispSel}">
<span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);selectMedia('${name}', '${value!'null'}', '${configuration['mediaType']!'null'}');"
onmouseout="mgnlShiftPushButtonOut(this);" onmousedown="mgnlShiftPushButtonDown(this);" style="">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-03 10:14:59
|
Revision: 2344
http://openutils.svn.sourceforge.net/openutils/?rev=2344&view=rev
Author: fgiust
Date: 2010-05-03 10:14:53 +0000 (Mon, 03 May 2010)
Log Message:
-----------
MEDIA-113 minor cleanups to refactored media dialog
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-05-03 10:08:39 UTC (rev 2343)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-03 10:14:53 UTC (rev 2344)
@@ -65,12 +65,12 @@
<div style="height: 120px;">
<div class="medialeft" style="width: 106px; float:left; height: 106px;">
- <div id="dispRem${name}" style="display:${dispRem}">
+ <div id="dispRem${name}">
<div class="imagebox"
style="width: 106px;height: 106px;border: 1px solid #999; background-image: url(${request.contextPath}/.resources/media/assets/squares.png); text-align: center; vertical-align: middle; ">
<a href="#" onclick="selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}')"
title="Select media">
- <img id="dispRem${name}Img" src="${thumbnailUrl!''}" style="border: none; display:inline" alt=""/>
+ <img id="dispRem${name}Img" src="${thumbnailUrl!''}" style="border: none; display:inline" alt="" style="display:${dispRem}"/>
</a>
</div>
</div>
@@ -101,9 +101,9 @@
</tbody>
</table>
</div>
- <div id="dispRemBtn${name}">
+ <div id="dispRemBtn${name}" style="display:${dispRem}">
<span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);removeMedia('${name}');" onmouseout="mgnlShiftPushButtonOut(this);"
- onmousedown="mgnlShiftPushButtonDown(this);" style="">${msgs.get("media.remove")}</span>
+ onmousedown="mgnlShiftPushButtonDown(this);" >${msgs.get("media.remove")}</span>
</div>
<div id="dispSel${name}" style="display:${dispSel}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <die...@us...> - 2011-02-04 09:50:02
|
Revision: 3299
http://openutils.svn.sourceforge.net/openutils/?rev=3299&view=rev
Author: diego_schivo
Date: 2011-02-04 09:49:54 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
MEDIA-211 Media dialog: improve visualization of full path
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 2011-02-01 08:45:24 UTC (rev 3298)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2011-02-04 09:49:54 UTC (rev 3299)
@@ -108,7 +108,7 @@
<div>
- <div id="dispRem${name}Txt" style="height: 18px; overflow: hidden">${filename!''}[#if handle?exists && handle?length > 0] (${handle})[/#if]</div>
+ <div id="dispRem${name}Txt" style="height: 18px; overflow: hidden">${filename!''}</div>
<div id="dispResize${name}" style="display:${dispResize}">
<table>
@@ -139,4 +139,9 @@
</div>
</div>
+ [#if handle?exists && handle?length > 0]
+ <input type="text" id="${name}_fullpath" name="${name}_fullpath" value="${handle}" class="mgnlDialogControlEdit"
+ style="width: 100%;" readonly="readonly" />
+ [/#if]
+
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-04 15:39:05
|
Revision: 3301
http://openutils.svn.sourceforge.net/openutils/?rev=3301&view=rev
Author: diego_schivo
Date: 2011-02-04 15:38:59 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
MEDIA-211 "showpath" property on the dialog control
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 2011-02-04 15:15:29 UTC (rev 3300)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2011-02-04 15:38:59 UTC (rev 3301)
@@ -139,7 +139,7 @@
</div>
</div>
- [#if handle?exists && handle?length > 0]
+ [#if (configuration['showpath']!false)?string == 'true' && handle?has_content]
<input type="text" id="${name}_fullpath" name="${name}_fullpath" value="${handle}" class="mgnlDialogControlEdit"
style="width: 100%;" readonly="readonly" />
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X