Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2672] trunk
|
From: <die...@us...> - 2010-06-18 10:47:15
|
Revision: 2672
http://openutils.svn.sourceforge.net/openutils/?rev=2672&view=rev
Author: diego_schivo
Date: 2010-06-18 10:47:07 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
CONTROLS-31 media column type provided by media module
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/css/grid.css
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/css/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/css/img/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/css/img/media-trigger.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js
Removed Paths:
-------------
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/css/img/media-trigger.gif
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/MediaField.js
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 10:23:13 UTC (rev 2671)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 10:47:07 UTC (rev 2672)
@@ -11,9 +11,6 @@
<script type="text/javascript" src="${request.contextPath}/.resources/controls/js/PipeComboBox.js"></script>
<script type="text/javascript" src="${request.contextPath}/.resources/controls/js/FileField.js"></script>
<script type="text/javascript" src="${request.contextPath}/.resources/controls/js/ColorField.js"></script>
- [#list gridColumnTypes?values as gct]
- ${gct.headSnippet}
- [/#list]
<script type="text/javascript">
// <![CDATA[
@@ -68,6 +65,10 @@
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/controls/css/grid-ie6fix.css" />
<![endif]-->
+
+ [#list gridColumnTypes?values as gct]
+ ${gct.headSnippet}
+ [/#list]
[/#if]
[#assign key = uuid?replace("-", "")]
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/css/grid.css
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/css/grid.css 2010-06-18 10:23:13 UTC (rev 2671)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/css/grid.css 2010-06-18 10:47:07 UTC (rev 2672)
@@ -3,11 +3,6 @@
cursor: pointer;
}
-.x-form-field-wrap .x-form-media-trigger {
- background-image: url(img/media-trigger.gif);
- cursor: pointer;
-}
-
.x-form-field-wrap .x-form-fckedit-trigger {
background-image: url(img/fckedit-trigger.gif);
cursor: pointer;
Deleted: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/css/img/media-trigger.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/MediaField.js
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/MediaField.js 2010-06-18 10:23:13 UTC (rev 2671)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/MediaField.js 2010-06-18 10:47:07 UTC (rev 2672)
@@ -1,14 +0,0 @@
-var MediaField = Ext.extend(Ext.form.TriggerField, {
-
- triggerClass: 'x-form-media-trigger',
-
- onTriggerClick: function(){
- if (this.disabled) return;
-
- window.setNewMedia = function(nodeid, uuid, file, thumb){
- this.setValue(uuid);
- }.createDelegate(this);
- mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mgnlCK=' + mgnlGetCacheKiller(), 800, 500);
- }
-
-});
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-06-18 10:23:13 UTC (rev 2671)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-06-18 10:47:07 UTC (rev 2672)
@@ -18,7 +18,14 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/MediaField.js\"></script>";
+ + "/.resources/controls/js/MediaField.js\"></script>\n"
+ + "<style type=\"text/css\">\n"
+ + ".x-form-field-wrap .x-form-media-trigger {\n"
+ + "background-image: url("
+ + MgnlContext.getContextPath()
+ + "/.resources/controls/css/img/media-trigger.gif);\n"
+ + "}\n"
+ + "</style>";
}
/**
@@ -32,7 +39,7 @@
+ "return v ? '<img border=\"0\" alt=\"\" src=\""
+ MgnlContext.getContextPath()
+ "/mediathumbnail/' + v + '\" />' : v;\n"
- + "}\n";
+ + "}";
}
}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/css/img/media-trigger.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/css/img/media-trigger.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js 2010-06-18 10:47:07 UTC (rev 2672)
@@ -0,0 +1,14 @@
+var MediaField = Ext.extend(Ext.form.TriggerField, {
+
+ triggerClass: 'x-form-media-trigger',
+
+ onTriggerClick: function(){
+ if (this.disabled) return;
+
+ window.setNewMedia = function(nodeid, uuid, file, thumb){
+ this.setValue(uuid);
+ }.createDelegate(this);
+ mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mgnlCK=' + mgnlGetCacheKiller(), 800, 500);
+ }
+
+});
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/controls/js/MediaField.js
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
