Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2010-02-05 10:38:34
|
Revision: 1810
http://openutils.svn.sourceforge.net/openutils/?rev=1810&view=rev
Author: diego_schivo
Date: 2010-02-05 10:38:17 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
MEDIA-64 reduced tooltip's occupation area (for mouseenter/leave events)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-05 10:05:16 UTC (rev 1809)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-05 10:38:17 UTC (rev 1810)
@@ -230,6 +230,10 @@
display: none;
}
+div.sexy-tooltip .tooltip-t,div.sexy-tooltip .tooltip-b {
+ height: 16px;
+}
+
.mediainfo {
border-bottom: dotted 1px #cfcfcf;
margin: 0px 3px 5px 3px;
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-05 10:05:16 UTC (rev 1809)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-05 10:38:17 UTC (rev 1810)
@@ -116,7 +116,7 @@
sticky: true,
mode: 'auto',
fixedPosition: true,
- offset: {x: -20, y: 110},
+ offset: {x: -20, y: 100},
fx: false,
noClose: true
});
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 10:05:16 UTC (rev 1809)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 10:38:17 UTC (rev 1810)
@@ -2,9 +2,9 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
<!--
[if IE]><style> .image span { display: inline-block; height: 100%; } </style><![endif]
-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-05 10:51:09
|
Revision: 1811
http://openutils.svn.sourceforge.net/openutils/?rev=1811&view=rev
Author: diego_schivo
Date: 2010-02-05 10:51:03 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
MEDIA-64 "edit" menu <ul> structure
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-05 10:38:17 UTC (rev 1810)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-05 10:51:03 UTC (rev 1811)
@@ -91,7 +91,7 @@
margin-top: 10px;
}
-.mediaList li {
+.mediaList li.media {
float: left;
margin: 0px 0px 10px 10px;
width: 130px;
@@ -108,7 +108,7 @@
height: 260px;
}
-.mediaList li:hover {
+.mediaList li.media:hover {
background-color: #e2edff;
}
@@ -206,6 +206,12 @@
box-shadow: 3px 3px 3px #666;
}
+.mediaheader .icons ul {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
.mediaheader .icons a {
text-decoration: none;
display: block;
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 10:38:17 UTC (rev 1810)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 10:51:03 UTC (rev 1811)
@@ -175,67 +175,95 @@
<div class="mediaheader">
<span class="edit">${this.msgs.get('media.edit')}</span>
<div class="icons" style="display: none;">
- [#if this.type != 'youtube']
- <a href="?command=download&path=${media.handle}">
- <img src="${this.request.contextPath}/.resources/media/icons/download.gif" border="0" align="middle" />
- <span>${this.msgs.get('media.download')}</span>
- </a>
- [/#if]
- [#if media.writable]
- <a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
- <img src="${this.request.contextPath}/.resources/media/icons/edit.gif" border="0" align="middle" />
- <span>${this.msgs.get('media.edit')}</span>
- </a>
- <a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="${this.msgs.get('media.delete')}">
- <img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" border="0" align="middle" />
- <span>${this.msgs.get('media.delete')}</span>
- </a>
- <a href="javascript:$empty()" onclick="openMediaTree('move','${media.handle}')" title="${this.msgs.get('media.move')}">
- <img src="${this.request.contextPath}/.resources/icons/16/up_down.gif" border="0" align="middle" />
- <span>${this.msgs.get('media.move')}</span>
- </a>
- <a href="javascript:$empty()" onclick="openMediaTree('copy','${media.handle}')" title="${this.msgs.get('media.copy')}">
- <img src="${this.request.contextPath}/.resources/icons/16/copy.gif" border="0" align="middle" />
- <span>${this.msgs.get('media.copy')}</span>
- </a>
- [#else]
- <a>
- <img src="${this.request.contextPath}/.resources/media/icons/edit_inactive.gif" border="0" align="middle" />
- </a>
- <a>
- <img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" border="0" align="middle" />
- </a>
- <a>
- <img src="${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif" border="0" align="middle" />
- </a>
- <a>
- <img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" align="middle" />
- </a>
- [/#if]
- [#if media.canPublish]
- <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
- <span>${this.msgs.get('media.activate')}</span>
- </a>
- [#else]
- <a title="${this.msgs.get('media.activate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/media/icons/arrow_right_green_inactive.gif" border="0"
- align="middle" />
- <span>${this.msgs.get('media.activate')}</span>
- </a>
- [/#if]
- [#if media.canPublish && media.metaData.activationStatus = 2]
- <a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" align="middle" />
- <span>${this.msgs.get('media.deactivate')}</span>
- </a>
- [#else]
- <a title="${this.msgs.get('media.deactivate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0"
- align="middle" />
- <span>${this.msgs.get('media.deactivate')}</span>
- </a>
- [/#if]
+ <ul>
+ [#if this.type != 'youtube']
+ <li>
+ <a href="?command=download&path=${media.handle}">
+ <img src="${this.request.contextPath}/.resources/media/icons/download.gif" border="0" align="middle" />
+ <span>${this.msgs.get('media.download')}</span>
+ </a>
+ </li>
+ [/#if]
+ [#if media.writable]
+ <li>
+ <a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
+ <img src="${this.request.contextPath}/.resources/media/icons/edit.gif" border="0" align="middle" />
+ <span>${this.msgs.get('media.edit')}</span>
+ </a>
+ </li>
+ <li>
+ <a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="${this.msgs.get('media.delete')}">
+ <img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" border="0" align="middle" />
+ <span>${this.msgs.get('media.delete')}</span>
+ </a>
+ </li>
+ <li>
+ <a href="javascript:$empty()" onclick="openMediaTree('move','${media.handle}')" title="${this.msgs.get('media.move')}">
+ <img src="${this.request.contextPath}/.resources/icons/16/up_down.gif" border="0" align="middle" />
+ <span>${this.msgs.get('media.move')}</span>
+ </a>
+ </li>
+ <li>
+ <a href="javascript:$empty()" onclick="openMediaTree('copy','${media.handle}')" title="${this.msgs.get('media.copy')}">
+ <img src="${this.request.contextPath}/.resources/icons/16/copy.gif" border="0" align="middle" />
+ <span>${this.msgs.get('media.copy')}</span>
+ </a>
+ </li>
+ [#else]
+ <li>
+ <a>
+ <img src="${this.request.contextPath}/.resources/media/icons/edit_inactive.gif" border="0" align="middle" />
+ </a>
+ </li>
+ <li>
+ <a>
+ <img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" border="0" align="middle" />
+ </a>
+ </li>
+ <li>
+ <a>
+ <img src="${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif" border="0" align="middle" />
+ </a>
+ </li>
+ <li>
+ <a>
+ <img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" align="middle" />
+ </a>
+ </li>
+ [/#if]
+ [#if media.canPublish]
+ <li>
+ <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
+ <span>${this.msgs.get('media.activate')}</span>
+ </a>
+ </li>
+ [#else]
+ <li>
+ <a title="${this.msgs.get('media.activate')}" class="disabled">
+ <img src="${this.request.contextPath}/.resources/media/icons/arrow_right_green_inactive.gif" border="0"
+ align="middle" />
+ <span>${this.msgs.get('media.activate')}</span>
+ </a>
+ </li>
+ [/#if]
+ [#if media.canPublish && media.metaData.activationStatus = 2]
+ <li>
+ <a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" align="middle" />
+ <span>${this.msgs.get('media.deactivate')}</span>
+ </a>
+ </li>
+ [#else]
+ <li>
+ <a title="${this.msgs.get('media.deactivate')}" class="disabled">
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0"
+ align="middle" />
+ <span>${this.msgs.get('media.deactivate')}</span>
+ </a>
+ </li>
+ [/#if]
+ </ul>
</div>
[#if media.usedInWebPages?size = 0]
<span>${this.msgs.get('media.nopages')}</span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-05 14:54:24
|
Revision: 1816
http://openutils.svn.sourceforge.net/openutils/?rev=1816&view=rev
Author: diego_schivo
Date: 2010-02-05 14:54:18 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
MEDIA-64 fix css in IE7
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-02-05 14:54:18 UTC (rev 1816)
@@ -0,0 +1,8 @@
+.image span {
+ display: inline-block;
+ height: 100%;
+}
+
+.mediaheader .icons a {
+ padding: 1px 4px;
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 14:01:36 UTC (rev 1815)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 14:54:18 UTC (rev 1816)
@@ -5,9 +5,9 @@
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
- <!--
- [if IE]><style> .image span { display: inline-block; height: 100%; } </style><![endif]
- -->
+ <!--[if lte IE 7]>
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
+ <![endif]-->
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2-core.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2-more.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootips.js"></script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-05 15:50:36
|
Revision: 1817
http://openutils.svn.sourceforge.net/openutils/?rev=1817&view=rev
Author: diego_schivo
Date: 2010-02-05 15:50:24 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
MEDIA-64 media-header: same popup-menu for "pages" and "edit" menu-items
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-05 14:54:18 UTC (rev 1816)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-05 15:50:24 UTC (rev 1817)
@@ -177,12 +177,15 @@
}
.mediaheader {
- position: relative;
margin: 0px 10px 0 10px;
padding: 5px 0 3px 0;
text-align: left;
}
+.mediaheader .tips {
+ cursor: pointer;
+}
+
.mediaheader span.edit {
float: right;
background: transparent url(images/arrow.gif) no-repeat center right;
@@ -191,57 +194,6 @@
cursor: pointer;
}
-.mediaheader .icons {
- position: absolute;
- right: 0;
- top: 20px;
- width: 120px;
- height: 140px;
- font-size: 11px;
- background-color: #ffffff;
- border: 1px solid #cfcfcf;
- opacity: 0.90;
- filter: alpha(opacity = 90);
- -moz-box-shadow: 3px 3px 3px #666;
- -webkit-box-shadow: 3px 3px 3px #666;
- box-shadow: 3px 3px 3px #666;
-}
-
-.mediaheader .icons ul {
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-.mediaheader .icons li.active {
- background-color: #d1e1ed;
-}
-
-.mediaheader .icons a {
- text-decoration: none;
- display: block;
- color: #000;
- height: 16px;
- line-height: 16px;
- padding: 2px 4px;
-}
-
-.mediaheader .icons a.disabled {
- color: #666;
-}
-
-.mediaheader .icons a img,.mediaheader .icons a span {
- float: left;
-}
-
-.mediaheader .icons a img {
- margin-right: 4px;
-}
-
-.mediaheader .tips {
- cursor: pointer;
-}
-
.image .details {
display: none;
}
@@ -297,4 +249,52 @@
.sexy-tooltip {
font-size: 0.8em;
-}
\ No newline at end of file
+}
+
+.menupopup {
+ position: absolute;
+ left: 10px;
+ top: 10px;
+ width: 200px;
+ height: 200px;
+ display: none;
+ font-size: 11px;
+ background-color: #ffffff;
+ border: 1px solid #cfcfcf;
+ opacity: 0.90;
+ filter: alpha(opacity = 90);
+ -moz-box-shadow: 3px 3px 3px #666;
+ -webkit-box-shadow: 3px 3px 3px #666;
+ box-shadow: 3px 3px 3px #666;
+}
+
+.menupopup ul {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.menupopup li.active {
+ background-color: #d1e1ed;
+}
+
+.menupopup a {
+ text-decoration: none;
+ display: block;
+ color: #000;
+ height: 16px;
+ line-height: 16px;
+ padding: 2px 4px;
+}
+
+.menupopup a.disabled {
+ color: #666;
+}
+
+.menupopup a img,.menupopup a span {
+ float: left;
+}
+
+.menupopup a img {
+ margin-right: 4px;
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-05 14:54:18 UTC (rev 1816)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-05 15:50:24 UTC (rev 1817)
@@ -2,7 +2,7 @@
initialize: function(){
new MediaFolderView.BgSelectors('#navigation a.bg-selector');
- new MediaFolderView.EditMenus('li.media .edit');
+ new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
}
@@ -40,25 +40,33 @@
MediaFolderView.EditMenus = new Class({
initialize: function(triggers){
- this.triggerClickHandler = this.handleTriggerClick.bindWithEvent(this);
- this.popupEnterHandler = this.handlePopupEnter.bindWithEvent(this);
- this.popupMoveHandler = this.handlePopupMove.bindWithEvent(this);
- this.popupLeaveHandler = this.handlePopupLeave.bindWithEvent(this);
- $$(triggers).addEvent('click', this.triggerClickHandler);
+ $$(triggers).addEvent('click', this.handleTriggerClick.bindWithEvent(this));
+ this.popup = new Element('div').addClass('menupopup').inject(document.body);
+ this.popup.addEvents({
+ mouseenter: this.handlePopupEnter.bindWithEvent(this),
+ mousemove: this.handlePopupMove.bindWithEvent(this),
+ mouseleave: this.handlePopupLeave.bindWithEvent(this)
+ });
},
handleTriggerClick: function(e){
this.timer = $clear(this.timer);
- var popup = $(e.target).getNext();
- if (popup != this.popup){
+ var menuitem = $(e.target);
+ var menu = menuitem.getNext();
+ if (menu != this.menu){
this.hide();
- popup.setStyle('display', '');
- popup.addEvents({
- mouseenter: this.popupEnterHandler,
- mousemove: this.popupMoveHandler,
- mouseleave: this.popupLeaveHandler
- });
- this.popup = popup;
+ var content = new Element('div', {html: menu.get('html')});
+ var coords = menuitem.getCoordinates();
+ this.popup
+ .empty()
+ .grab(content)
+ .setStyles({
+ left: coords.left + 'px',
+ top: (coords.bottom + 5) + 'px',
+ display: 'block'
+ });
+ this.popup.setStyle('height', content.getSize().y + 'px');
+ this.menu = menu;
}
},
@@ -87,16 +95,13 @@
},
hide: function(){
- if (this.popup){
- this.popup.setStyle('display', 'none');
- this.popup.removeEvent('mouseenter', this.popupEnterHandler);
- this.popup.removeEvent('mousemove', this.popupMoveHandler);
- this.popup.removeEvent('mouseleave', this.popupLeaveHandler);
- delete this.popup;
+ if (this.menu){
+ this.popup.setStyle('display', '');
+ delete this.menu;
}
- if (this.menuItem){
- this.menuItem.setStyle('background', 'transparent');
- delete this.menuItem;
+ if (this.li){
+ this.li.removeClass('active');
+ delete this.li;
}
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 14:54:18 UTC (rev 1816)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 15:50:24 UTC (rev 1817)
@@ -77,6 +77,7 @@
}
});
+ /*
$$('.tips').each(function(item){
item.store('tip:enter', $empty);
item.store('tip:leave', $empty);
@@ -97,6 +98,7 @@
$$('.tips').each(function(item){
item.addEvent('click', Tips1.elementEnter.bindWithEvent(Tips1, item));
});
+ */
new MediaFolderView();
});
@@ -173,8 +175,8 @@
[/#if]
<li class="media ${mediaStatusClass} ${selectMediaClass}" style="text-align:center">
<div class="mediaheader">
- <span class="edit">${this.msgs.get('media.edit')}</span>
- <div class="icons" style="display: none;">
+ <span class="edit menuitem">${this.msgs.get('media.edit')}</span>
+ <div class="icons menu" style="display: none;">
<ul>
[#if this.type != 'youtube']
<li>
@@ -268,11 +270,16 @@
[#if media.usedInWebPages?size = 0]
<span>${this.msgs.get('media.nopages')}</span>
[#else]
- [#assign pages = ""]
- [#list media.usedInWebPages as page]
- [#assign pages = pages + "<a href='${this.request.contextPath}" + page +".html' target='_blank'>"+ page +"</a><br/>"]
- [/#list]
- <span class="tips" rel="${pages}">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
+ <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
+ <div class="pages menu" style="display: none;">
+ <ul>
+ [#list media.usedInWebPages as page]
+ <li>
+ <a href="${this.request.contextPath}${page}.html" target="_blank">${page}</a>
+ </li>
+ [/#list]
+ </ul>
+ </div>
[/#if]
</div>
<div class="imageBorder">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-06 17:34:21
|
Revision: 1823
http://openutils.svn.sourceforge.net/openutils/?rev=1823&view=rev
Author: fgiust
Date: 2010-02-06 17:34:15 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
graphic review
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background.png
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.gif
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-06 16:42:05 UTC (rev 1822)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-06 17:34:15 UTC (rev 1823)
@@ -1,5 +1,5 @@
html,body {
- margin: 2px 2px 2px 2px;
+ margin: 0;
padding: 0;
font-size: 0.9em;
font-family: Verdana;
@@ -13,9 +13,9 @@
position: relative;
width: 100%;
float: left;
- background: #E4F5C9 url(../../controls/navigation/mgnlNavigationBgInactive.gif) repeat-x bottom left;
line-height: 30px;
- background: #E4F5C9 url(../../controls/navigation/mgnlNavigationBgInactive.gif) repeat-x bottom left;
+ /*background: #E4F5C9 url(../../controls/navigation/mgnlNavigationBgInactive.gif) repeat-x bottom left;*/
+ background: #E4F5C9 url(images/toolbar-background.png) repeat-x bottom left;
}
.separator {
@@ -33,12 +33,21 @@
}
#navigation .right {
+ padding-left: 0;
float: right;
}
+#navigation #bgselectorblock {
+ width: 48px;
+ float: right;
+ margin-right: 10px;
+}
+
#navigation .right a.bg-selector {
- padding-left: 20px;
- background: transparent url(images/bg-selectors.gif) no-repeat scroll left top;
+ padding-left: 16px;
+ height: 16px;
+ line-height: 10px;
+ background: transparent url(images/bg-selectors.png) no-repeat scroll left top;
}
#navigation .right a.white-active {
@@ -66,7 +75,11 @@
.voice a,.voice a:visited,.voice a:hover {
text-decoration: none;
- color: #666;
+ color: #333;
+ text-shadow: 0 1px 0 #B6DB41;
+ text-transform: capitalize;
+ font-variant: small-caps;
+ font-size: 12px;
}
.voice a:hover {
@@ -75,6 +88,7 @@
.actual {
font-weight: bold;
+ /*text-decoration: underline;*/
padding-right: 20px;
background: url(../../controls/navigation/mgnlNavigationArrow.gif) no-repeat center right;
}
@@ -251,7 +265,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
.sexy-tooltip {
@@ -269,7 +283,7 @@
background-color: #ffffff;
border: 1px solid #cfcfcf;
opacity: 0.90;
- filter: alpha(opacity = 90);
+ filter: alpha(opacity = 90);
-moz-box-shadow: 3px 3px 3px #666;
-webkit-box-shadow: 3px 3px 3px #666;
box-shadow: 3px 3px 3px #666;
@@ -304,4 +318,4 @@
.menupopup a img {
margin-right: 4px;
-}
+}
\ No newline at end of file
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.gif
===================================================================
(Binary files differ)
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-06 16:42:05 UTC (rev 1822)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-06 17:34:15 UTC (rev 1823)
@@ -122,17 +122,17 @@
[/#if]
</form>
<div id="navigation">
- <div class="voice right" style="padding-right: 10px;">
- <a name="bg-black" href="#" class="bg-selector black">${this.msgs.get('media.bgselector.black')}</a>
+ <div id="bgselectorblock">
+ <div class="voice right">
+ <a name="bg-black" href="#" class="bg-selector black" title="${this.msgs.get('media.bgselector.black')}"><!-- --></a>
+ </div>
+ <div class="voice right">
+ <a name="bg-transparent" href="#" class="bg-selector transparent" title="${this.msgs.get('media.bgselector.transparent')}"><!-- --></a>
+ </div>
+ <div class="voice right">
+ <a name="bg-white" href="#" class="bg-selector white" title="${this.msgs.get('media.bgselector.white')}"><!-- --></a>
+ </div>
</div>
- <div class="separator right">|</div>
- <div class="voice right">
- <a name="bg-transparent" href="#" class="bg-selector transparent">${this.msgs.get('media.bgselector.transparent')}</a>
- </div>
- <div class="separator right">|</div>
- <div class="voice right">
- <a name="bg-white" href="#" class="bg-selector white">${this.msgs.get('media.bgselector.white')}</a>
- </div>
[#list this.types as type]
[#if type.name == this.type]
[#assign actual = "actual"]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-07 10:55:44
|
Revision: 1843
http://openutils.svn.sourceforge.net/openutils/?rev=1843&view=rev
Author: fgiust
Date: 2010-02-07 10:55:38 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
MEDIA-76 labels and icon for document type handler
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-07 10:53:42 UTC (rev 1842)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-07 10:55:38 UTC (rev 1843)
@@ -8,6 +8,7 @@
media.dialogs.mediaAudioDlg.label= Audio
media.dialogs.mediaVideoDlg.label=Video
media.dialogs.mediaYoutubeDlg.label= External Video
+media.dialogs.mediaDocumentDlg.label= Document
media.dialogs.mediaVideoDlg.tabVideo.image.description=Preview image
@@ -22,6 +23,9 @@
media.dialogs.tabVideo.video.label=Video
media.dialogs.tabVideo.image.label=Preview image
+media.dialogs.tabDocument.label=Document
+media.dialogs.tabDocument.document.label=File
+
media.dialogs.tabVideo.videoUrl.label=External video url
@@ -46,12 +50,14 @@
media.types.audio=Mp3s
media.types.youtube=External videos
media.types.video=Flvs
+media.types.document=Documents
media.types.image.load=Upload new image
media.types.audio.load=Upload new mp3
media.types.youtube.load=Link external video
media.types.video.load=Upload new flv
+media.types.document.load=Upload new document
media.download=Download
media.edit=Edit
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-07 10:53:42 UTC (rev 1842)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-07 10:55:38 UTC (rev 1843)
@@ -9,6 +9,7 @@
media.dialogs.mediaAudioDlg.label= Audio
media.dialogs.mediaVideoDlg.label=Video
media.dialogs.mediaYoutubeDlg.label= External Video
+media.dialogs.mediaDocumentDlg.label= Documento
media.dialogs.mediaVideoDlg.tabVideo.image.description=Immagine di anteprima
@@ -22,6 +23,9 @@
media.dialogs.tabVideo.video.label=Video
media.dialogs.tabVideo.image.label=Immagine
+media.dialogs.tabDocument.label=Documento
+media.dialogs.tabDocument.document.label=File
+
media.dialogs.tabVideo.videoUrl.label=Url del video esterno
@@ -47,12 +51,14 @@
media.types.audio=Mp3
media.types.youtube=Video esterni
media.types.video=Flv
+media.types.document=Documenti
media.types.image.load=Carica immagine
media.types.audio.load=Carica file mp3
media.types.youtube.load=Collega video esterno
media.types.video.load=Carica video flv
+media.types.document.load=Carica documento
media.download=Scarica
media.edit=Modifica
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-07 13:08:55
|
Revision: 1847
http://openutils.svn.sourceforge.net/openutils/?rev=1847&view=rev
Author: fgiust
Date: 2010-02-07 12:14:16 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
MEDIA-81 some IE6 layout fixes
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/branding/openmind-logo.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/branding/openmind-logo.png
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-07 11:16:13 UTC (rev 1846)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-07 12:14:16 UTC (rev 1847)
@@ -28,6 +28,7 @@
.voice {
float: left;
+ height: 30px;
padding-left: 10px;
}
@@ -266,7 +267,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
.sexy-tooltip {
@@ -284,7 +285,7 @@
background-color: #ffffff;
border: 1px solid #cfcfcf;
opacity: 0.90;
- filter: alpha(opacity = 90);
+ filter: alpha(opacity = 90);
-moz-box-shadow: 3px 3px 3px #666;
-webkit-box-shadow: 3px 3px 3px #666;
box-shadow: 3px 3px 3px #666;
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-07 11:16:13 UTC (rev 1846)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-07 12:14:16 UTC (rev 1847)
@@ -107,7 +107,10 @@
expandOnShow: true,
contentEl: 'mediaTreeView',
floatable: true,
- frame: true,
+ frame: false,
+ border: false,
+ bodyBorder: false,
+ hideBorders: true,
animCollapse:false,
animFloat: false,
stateful: true
@@ -161,7 +164,7 @@
shadow: false,
collapsible: false,
closable: true,
- body: new Ext.ux.ManagedIFrame({autoCreate:{id:'dynamicIframe1',cls:'x-window-body',width:'100%',height:'100%',src: "${this.request.contextPath}/"+src}}),
+ body: new Ext.ux.ManagedIFrame({autoCreate:{id:'dynamicIframe1',cls:'x-window-body',frameBorder: 0,width:'100%',height:'100%',src: "${this.request.contextPath}/"+src}}),
animate: true,
title: "",
resizable: false,
@@ -269,9 +272,9 @@
</head>
<body>
<iframe id="mediaTreeView" name="mediaTreeView" class="x-panel-body" src=""
- style="width:100%;height:100%;border:none;margin:none"></iframe>
+ style="width:100%;height:100%;border:none;margin:none" frameborder="0"></iframe>
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
- style="width:100%;height:100%;border:none; overflow:auto"></iframe>
+ style="width:100%;height:100%;border:none; overflow:auto" frameborder="0"></iframe>
<div id="formDiv" style="display:none">
<form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
<input type="hidden" name="command" value="saveZip" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-07 15:12:59
|
Revision: 1848
http://openutils.svn.sourceforge.net/openutils/?rev=1848&view=rev
Author: fgiust
Date: 2010-02-07 15:12:52 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
MEDIA-81 some more IE6 layout fixes
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/youtube.png
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-02-07 12:14:16 UTC (rev 1847)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-02-07 15:12:52 UTC (rev 1848)
@@ -1,27 +1,3 @@
-/**
- *
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * You may obtain a copy of the License at
- *
- * http://www.gnu.org/licenses/lgpl-2.1.html
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
.mediaBranding {
font-family: Verdana, sans-serif;
font-size: 11px;
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-07 12:14:16 UTC (rev 1847)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-07 15:12:52 UTC (rev 1848)
@@ -28,8 +28,10 @@
.voice {
float: left;
- height: 30px;
+ height: 20px;
padding-left: 10px;
+ padding-top: 8px;
+ line-height: 12px;
}
#navigation .right {
@@ -48,6 +50,10 @@
height: 16px;
line-height: 10px;
background: transparent url(images/bg-selectors.png) no-repeat scroll left top;
+ text-indent: -10000px;
+ overflow: hidden;
+ display: block;
+ float:left;
}
#navigation .right a.white-active {
@@ -267,7 +273,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
.sexy-tooltip {
@@ -285,7 +291,7 @@
background-color: #ffffff;
border: 1px solid #cfcfcf;
opacity: 0.90;
- filter: alpha(opacity = 90);
+ filter: alpha(opacity = 90);
-moz-box-shadow: 3px 3px 3px #666;
-webkit-box-shadow: 3px 3px 3px #666;
box-shadow: 3px 3px 3px #666;
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.png
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/youtube.png
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-07 12:14:16 UTC (rev 1847)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-07 15:12:52 UTC (rev 1848)
@@ -104,6 +104,7 @@
maxSize: 400,
collapsible: true,
margins:'0 0 0 0',
+ padding: 0,
expandOnShow: true,
contentEl: 'mediaTreeView',
floatable: true,
@@ -272,7 +273,7 @@
</head>
<body>
<iframe id="mediaTreeView" name="mediaTreeView" class="x-panel-body" src=""
- style="width:100%;height:100%;border:none;margin:none" frameborder="0"></iframe>
+ style="width:100%;height:100%;border: none;margin:0;padding:0" frameborder="0"></iframe>
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
style="width:100%;height:100%;border:none; overflow:auto" frameborder="0"></iframe>
<div id="formDiv" style="display:none">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-07 15:48:29
|
Revision: 1850
http://openutils.svn.sourceforge.net/openutils/?rev=1850&view=rev
Author: fgiust
Date: 2010-02-07 15:48:22 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
MEDIA-81 some more IE6 layout fixes
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-02-07 15:18:33 UTC (rev 1849)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-02-07 15:48:22 UTC (rev 1850)
@@ -16,4 +16,8 @@
.mediaBranding a {
color: #333;
+}
+
+.mgnlListHeaderBackground {
+ border: 10px solid red;
}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-07 15:18:33 UTC (rev 1849)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-07 15:48:22 UTC (rev 1850)
@@ -85,7 +85,7 @@
},
{
region:'south',
- html:'<div class="mediaBranding"><a href="http://www.openmindonline.it" target="_blank"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" alt="openmind" /></a>${this.getMessage('media.footer.text', this.moduleVersion)}</div>',
+ html:'<div class="mediaBranding"><a href="http://www.openmindonline.it" target="_blank"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" alt="openmind" /></a><span class="brandinginfo">${this.getMessage('media.footer.text', this.moduleVersion)}</span></div>',
height: 24
}
]
@@ -121,7 +121,9 @@
});
// FF 3.6 patch
- setTimeout(function() { frames['mediaTreeView'].location.href = getTreeUrl(); }, 100);
+ setTimeout(function() {
+ frames['mediaTreeView'].location.href = getTreeUrl();
+ }, 100);
if (openPath != null && openPath != "null" && openPath.length > 0)
{
@@ -273,7 +275,7 @@
</head>
<body>
<iframe id="mediaTreeView" name="mediaTreeView" class="x-panel-body" src=""
- style="width:100%;height:100%;border: none;margin:0;padding:0" frameborder="0"></iframe>
+ style="width:100%;height:100%;border: none;margin:0;padding:0px;" frameborder="0"></iframe>
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
style="width:100%;height:100%;border:none; overflow:auto" frameborder="0"></iframe>
<div id="formDiv" style="display:none">
@@ -296,6 +298,7 @@
try {
if (!(document.location.host.indexOf('localhost') > -1) && !(document.location.host.indexOf('127.0.0.1') > -1) ) {
var pageTracker = _gat._getTracker("UA-10294410-2");
+pageTracker._setReferrerOverride(document.location);
pageTracker._trackPageview('/products/media');
}
} catch(err) {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-08 16:13:34
|
Revision: 1856
http://openutils.svn.sourceforge.net/openutils/?rev=1856&view=rev
Author: diego_schivo
Date: 2010-02-08 16:13:28 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
MEDIA-82 Remove the standard title tooltip from the image in folder view
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js 2010-02-08 15:36:56 UTC (rev 1855)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js 2010-02-08 16:13:28 UTC (rev 1856)
@@ -35,7 +35,10 @@
onOpen: $empty,
onClose: $empty,
openFromLink: true,
- relativeToWindow: true
+ relativeToWindow: true,
+ titleOfContent: function(content){
+ return content.title || ' ';
+ }
},
initialize: function(className, options){
@@ -354,7 +357,7 @@
}
//var title = this.content[index].title;
this.contentToLoad = {
- title: this.content[index].title || ' ',
+ title: this.options.titleOfContent(this.content[index]),
//desc: $(this.options.descClassName+this.content[index].id).clone(),
desc: desc,
number: index+1
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-08 15:36:56 UTC (rev 1855)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-08 16:13:28 UTC (rev 1856)
@@ -61,7 +61,7 @@
window.addEvent(Browser.Engine.name == 'trident' ? 'load' : 'domready', function(){
var multibox = new MultiBox('multibox', {
path: '${this.request.contextPath}/.resources/media/players/',
- useOverlay: true,
+ useOverlay: true,
onOpen: function(){
isTreeCollapsed = parent.isTreeCollapsed();
if (!isTreeCollapsed)
@@ -74,6 +74,9 @@
{
parent.setTreeCollapsed(false);
}
+ },
+ titleOfContent: function(content){
+ return content.getElement('img').get('alt');
}
});
@@ -284,12 +287,12 @@
[#if !url?starts_with('http')]
[#assign url = "${this.request.contextPath}${media.previewUrl}"]
[/#if]
- <a id="mb${index}" class="multibox" href="${url}" title="${media.description!""}">
+ <a id="mb${index}" class="multibox" href="${url}">
[#assign thumbnailPath = media.thumbnailUrl]
[#if thumbnailPath == '']
[#assign thumbnailPath = "/.resources/media/icons/brokenThumb.jpg"]
[/#if]
- <img src="${this.request.contextPath}${thumbnailPath}" border="0" alt="" />
+ <img src="${this.request.contextPath}${thumbnailPath}" border="0" alt="${media.description!""}" />
</a>
<div class="details">
<h4>${media.description!""}</h4>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-14 10:09:17
|
Revision: 1922
http://openutils.svn.sourceforge.net/openutils/?rev=1922&view=rev
Author: fgiust
Date: 2010-02-14 10:09:10 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
MEDIA-97 the media tag should use the player tag also for external videos - a bit of refactoring for making the player tag more generic
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-02-13 22:12:21 UTC (rev 1921)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-02-14 10:09:10 UTC (rev 1922)
@@ -105,42 +105,28 @@
<![CDATA[ />]]>
</c:if>
</c:when>
- <c:when test="${media.type eq 'video' or media.type eq 'audio' }">
- <media:player player="${player}" share="${share}" item="${item}" width="${width}" height="${height}" autoPlay="${autoPlay}" loop="${loop}" thumbnail="${thumbnail}" noPlayIcon="${noPlayIcon}" controlbar="${controlbar}" skin="${skin}"/>
+ <c:when test="${media.type eq 'video' or media.type eq 'audio' or media.type eq 'youtube' }">
+ <c:set var="url" value="${media:url(mediaNode)}"/>
+ <c:choose>
+ <c:when test="${media.type eq 'youtube' and fn:startsWith(url, 'http://www.youtube')}">
+ <!-- automatically extract preview image for youtube videos from url -->
+ <c:set var="preview">http://img.youtube.com/vi/${su:substringAfterLast(url, 'v=')}/0.jpg</c:set>
+ </c:when>
+ </c:choose>
+ <media:player url="${url}"
+ preview="${preview}"
+ player="${player}"
+ share="${share}"
+ item="${item}"
+ width="${width}"
+ height="${height}"
+ autoPlay="${autoPlay}"
+ loop="${loop}"
+ thumbnail="${thumbnail}"
+ noPlayIcon="${noPlayIcon}"
+ controlbar="${controlbar}"
+ skin="${skin}"/>
</c:when>
- <c:when test="${media.type eq 'youtube'}">
- <c:set var="url" value="${media:url(mediaNode)}" />
- <c:if test="${width eq 0 }">
- <c:set var="width" value="320" />
- </c:if>
- <c:if test="${height eq 0}">
- <c:set var="height" value="240" />
- </c:if>
- <c:set var="flashvars">
- <![CDATA[file=${media:url(mediaNode)}${controlBar}]]>
- <c:choose>
- <c:when test="${fn:indexOf(url, 'youtube') ge 0}">
- <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
- <![CDATA[&type=youtube&image=http://img.youtube.com/vi/${previewImage}/0.jpg]]>
- </c:when>
- <c:when test="${thumbnail}">
- <c:choose>
- <c:when test="${width gt 0 and height gt 0}">
- <c:set var="previewres" value="${width}x${height}" />
- <![CDATA[&image=${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}]]>
- </c:when>
- <c:otherwise>
- <![CDATA[&image=${pageContext.request.contextPath}${media:thumbnail(mediaNode)}]]>
- </c:otherwise>
- </c:choose>
- </c:when>
- </c:choose>
- </c:set>
- <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
- <c:if test="${!empty(url)}">
- <media:swfobject player="${player}" width="${width}" height="${height}" allowfullscreen="true" allowscriptaccess="always" wmode="opaque" flashvars="${flashvars}" />
- </c:if>
- </c:when>
</c:choose>
</c:when>
<c:otherwise>
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-02-13 22:12:21 UTC (rev 1921)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-02-14 10:09:10 UTC (rev 1922)
@@ -3,38 +3,33 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8" />
- <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object"
- description="media uuid or media content node " />
- <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String"
- description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
- description="image or player width" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
- description="image or player height" />
- <jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="if true the img element will be rendered without width and height attributes " />
- <jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="auto starts the player without waiting for user play command" />
- <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="loop video or audio" />
- <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="hide player icons" />
+ <jsp:directive.attribute name="url" required="true" rtexprvalue="true" type="java.lang.String" description="Url for the flv that will be loaded by the player" />
+ <jsp:directive.attribute name="preview" required="false" rtexprvalue="true" type="java.lang.String" description="Preview image url" />
+ <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node " />
+ <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width" />
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height" />
+ <jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true the img element will be rendered without width and height attributes " />
+ <jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean" description="auto starts the player without waiting for user play command" />
+ <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean" description="loop video or audio" />
+ <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean" description="hide player icons" />
<jsp:directive.attribute name="skin" required="false" rtexprvalue="true" description="set player skin" />
- <jsp:directive.attribute name="thumbnail" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="if set to true the preview of the player shows the thumbnail image" />
- <jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String"
- description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
- <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="if set to true the pluging share-1 is showen" />
+ <jsp:directive.attribute name="thumbnail" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the preview of the player shows the thumbnail image" />
+ <jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
+ <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="Adds the share features to the player (copy page url and embed code)" />
+ <!-- end attributes -->
<c:set value="${media:node(item)}" var="mediaNode" />
<c:if test="${empty controlbar}">
<c:set var="controlbar" value="bottom" />
</c:if>
+ <!-- end defaults -->
+
+
<c:set var="baseUrl" scope="request">
<jsp:text>${pageContext.request.scheme}://${pageContext.request.serverName}</jsp:text>
<c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
+ <jsp:text>${pageContext.request.contextPath}</jsp:text>
</c:set>
- <c:set var="url" value="${media:url(mediaNode)}" />
<c:if test="${width eq 0 }">
<c:set var="width" value="${media:width(mediaNode)}" />
</c:if>
@@ -56,52 +51,60 @@
<c:if test="${previewheight gt 20 and (controlbar eq 'bottom' or controlbar eq 'top')}">
<c:set var="previewheight" value="${previewheight - 20}" />
</c:if>
+ <c:if test="${thumbnail and empty preview}">
+ <c:choose>
+ <c:when test="${previewwidth gt 0 and previewheight gt 0}">
+ <c:set var="previewres" value="${previewwidth}x${previewheight}" />
+ <c:set var="preview" value="${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}"/>
+ </c:when>
+ <c:otherwise>
+ <c:set var="preview" value="${pageContext.request.contextPath}${media:thumbnail(mediaNode)}"/>
+ </c:otherwise>
+ </c:choose>
+ </c:if>
<c:if test="${!empty(url)}">
- <c:if test="${su:endsWith(fn:toLowerCase(url), '.flv') or su:endsWith(fn:toLowerCase(url), '.mp3')}">
- <c:set var="flashvars">
- <![CDATA[file=${pageContext.request.contextPath}${url}]]>
- <c:if test="${!empty controlbar}">
- <![CDATA[&controlbar=${controlbar}]]>
- </c:if>
- <c:if test="${autoPlay}">
- <![CDATA[&autostart=true]]>
- </c:if>
- <c:if test="${loop}">
- <![CDATA[&repeat=always]]>
- </c:if>
- <c:if test="${noPlayIcon}">
- <![CDATA[&icons=false]]>
- </c:if>
- <c:if test="${not empty skin}">
- <![CDATA[&skin=${skin}]]>
- </c:if>
- <c:if test="${thumbnail}">
- <c:choose>
- <c:when test="${previewwidth gt 0 and previewheight gt 0}">
- <c:set var="previewres" value="${previewwidth}x${previewheight}" />
- <![CDATA[&image=${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}]]>
- </c:when>
- <c:otherwise>
- <![CDATA[&image=${pageContext.request.contextPath}${media:thumbnail(mediaNode)}]]>
- </c:otherwise>
- </c:choose>
- </c:if>
- <c:if test="${share}">
- <c:set var="sharinglink">${baseUrl}${pageContext.request.contextPath}${actpage.handle}.html</c:set>
- <c:set var="sharingcode">
- <embed src="${baseUrl}${pageContext.request.contextPath}/.resources/media/players/player.swf"
- flashvars="file=${baseUrl}${pageContext.request.contextPath}${url}" width="${width}" height="${height}" />
- </c:set>
- <![CDATA[&plugins=sharing-1]]>
- <![CDATA[&sharing.link=${sharinglink}]]>
- <![CDATA[&sharing.code=${fn:escapeXml(sharingcode)}]]>
- </c:if>
- </c:set>
- <media:swfobject player="${player}" width="${width}" height="${height}" allowfullscreen="true"
- allowscriptaccess="always" wmode="opaque" flashvars="${flashvars}" />
- </c:if>
- <c:if test="${su:endsWith(fn:toLowerCase(url), 'swf')}">
- <media:swfobject player="${pageContext.request.contextPath}${url}" width="${width}" height="${height}" />
- </c:if>
+ <c:choose>
+ <c:when test="${su:endsWith(fn:toLowerCase(url), 'swf')}">
+ <media:swfobject player="${pageContext.request.contextPath}${url}" width="${width}" height="${height}" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="flashvars">
+ <![CDATA[file=${fn:startsWith(url, 'http')? '' : pageContext.request.contextPath}${url}]]>
+ <c:if test="${fn:startsWith(url, 'http://www.youtube')}">
+ <![CDATA[&type=youtube]]>
+ </c:if>
+ <c:if test="${!empty controlbar}">
+ <![CDATA[&controlbar=${controlbar}]]>
+ </c:if>
+ <c:if test="${autoPlay}">
+ <![CDATA[&autostart=true]]>
+ </c:if>
+ <c:if test="${loop}">
+ <![CDATA[&repeat=always]]>
+ </c:if>
+ <c:if test="${noPlayIcon}">
+ <![CDATA[&icons=false]]>
+ </c:if>
+ <c:if test="${not empty skin}">
+ <![CDATA[&skin=${skin}]]>
+ </c:if>
+ <c:if test="${thumbnail and !empty preview}">
+ <![CDATA[&image=${preview}]]>
+ </c:if>
+ <c:if test="${share}">
+ <c:set var="sharinglink">${baseUrl}${actpage.handle}.html</c:set>
+ <c:set var="sharingcode">
+ <embed src="${baseUrl}/.resources/media/players/player.swf"
+ flashvars="file=${fn:startsWith(url, 'http')? '' : baseUrl}${url}" width="${width}" height="${height}" />
+ </c:set>
+ <![CDATA[&plugins=sharing-1]]>
+ <![CDATA[&sharing.link=${sharinglink}]]>
+ <![CDATA[&sharing.code=${fn:escapeXml(sharingcode)}]]>
+ </c:if>
+ </c:set>
+ <media:swfobject player="${player}" width="${width}" height="${height}" allowfullscreen="true"
+ allowscriptaccess="always" wmode="opaque" flashvars="${flashvars}" />
+ </c:otherwise>
+ </c:choose>
</c:if>
</jsp:root>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2010-02-13 22:12:21 UTC (rev 1921)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2010-02-14 10:09:10 UTC (rev 1922)
@@ -2,14 +2,15 @@
xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
- <jsp:directive.tag description="" pageEncoding="UTF-8" />
- <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String"
- description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
- description="flash content width" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
- description="flash content height" />
+ <jsp:directive.tag pageEncoding="UTF-8" description="Renders the flash-content and the javascript for replacing it" />
+ <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content width" />
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content height" />
<jsp:directive.tag dynamic-attributes="attrs" />
+ <!-- end attributes -->
+
+
+ <c:set var="debug" value="${false}"/><!-- set to true to print out the generated javascript on page -->
<c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
<div id="${previewId}" class="preview"><!-- -->
</div>
@@ -47,4 +48,23 @@
swfobject.write('${previewId}');
}]]>
</script>
+ <c:if test="${debug}">
+ <pre>
+ <![CDATA[
+ var swfobject = new SWFObject('${playerPath}','player','${width}','${height}','9','#ffffff');]]>
+ <c:forEach var="attr" items="${attrs}">
+ <c:if test="${!empty attr.value}">
+ <![CDATA[
+ swfobject.addParam('${attr.key}','${attr.value}');]]>
+ </c:if>
+ </c:forEach>
+ <![CDATA[
+ var version = deconcept.SWFObjectUtil.getPlayerVersion();
+ if (!(version["major"] == 0 || version["major"] < 9)) {
+ swfobject.write('${previewId}');
+ }]]>
+ </pre>
+ </c:if>
+
+
</jsp:root>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-13 22:12:21 UTC (rev 1921)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-14 10:09:10 UTC (rev 1922)
@@ -26,7 +26,7 @@
media.dialogs.tabDocument.label=Document
media.dialogs.tabDocument.document.label=File
-media.dialogs.tabVideo.videoUrl.label=External video url
+media.dialogs.tabVideo.videoUrl.label=External video url (flv absolute url or youtube url)
media.dialogs.tabTitle.label=Title
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-14 18:42:23
|
Revision: 1924
http://openutils.svn.sourceforge.net/openutils/?rev=1924&view=rev
Author: fgiust
Date: 2010-02-14 18:42:13 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
Added a description to the external video dialog
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaYoutubeDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaYoutubeDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaYoutubeDlg.xml 2010-02-14 18:35:36 UTC (rev 1923)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaYoutubeDlg.xml 2010-02-14 18:42:13 UTC (rev 1924)
@@ -9,6 +9,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.LayerDialogMVC</sv:value>
</sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>media.dialogs.mediaYoutubeDlg.description</sv:value>
+ </sv:property>
<sv:property sv:name="height" sv:type="String">
<sv:value>500</sv:value>
</sv:property>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-14 18:35:36 UTC (rev 1923)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-14 18:42:13 UTC (rev 1924)
@@ -26,7 +26,8 @@
media.dialogs.tabDocument.label=Document
media.dialogs.tabDocument.document.label=File
-media.dialogs.tabVideo.videoUrl.label=External video url (flv absolute url or youtube url)
+media.dialogs.tabVideo.videoUrl.label=External video url
+media.dialogs.tabVideo.videoUrl.description=flv absolute url or youtube url
media.dialogs.tabTitle.label=Title
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-14 18:35:36 UTC (rev 1923)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-14 18:42:13 UTC (rev 1924)
@@ -27,6 +27,7 @@
media.dialogs.tabDocument.document.label=File
media.dialogs.tabVideo.videoUrl.label=Url del video esterno
+media.dialogs.tabVideo.videoUrl.description=URL del file flv o URL di youtube
media.dialogs.tabTitle.label=Titolo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 09:11:11
|
Revision: 1979
http://openutils.svn.sourceforge.net/openutils/?rev=1979&view=rev
Author: diego_schivo
Date: 2010-02-18 09:11:05 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-104 "pages" menu doesn't display correctly for long paths
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-18 08:58:50 UTC (rev 1978)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-18 09:11:05 UTC (rev 1979)
@@ -323,7 +323,6 @@
text-decoration: none;
display: block;
color: #000;
- height: 16px;
line-height: 16px;
padding: 2px 4px;
}
@@ -342,6 +341,4 @@
.menupopup a span {
width: 290px;
- white-space: nowrap;
- overflow: hidden;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-18 08:58:50 UTC (rev 1978)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-18 09:11:05 UTC (rev 1979)
@@ -273,6 +273,7 @@
<a href="${this.request.contextPath}${page}.html" target="_blank">
<img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" border="0" />
<span>${page}</span>
+ <br style="clear: left;" />
</a>
</li>
[/#list]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 09:24:35
|
Revision: 1980
http://openutils.svn.sourceforge.net/openutils/?rev=1980&view=rev
Author: diego_schivo
Date: 2010-02-18 09:24:28 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-104 IE6, IE7
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-02-18 09:11:05 UTC (rev 1979)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-02-18 09:24:28 UTC (rev 1980)
@@ -6,3 +6,7 @@
.menupopup a {
padding: 1px 4px;
}
+
+.menupopup a span {
+ word-wrap: break-word;
+}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-18 09:11:05 UTC (rev 1979)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-18 09:24:28 UTC (rev 1980)
@@ -273,7 +273,7 @@
<a href="${this.request.contextPath}${page}.html" target="_blank">
<img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" border="0" />
<span>${page}</span>
- <br style="clear: left;" />
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
[/#list]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 10:43:49
|
Revision: 1981
http://openutils.svn.sourceforge.net/openutils/?rev=1981&view=rev
Author: diego_schivo
Date: 2010-02-18 10:43:42 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-104 fix "edit" menu
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-18 09:24:28 UTC (rev 1980)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-18 10:43:42 UTC (rev 1981)
@@ -338,7 +338,3 @@
.menupopup a img {
margin-right: 4px;
}
-
-.menupopup a span {
- width: 290px;
-}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-18 09:24:28 UTC (rev 1980)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-18 10:43:42 UTC (rev 1981)
@@ -74,7 +74,9 @@
var menu = menuitem.getNext();
if (menu != this.menu){
this.hide();
+ var width = menu.getStyle('width')
var content = new Element('div', {html: menu.get('html')});
+ content.getElements('a span').setStyle('width', (width.toInt() - 30) + 'px')
var coords = menuitem.getCoordinates();
this.popup
.empty()
@@ -82,7 +84,7 @@
.setStyles({
left: coords.left + 'px',
top: (coords.bottom + 5) + 'px',
- width: menu.getStyle('width'),
+ width: width,
display: 'block'
});
this.popup.setStyle('height', content.getSize().y + 'px');
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-18 09:24:28 UTC (rev 1980)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-18 10:43:42 UTC (rev 1981)
@@ -178,45 +178,53 @@
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
<img src="${this.request.contextPath}/.resources/media/icons/ico16-edit.png" border="0" />
<span>${this.msgs.get('media.edit')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="${this.msgs.get('media.delete')}">
<img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" border="0" />
<span>${this.msgs.get('media.delete')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a href="javascript:$empty()" onclick="openMediaTree('move','${media.handle}')" title="${this.msgs.get('media.move')}">
<img src="${this.request.contextPath}/.resources/icons/16/up_down.gif" border="0" />
<span>${this.msgs.get('media.move')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a href="javascript:$empty()" onclick="openMediaTree('copy','${media.handle}')" title="${this.msgs.get('media.copy')}">
<img src="${this.request.contextPath}/.resources/icons/16/copy.gif" border="0" />
<span>${this.msgs.get('media.copy')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
[#else]
<li>
<a>
<img src="${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png" border="0" />
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a>
<img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" border="0" />
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a>
<img src="${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif" border="0" />
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a>
<img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" />
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
[/#if]
@@ -225,6 +233,7 @@
<a href="?command=download&path=${media.handle}">
<img src="${this.request.contextPath}/.resources/media/icons/ico16-download.png" border="0" />
<span>${this.msgs.get('media.download')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
[/#if]
@@ -234,6 +243,7 @@
<a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" />
<span>${this.msgs.get('media.activate')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
[#else]
@@ -249,6 +259,7 @@
<a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" />
<span>${this.msgs.get('media.deactivate')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
[#else]
@@ -256,6 +267,7 @@
<a title="${this.msgs.get('media.deactivate')}" class="disabled">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0" />
<span>${this.msgs.get('media.deactivate')}</span>
+ <div style="clear: left;"><!-- --></div>
</a>
</li>
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 16:25:29
|
Revision: 2002
http://openutils.svn.sourceforge.net/openutils/?rev=2002&view=rev
Author: diego_schivo
Date: 2010-02-18 16:25:22 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-100 media tag attributes: "node" (default: ${content}) and "property" (default: 'media')
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-02-18 16:08:42 UTC (rev 2001)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-02-18 16:25:22 UTC (rev 2002)
@@ -4,9 +4,9 @@
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
<jsp:directive.attribute name="id" required="false" rtexprvalue="true" description="html element id"/>
- <jsp:directive.attribute name="contentNode" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="The content object to use"/>
- <jsp:directive.attribute name="nodeDataName" required="false" rtexprvalue="true" type="java.lang.String" description="The name of the nodeData storing the media uuid"/>
- <jsp:directive.attribute name="item" required="false" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node"/>
+ <jsp:directive.attribute name="item" required="false" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node; if not specified, 'node' and 'property' attributes will be used"/>
+ <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="the content object to use; if not specified, object 'content' will be used"/>
+ <jsp:directive.attribute name="property" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the nodeData storing the media uuid; if not specified, 'media' will be used"/>
<jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)"/>
<jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
<jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height"/>
@@ -31,12 +31,18 @@
<jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
<jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is show"/>
<c:if test="${empty item}">
- <cms:out var="item" contentNode="${contentNode}" nodeDataName="${nodeDataName}" />
+ <c:if test="${empty node}">
+ <c:set var="node" value="${content}" />
+ </c:if>
+ <c:if test="${empty property}">
+ <c:set var="property" value="media" />
+ </c:if>
+ <cms:out var="item" contentNode="${node}" nodeDataName="${property}" />
<c:if test="${empty width}">
- <cms:out var="width" contentNode="${contentNode}" nodeDataName="${nodeDataName}_width" />
+ <cms:out var="width" contentNode="${node}" nodeDataName="${property}_width" />
</c:if>
<c:if test="${empty height}">
- <cms:out var="height" contentNode="${contentNode}" nodeDataName="${nodeDataName}_height" />
+ <cms:out var="height" contentNode="${node}" nodeDataName="${property}_height" />
</c:if>
</c:if>
<c:set value="${10000}" var="bigValue" />
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2010-02-18 16:08:42 UTC (rev 2001)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2010-02-18 16:25:22 UTC (rev 2002)
@@ -9,8 +9,9 @@
<div>
<pre>&lt;media:media item="${content.media}" width="50" height="30" videoImagePreview="true" /></pre>
<media:media item="${content.media}" width="50" height="30" videoImagePreview="true" />
+ <pre>&lt;media:media thumbnail="true" /></pre>
<pre>&lt;media:media contentNode="${'$'}{content}" nodeDataName="media" thumbnail="true" /></pre>
- <media:media contentNode="${content}" nodeDataName="media" thumbnail="true" />
+ <media:media thumbnail="true" />
</div>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-19 17:43:44
|
Revision: 2011
http://openutils.svn.sourceforge.net/openutils/?rev=2011&view=rev
Author: diego_schivo
Date: 2010-02-19 17:43:38 +0000 (Fri, 19 Feb 2010)
Log Message:
-----------
MEDIA-105 i18nBasename
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml 2010-02-19 16:11:35 UTC (rev 2010)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml 2010-02-19 17:43:38 UTC (rev 2011)
@@ -12,6 +12,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistView</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -38,7 +41,7 @@
<sv:value>2008-06-18T16:32:03.891Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T11:04:28.500+01:00</sv:value>
+ <sv:value>2010-02-19T18:40:49.859+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml 2010-02-19 16:11:35 UTC (rev 2010)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml 2010-02-19 17:43:38 UTC (rev 2011)
@@ -12,6 +12,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistsBrowserPage</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -38,7 +41,7 @@
<sv:value>2008-06-18T16:32:03.891Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T11:21:52.531+01:00</sv:value>
+ <sv:value>2010-02-19T18:41:03.671+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml 2010-02-19 16:11:35 UTC (rev 2010)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml 2010-02-19 17:43:38 UTC (rev 2011)
@@ -12,6 +12,9 @@
<sv:property sv:name="configurationClass" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.playlist.tree.PlaylistsJcrBrowserTreeConfiguration</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -44,7 +47,7 @@
<sv:value>2008-06-20T12:14:54.070Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-15T18:34:14.571+01:00</sv:value>
+ <sv:value>2010-02-19T18:32:25.375+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists.xml 2010-02-19 16:11:35 UTC (rev 2010)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists.xml 2010-02-19 17:43:38 UTC (rev 2011)
@@ -12,6 +12,9 @@
<sv:property sv:name="configurationClass" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.playlist.tree.PlaylistsTreeConfiguration</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -44,7 +47,7 @@
<sv:value>2008-06-18T16:32:32.987Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T11:09:22.968+01:00</sv:value>
+ <sv:value>2010-02-19T18:32:13.531+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-19 16:11:35 UTC (rev 2010)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-19 17:43:38 UTC (rev 2011)
@@ -102,3 +102,4 @@
stk.dam.mediauuid.description=Select or create a new media
stk.dam.mediauuid.label=Select media
+tree.playlists=Playlists tree
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-19 16:11:35 UTC (rev 2010)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-19 17:43:38 UTC (rev 2011)
@@ -103,4 +103,6 @@
media.bgselector.black=Nero
stk.dam.mediauuid.description=Seleziona o carica un nuovo media
-stk.dam.mediauuid.label=Seleziona media
\ No newline at end of file
+stk.dam.mediauuid.label=Seleziona media
+
+tree.playlists=Alberatura playlist
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2010-02-19 16:11:35 UTC (rev 2010)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2010-02-19 17:43:38 UTC (rev 2011)
@@ -18,7 +18,7 @@
{
region:'west',
id:'west-panel',
- title:'Playlist tree',
+ title:'${this.msgs.get('tree.playlists')}',
split:true,
width: 240,
minSize: 175,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2010-04-30 15:53:09
|
Revision: 2318
http://openutils.svn.sourceforge.net/openutils/?rev=2318&view=rev
Author: cstrap
Date: 2010-04-30 15:53:01 +0000 (Fri, 30 Apr 2010)
Log Message:
-----------
MEDIA-132 Enable rtmp/rtmpt streaming
- Update samples
- Update multibox with a control on url
- Update MediaFolderViewPage.html and player.tag with split url if starts with rtmp/rtmpt
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-04-29 08:16:37 UTC (rev 2317)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-04-30 15:53:01 UTC (rev 2318)
@@ -3,28 +3,39 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8" />
- <jsp:directive.attribute name="url" required="true" rtexprvalue="true" type="java.lang.String" description="Url for the flv that will be loaded by the player" />
- <jsp:directive.attribute name="preview" required="false" rtexprvalue="true" type="java.lang.String" description="Preview image url" />
- <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node " />
- <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height" />
- <jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true the img element will be rendered without width and height attributes " />
- <jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean" description="auto starts the player without waiting for user play command" />
- <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean" description="loop video or audio" />
- <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean" description="hide player icons" />
+ <jsp:directive.attribute name="url" required="true" rtexprvalue="true" type="java.lang.String"
+ description="Url for the flv that will be loaded by the player" />
+ <jsp:directive.attribute name="preview" required="false" rtexprvalue="true" type="java.lang.String"
+ description="Preview image url" />
+ <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object"
+ description="media uuid or media content node " />
+ <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String"
+ description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
+ description="image or player width" />
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
+ description="image or player height" />
+ <jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="if true the img element will be rendered without width and height attributes " />
+ <jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="auto starts the player without waiting for user play command" />
+ <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="loop video or audio" />
+ <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="hide player icons" />
<jsp:directive.attribute name="skin" required="false" rtexprvalue="true" description="set player skin" />
- <jsp:directive.attribute name="thumbnail" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the preview of the player shows the thumbnail image" />
- <jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
- <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="Adds the share features to the player (copy page url and embed code)" />
+ <jsp:directive.attribute name="thumbnail" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="if set to true the preview of the player shows the thumbnail image" />
+ <jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String"
+ description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
+ <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="Adds the share features to the player (copy page url and embed code)" />
<!-- end attributes -->
<c:set value="${media:node(item)}" var="mediaNode" />
<c:if test="${empty controlbar}">
<c:set var="controlbar" value="bottom" />
</c:if>
<!-- end defaults -->
-
-
<c:set var="baseUrl" scope="request">
<jsp:text>${pageContext.request.scheme}://${pageContext.request.serverName}</jsp:text>
<c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
@@ -55,10 +66,10 @@
<c:choose>
<c:when test="${previewwidth gt 0 and previewheight gt 0}">
<c:set var="previewres" value="${previewwidth}x${previewheight}" />
- <c:set var="preview" value="${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}"/>
+ <c:set var="preview" value="${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}" />
</c:when>
<c:otherwise>
- <c:set var="preview" value="${pageContext.request.contextPath}${media:thumbnail(mediaNode)}"/>
+ <c:set var="preview" value="${pageContext.request.contextPath}${media:thumbnail(mediaNode)}" />
</c:otherwise>
</c:choose>
</c:if>
@@ -69,7 +80,16 @@
</c:when>
<c:otherwise>
<c:set var="flashvars">
- <![CDATA[file=${fn:startsWith(url, 'http')? '' : pageContext.request.contextPath}${url}]]>
+ <c:choose>
+ <c:when test="${fn:startsWith(url, 'rtmp:') or fn:startsWith(url, 'rtmpt:')}">
+ <c:set var="file" value="${fn:split(url, '/')}" />
+ <c:set var="file" value="${file[fn:length(file)-1]}" />
+ <![CDATA[file=${file}&streamer=${fn:substring(url, 0, fn:length(url) - fn:length(file))}]]>
+ </c:when>
+ <c:otherwise>
+ <![CDATA[file=${fn:startsWith(url, 'http')? '' : pageContext.request.contextPath}${url}]]>
+ </c:otherwise>
+ </c:choose>
<c:if test="${fn:startsWith(url, 'http://www.youtube')}">
<![CDATA[&type=youtube]]>
</c:if>
@@ -94,8 +114,8 @@
<c:if test="${share}">
<c:set var="sharinglink">${baseUrl}${actpage.handle}.html</c:set>
<c:set var="sharingcode">
- <embed src="${baseUrl}/.resources/media/players/player.swf"
- flashvars="file=${fn:startsWith(url, 'http')? '' : baseUrl}${url}" width="${width}" height="${height}" />
+ <embed src="${baseUrl}/.resources/media/players/player.swf" flashvars="file=${fn:startsWith(url, 'http')? '' : baseUrl}${url}"
+ width="${width}" height="${height}" />
</c:set>
<![CDATA[&plugins=sharing-1]]>
<![CDATA[&sharing.link=${sharinglink}]]>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-04-29 08:16:37 UTC (rev 2317)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-04-30 15:53:01 UTC (rev 2318)
@@ -133,6 +133,121 @@
<sv:value>320</sv:value>
</sv:property>
</sv:node>
+ <sv:node sv:name="resolutions">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resolutions</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2655a830-4b1d-4fe3-ab0e-b460673adcb3</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-04-30T16:00:36.341+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="thumbnail">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>b841d86c-8073-4c6f-a1b7-95c8672a6e03</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>bliptv</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>75</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2010-04-30T16:00:36.343+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="resolution" sv:type="String">
+ <sv:value>thumbnail</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>100</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="res-50x30">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>be46b807-6ec7-4a9b-8b55-525ba99b94d9</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>bliptv</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>30</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wgARCAAeADIDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAQBAgMGBf/EABUBAQEAAAAAAAAAAAAAAAAAAAAB/9oADAMBAAIQAxAAAAHs2WrQjo3rSUPwc2SR7etJq1yQKBzoEf/EAB0QAAICAwEBAQAAAAAAAAAAAAECABEDEiIyEzH/2gAIAQEAAQUCRAMeqziciYxcqmde8WOsPzN/ODlV/WFs/pQwSmioVmpiLrD6f2TWNXubTaNk1l2X9//EABQRAQAAAAAAAAAAAAAAAAAAADD/2gAIAQMBAT8BD//EABQRAQAAAAAAAAAAAAAAAAAAADD/2gAIAQIBAT8BD//EACEQAAIBBAICAwAAAAAAAAAAAAABAiExQXEQERIyIkJR/9oACAEBAAY/Ak62sjJaRTyPs9mYolXJ1+iMcoZD5nsUkexfsWh7IM75sLRLZ//EACEQAAMAAQMFAQEAAAAAAAAAAAABESFBYcExUXGBobHR/9oACAEBAAE/IUalJHAVI9cJOzZwZHC5lSJXXsaS5JwY1PfBNxqIVqrCSLiz1CTUQ1d7LkVT2fAz97MgHVqthMf8iSMnaDb1+DKy8j7nB9Ip2k/CBIjxPAQlYV6auD6B/9oADAMBAAIAAwAAABC7BD7yhwD/xAAVEQEBAAAAAAAAAAAAAAAAAAAhMP/aAAgBAwEBPxAh/8QAGREAAQUAAAAAAAAAAAAAAAAAEQABECBB/9oACAECAQE/EBDnEa//xAAiEAEAAgIBBAIDAAAAAAAAAAABABEhMWFBUXHwkdHB4fH/2gAIAQEAAT8QLEghC3YB8yld0rHasO9Su7xbO66t8QSFU6pvr4Jg+oOhtZWDiAeIQbDXank+J0y8D38xWFJXmtEM3KG7xNIiWvOd/cE+4xuyYOC9XmB43Tmaja/7SvaUIHc/iABWZEnHQIHXpBEVGENmNFjz9z0PePSd4ZxQYHnCYaXq81D3Z73CKkWsPH6hnIFi+Y9x3n//2Q==</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2010-04-30T16:07:28.745+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="resolution" sv:type="String">
+ <sv:value>res-50x30</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>50</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="res-640x460">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7cbb8569-875f-49a1-ac91-daca917a5c2d</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>bliptv</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>460</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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...
[truncated message content] |
|
From: <fg...@us...> - 2010-05-02 09:08:58
|
Revision: 2323
http://openutils.svn.sourceforge.net/openutils/?rev=2323&view=rev
Author: fgiust
Date: 2010-05-02 09:08:49 +0000 (Sun, 02 May 2010)
Log Message:
-----------
MEDIA-132 cleaned up rtmp support
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-05-01 16:33:13 UTC (rev 2322)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-05-02 09:08:49 UTC (rev 2323)
@@ -87,7 +87,7 @@
<![CDATA[file=${file}&streamer=${fn:substring(url, 0, fn:length(url) - fn:length(file))}]]>
</c:when>
<c:otherwise>
- <![CDATA[file=${fn:startsWith(url, 'http')? '' : pageContext.request.contextPath}${url}]]>
+ <![CDATA[file=${fn:contains(url, '://')? '' : pageContext.request.contextPath}${url}]]>
</c:otherwise>
</c:choose>
<c:if test="${fn:startsWith(url, 'http://www.youtube')}">
@@ -114,7 +114,7 @@
<c:if test="${share}">
<c:set var="sharinglink">${baseUrl}${actpage.handle}.html</c:set>
<c:set var="sharingcode">
- <embed src="${baseUrl}/.resources/media/players/player.swf" flashvars="file=${fn:startsWith(url, 'http')? '' : baseUrl}${url}"
+ <embed src="${baseUrl}/.resources/media/players/player.swf" flashvars="file=${fn:contains(url, '://')? '' : baseUrl}${url}"
width="${width}" height="${height}" />
</c:set>
<![CDATA[&plugins=sharing-1]]>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-05-01 16:33:13 UTC (rev 2322)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-05-02 09:08:49 UTC (rev 2323)
@@ -1079,10 +1079,10 @@
<sv:value>7a342aeb-6e05-4e4a-8aa4-fa93e0312a3f</sv:value>
</sv:property>
<sv:property sv:name="description" sv:type="String">
- <sv:value>An rmtp external video</sv:value>
+ <sv:value>Sample for rtmp streaming</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
- <sv:value>External video</sv:value>
+ <sv:value>Streamed external video</sv:value>
</sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>youtube</sv:value>
@@ -1101,7 +1101,7 @@
<sv:value>2010-04-30T16:00:35.442+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-04-30T16:47:10.803+02:00</sv:value>
+ <sv:value>2010-05-02T11:05:53.334+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value/>
@@ -1165,7 +1165,7 @@
<sv:value>mgnl:resource</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>8e48775f-51f9-48d0-abd9-30a481489b8c</sv:value>
+ <sv:value>7f16369b-5136-4d8e-8ff7-e155622f06d9</sv:value>
</sv:property>
<sv:property sv:name="extension" sv:type="String">
<sv:value>png</sv:value>
@@ -1180,7 +1180,7 @@
<sv:value>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</sv:value>
</sv:property>
<sv:property sv:name="jcr:lastModified" sv:type="Date">
- <sv:value>2010-04-30T16:47:11.804+02:00</sv:value>
+ <sv:value>2010-05-02T11:05:54.644+02:00</sv:value>
</sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>image/png</sv:value>
@@ -1192,70 +1192,6 @@
<sv:value>100</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="res-50x30">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>e8cf3613-ee53-44b3-872d-4a147dd31f15</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>png</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>botr</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>30</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>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</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModified" sv:type="Date">
- <sv:value>2010-04-30T17:08:42.793+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mimeType" sv:type="String">
- <sv:value>image/png</sv:value>
- </sv:property>
- <sv:property sv:name="resolution" sv:type="String">
- <sv:value>res-50x30</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>50</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="res-150x130">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>abc57f74-c64e-4554-aed2-5519c1fcbf05</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>png</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>botr</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>130</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>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...
[truncated message content] |
|
From: <fg...@us...> - 2010-05-09 11:14:28
|
Revision: 2363
http://openutils.svn.sourceforge.net/openutils/?rev=2363&view=rev
Author: fgiust
Date: 2010-05-09 11:14:22 +0000 (Sun, 09 May 2010)
Log Message:
-----------
MEDIA-113 Make the media tag and media selection dialog compatible with existing images added using the file control
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-05-07 08:52:08 UTC (rev 2362)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-05-09 11:14:22 UTC (rev 2363)
@@ -155,6 +155,14 @@
</c:when>
</c:choose>
</c:when>
+ <c:when test="${!empty property and fn:startsWith(item, '/')}">
+ <!-- fn:startsWith() is needed to avoid passing an uuid to cmsu:img. See MAGNOLIA-3196, don't call the image tag with non-binary properties -->
+ <cmsu:img contentNode="${node}" nodeDataName="${property}" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />
+ <![CDATA[<!-- missing media: ${item} -->]]>
+ </c:when>
+ <c:when test="${fn:startsWith(item, '/')}">
+ <![CDATA[<img src="${pageContext.request.contextPath}${item}" alt="" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />]]>
+ </c:when>
<c:otherwise>
<![CDATA[<!-- missing media: ${item} -->]]>
</c:otherwise>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2010-05-07 08:52:08 UTC (rev 2362)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2010-05-09 11:14:22 UTC (rev 2363)
@@ -7,11 +7,13 @@
<div>
<h3>${mediaNode.description}</h3>
<div>
- <pre>&lt;media:media item="${content.media}" width="50" height="30" videoImagePreview="true" /></pre>
- <media:media item="${content.media}" width="50" height="30" videoImagePreview="true" />
- <pre>&lt;media:media thumbnail="true" /></pre>
- <pre>&lt;media:media contentNode="${'$'}{content}" nodeDataName="media" thumbnail="true" /></pre>
- <media:media thumbnail="true" />
+ <pre>&lt;media:media property="media" width="50" height="30" videoImagePreview="true" /></pre>
+ <media:media property="media" width="50" height="30" videoImagePreview="true" />
+
+ <br/>
+ <pre>&lt;media:media property="media" thumbnail="true" /></pre>
+ <media:media property="media" thumbnail="true" />
+
</div>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-09 17:57:17
|
Revision: 2377
http://openutils.svn.sourceforge.net/openutils/?rev=2377&view=rev
Author: fgiust
Date: 2010-05-09 17:57:11 +0000 (Sun, 09 May 2010)
Log Message:
-----------
html validation
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-05-09 17:29:08 UTC (rev 2376)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-05-09 17:57:11 UTC (rev 2377)
@@ -97,6 +97,11 @@
margin-right: 0;
}
+div.mediatab img {
+ vertical-align: middle;
+ border: none;
+}
+
.actual {
background-image: url("images/toolbar-background-light.png");
}
@@ -338,3 +343,14 @@
.menupopup a img {
margin-right: 4px;
}
+
+ul.mediamenu img {
+ border: none;
+ width: 16px;
+ height: 16px;
+}
+
+ul.mediamenu li, ul.mediamenu li a {
+ height: 20px;
+ cursor: pointer;
+}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-05-09 17:29:08 UTC (rev 2376)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-05-09 17:57:11 UTC (rev 2377)
@@ -1,7 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+[#setting url_escaping_charset="UTF-8"]
<head>
+ <title>${this.path?html!""}</title>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
@@ -33,7 +34,7 @@
function performAction(action, source, dest)
{
- if (action == "move" && dest == "${this.path!""}")
+ if (action == "move" && dest == "${this.path?url!""}")
{
alert("${this.msgs.get('media.move.error.samenode')}");
return;
@@ -112,7 +113,7 @@
</script>
</head>
<body id="mediafolderview" class="bg-${this.bgSelector}">
- <form action="" style="display:none" id="actionForm" method="POST">
+ <form action="" style="display:none" id="actionForm" method="post">
<input type="hidden" id="actionCmd" name="command" value="delete" />
<input type="hidden" id="actionPath" name="path" value="${this.path!""}" />
<input type="hidden" id="actionSearch" name="search" value="${this.search!""}" />
@@ -148,8 +149,8 @@
[#assign actual = ""]
[/#if]
<div class="voice mediatab ${actual}">
- <a href="?type=${type.name}&path=${this.path!''}[#if this.request.parameterMap['selectMedia']?exists]&selectMedia=true[/#if]&search=${this.search!""}">
- <img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
+ <a href="?type=${type.name}&path=${this.path?url!''}[#if this.request.parameterMap['selectMedia']?exists]&selectMedia=true[/#if]&search=${this.search!""}">
+ <img src="${this.request.contextPath}${type.menuIcon}" alt="${this.msgs.get('media.types.' + type.name)}" />
${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
</a>
</div>
@@ -179,68 +180,63 @@
<div class="mediaheader">
<span class="edit menuitem">${this.msgs.get('media.edit')}</span>
<div class="icons menu" style="display: none;">
- <ul>
+ <ul class="mediamenu">
[#if media.writable]
<li>
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit.png" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit.png" alt="" />
<span>${this.msgs.get('media.edit')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="${this.msgs.get('media.delete')}">
- <img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" alt="" />
<span>${this.msgs.get('media.delete')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a href="javascript:$empty()" onclick="openMediaTree('move','${media.handle}')" title="${this.msgs.get('media.move')}">
- <img src="${this.request.contextPath}/.resources/icons/16/up_down.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/icons/16/up_down.gif" alt="" />
<span>${this.msgs.get('media.move')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
<li>
<a href="javascript:$empty()" onclick="openMediaTree('copy','${media.handle}')" title="${this.msgs.get('media.copy')}">
- <img src="${this.request.contextPath}/.resources/icons/16/copy.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/icons/16/copy.gif" alt="" />
<span>${this.msgs.get('media.copy')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
[#else]
<li>
<a>
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png" border="0" />
- <div style="clear: left;"><!-- --></div>
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png" alt="" />
+ <span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
<li>
<a>
- <img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" border="0" />
- <div style="clear: left;"><!-- --></div>
+ <img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" alt="" />
+ <span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
<li>
<a>
- <img src="${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif" border="0" />
- <div style="clear: left;"><!-- --></div>
+ <img src="${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif" alt="" />
+ <span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
<li>
<a>
- <img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" />
- <div style="clear: left;"><!-- --></div>
+ <img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" alt="" />
+ <span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
[/#if]
[#if !media.external]
<li>
- <a href="?command=download&path=${media.handle}">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-download.png" border="0" />
+ <a href="?command=download&path=${media.handle}">
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-download.png" alt="" />
<span>${this.msgs.get('media.download')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
[/#if]
@@ -248,15 +244,14 @@
[#if media.canPublish]
<li>
<a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" alt="" />
<span>${this.msgs.get('media.activate')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
[#else]
<li>
<a title="${this.msgs.get('media.activate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-arrow_right_inactive.png" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-arrow_right_inactive.png" alt="" />
<span>${this.msgs.get('media.activate')}</span>
</a>
</li>
@@ -266,15 +261,13 @@
<a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" />
<span>${this.msgs.get('media.deactivate')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
[#else]
<li>
<a title="${this.msgs.get('media.deactivate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" alt="" />
<span>${this.msgs.get('media.deactivate')}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
[/#if]
@@ -290,9 +283,8 @@
[#list media.usedInWebPages as page]
<li>
<a href="${this.request.contextPath}${page}.html" target="_blank">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" alt="" />
<span>${page}</span>
- <div style="clear: left;"><!-- --></div>
</a>
</li>
[/#list]
@@ -302,7 +294,7 @@
</div>
<div class="imageBorder">
<div class="image">
- <span></span>
+ <span><!-- vertical centering --></span>
[#assign url = media.previewUrl]
[#if !url?contains('://') ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-05-11 14:42:36
|
Revision: 2384
http://openutils.svn.sourceforge.net/openutils/?rev=2384&view=rev
Author: diego_schivo
Date: 2010-05-11 14:42:30 +0000 (Tue, 11 May 2010)
Log Message:
-----------
samples-playlist paragraph
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-playlist.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-playlist.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-playlist.xml 2010-05-11 14:42:30 UTC (rev 2384)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-playlist" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>97ed692a-31a9-4670-9c36-4d8ee8f6128d</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-11T15:20:33.718+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabPlaylist">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7c8c6aeb-fbaa-41a9-871d-71c3cc5e21e4</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-11T15:20:47.546+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="playlist">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>669bbe7a-b226-4afb-9ea4-8faa712ceec7</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>link</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>playlists</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-11T15:21:21.390+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-playlist.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml 2010-05-11 14:42:30 UTC (rev 2384)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-playlist" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>8ed8a74e-bfd1-47ed-a149-936357019857</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample playlist paragraph</sv:value>
+ </sv:property>
+ <sv:property sv:name="templatePath" sv:type="String">
+ <sv:value>/templates/samples-media/paragraph-playlist.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Playlist sample</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-11T15:22:13.343+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2010-05-11 07:00:12 UTC (rev 2383)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2010-05-11 14:42:30 UTC (rev 2384)
@@ -29,7 +29,7 @@
<sv:value>2009-01-16T09:26:04.050+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-04-30T16:15:49.405+02:00</sv:value>
+ <sv:value>2010-05-11T16:34:25.671+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>sampleSimpleMedia</sv:value>
@@ -75,7 +75,7 @@
<sv:value>2009-01-16T10:14:19.199+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-04-30T16:15:49.405+02:00</sv:value>
+ <sv:value>2010-05-11T16:34:25.671+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="03">
@@ -251,5 +251,36 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="04">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>4e4bae9c-e22c-48fd-a954-5afd5cbadee3</sv:value>
+ </sv:property>
+ <sv:property sv:name="playlist" sv:type="String">
+ <sv:value>/samples/test</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-11T16:34:25.671+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-11T16:34:25.671+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>samples-playlist</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp 2010-05-11 14:42:30 UTC (rev 2384)
@@ -0,0 +1,18 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
+ xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions"
+ xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+ xmlns:mu="mgnlutils">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <div class="textImage">
+ <cms:setNode var="playlistNode" path="${content.playlist}" repository="playlists" />
+ <div>
+ <h3>${playlistNode.title}</h3>
+ <div>
+ <cms:contentNodeIterator items="${mu:contentChildrenOfType(playlistNode, 'mgnl:playlistentry')}">
+ <cms:setNode var="entryNode" />
+ <media:media node="${entryNode}" property="media" width="50" height="30" videoImagePreview="true" />
+ </cms:contentNodeIterator>
+ </div>
+ </div>
+ </div>
+</jsp:root>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2010-05-11 07:00:12 UTC (rev 2383)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2010-05-11 14:42:30 UTC (rev 2384)
@@ -20,7 +20,7 @@
<cms:editBar />
<cms:includeTemplate />
</cms:contentNodeIterator>
- <cms:newBar contentNodeCollectionName="main" paragraph="samples-media,samples-mediatag" />
+ <cms:newBar contentNodeCollectionName="main" paragraph="samples-media,samples-mediatag,samples-playlist" />
</div>
</body>
</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-05-25 07:19:20
|
Revision: 2546
http://openutils.svn.sourceforge.net/openutils/?rev=2546&view=rev
Author: diego_schivo
Date: 2010-05-25 07:19:13 +0000 (Tue, 25 May 2010)
Log Message:
-----------
MEDIA-144 editing media in the playlist interface
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-24 16:44:31 UTC (rev 2545)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-05-25 07:19:13 UTC (rev 2546)
@@ -79,9 +79,9 @@
iconCls: 'button-edit',
disabled: true,
handler: function(){
- var s = grid.getSelectionModel().getSelections()[0];
- parent.openWindow('.magnolia/dialogs/' + s.data['mediaDialog'] + '.html'
- + '?mgnlPath=' + s.data['mediaHandle']
+ var s = grid.getSelectionModel().getSelections();
+ parent.openWindow('.magnolia/dialogs/' + s[0].data['mediaDialog'] + '.html'
+ + '?mgnlPath=' + s[0].data['mediaHandle']
+ '&mgnlRepository=media');
}
}
@@ -163,64 +163,6 @@
}
});
- var mediaRecord;
- var mediaForm = new Ext.FormPanel({
- items: {
- xtype: 'fieldset',
- labelWidth: 90,
- title: 'Selected media details',
- defaults: {width: 140},
- defaultType: 'textfield',
- autoHeight: true,
- bodyStyle: Ext.isIE ? 'padding:0 0 5px 15px;' : 'padding:10px 15px;',
- border: false,
- style: {
- "margin-left": "10px",
- "margin-right": Ext.isIE6 ? (Ext.isStrict ? "-10px" : "-13px") : "0"
- },
- items: [{
- xtype: 'hidden',
- name: 'command',
- value: 'saveMedia'
- }, {
- xtype: 'hidden',
- name: 'mgnlCK',
- value: (new Date()).getTime()
- }, {
- xtype: 'hidden',
- name: 'mediaHandle',
- }, {
- fieldLabel: 'Title',
- name: 'title',
- anchor: '100% none'
- }, {
- xtype: 'textarea',
- fieldLabel: 'Description',
- name: 'description',
- anchor: '100% none'
- }],
- buttons: [{
- text: 'Save',
- handler: function(){
- var form = mediaForm.getForm();
- if(form.isValid()){
- form.submit({
- url: contextPath + '/.magnolia/pages/playlistView.html',
- success: function(){
- form.updateRecord(mediaRecord);
- Ext.Msg.alert('Success', 'Media successfully saved');
- },
- failure: function(){
- Ext.Msg.alert('Failure', 'Can\'t save media');
- }
- });
- }
- }
- }]
- }
- });
- mediaForm.hide();
-
playlistView = new Ext.Panel({
id: 'playlistView',
frame: true,
@@ -242,12 +184,10 @@
singleSelect: true,
listeners: {
rowselect: function(sm, row, rec) {
- mediaForm.getForm().loadRecord(rec);
- mediaRecord = rec;
- mediaForm.show();
+ // nothing to do
},
rowdeselect: function(sm, row, rec) {
- mediaForm.hide();
+ // nothing to do
}
}
}),
@@ -259,7 +199,7 @@
}
},{
columnWidth: 0.4,
- items: [ playlistForm, mediaForm ]
+ items: [ playlistForm ]
}],
renderTo: Ext.getBody()
});
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2010-05-24 16:44:31 UTC (rev 2545)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2010-05-25 07:19:13 UTC (rev 2546)
@@ -50,10 +50,13 @@
}, 100);
});
+var currentPath;
+
function openPlaylist(path){
+ if (path) currentPath = path;
var frame = frames['playlistView'];
if (frame.disposePlaylistView) frame.disposePlaylistView();
- frame.location.href = '${this.request.contextPath}/.magnolia/pages/playlistView.html?path=' + path + '&mgnlCK=' + (new Date()).getTime();
+ frame.location.href = '${this.request.contextPath}/.magnolia/pages/playlistView.html?path=' + currentPath + '&mgnlCK=' + (new Date()).getTime();
}
var ulDialog;
@@ -84,6 +87,15 @@
ulDialog.show();
}
+//set dialog title
+function setLayerTitle(title)
+{
+ if (ulDialog)
+ {
+ ulDialog.setTitle(title);
+ }
+}
+
// close dialog
function closeLayer()
{
@@ -92,6 +104,12 @@
ulDialog.destroy();
}
}
+
+//reload folder content
+function reloadFolder(path, type)
+{
+ openPlaylist();
+}
//]]>
</script>
</head>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-06-17 19:09:15
|
Revision: 2663
http://openutils.svn.sourceforge.net/openutils/?rev=2663&view=rev
Author: fgiust
Date: 2010-06-17 19:09:09 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
MEDIA-142 better layout for the xspf url box (avoid message boxes when possible) and some work on i18n (MEDIA-155)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css 2010-06-17 19:03:03 UTC (rev 2662)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css 2010-06-17 19:09:09 UTC (rev 2663)
@@ -1,3 +1,19 @@
.x-grid3-col-title,.x-grid3-col-description,.x-grid3-col-tags {
white-space: normal;
}
+
+#xspfLink {
+ background-image: url("../icons/16/xspf.png");
+ background-repeat: no-repeat;
+ background-position: left;
+ padding-left: 20px;
+ color: #000;
+}
+
+#xspfLinkBox {
+ width: 100%;
+}
+
+.hidden {
+ display: none !important;
+}
\ No newline at end of file
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-06-17 19:03:03 UTC (rev 2662)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-06-17 19:09:09 UTC (rev 2663)
@@ -1,321 +0,0 @@
-var playlist, container, playlistView, grid;
-
-function initPlaylistView(){
- container = parent.viewport.getComponent('center-panel');
-
- var dataStore = new Ext.data.SimpleStore({
- fields: ['thumbnail', 'type', 'title', 'description', 'tags', 'handle', 'mediaHandle', 'mediaDialog']
- });
- dataStore.loadData(playlist.entries);
-
- var colModel = new Ext.grid.ColumnModel([
- {
- header: 'Thumbnail',
- renderer : function(v, p, record){
- return v ? '<img border="0" alt="" src="' + contextPath + v + '" title="' + record.data['mediaHandle'] + '" />' : '';
- }
- },
- {header: 'Type'},
- {
- id: 'title',
- header: 'Title'
- },
- {
- id: 'description',
- header: 'Description'
- },
- {
- id: 'tags',
- header: 'Tags'
- }
- ]);
-
- var tbar = [
- {
- text: playlist.msgs.addEntry,
- icon: contextPath + '/.resources/media/icons/ico16-add.png',
- iconCls: 'button-add',
- handler: function(){
- //parent.openWindow('.magnolia/dialogs/playlistentry.html?mgnlPath=' + playlist.handle + '&mgnlRepository=playlists');
- var mgnlWin = parent.parent;
- mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
- Ext.Ajax.request({
- form: 'addEntryForm',
- params: {
- mgnlPath: playlist.handle,
- media: uuid
- },
- success: function(){
- parent.openPlaylist(playlist.handle);
- },
- failure: function(){
- // todo
- }
- });
- };
- mgnlWin.mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=media&selectMedia=true&mgnlCK=' + mgnlWin.mgnlGetCacheKiller(), 800, 500);
- }
- },
- {
- text: playlist.msgs.addEntries,
- icon: contextPath + '/.resources/media/icons/ico16-addmany.png',
- iconCls: 'button-addmany',
- handler: function(){
- var mgnlWin = parent.parent;
- parent.openWindow(".magnolia/pages/mediaFolderSelection.html?parentFrame=playlistView&action=addEntries&mgnlCK=" + mgnlWin.mgnlGetCacheKiller());
- }
- },
- {
- id: 'removeEntryBtn',
- text: playlist.msgs.removeEntry,
- icon: contextPath + '/.resources/media/icons/ico16-remove.png',
- iconCls: 'button-remove',
- disabled: true,
- handler: function(){
- Ext.MessageBox.confirm('Confirm', 'Are you sure?', function(btn){
- if (btn != 'yes') return;
- var s = grid.getSelectionModel().getSelections();
- for(var i = 0, r; r = s[i]; i++){
- removeEntry(r);
- }
- });
- }
- },
- {
- id: 'editMediaBtn',
- text: playlist.msgs.editMedia,
- icon: contextPath + '/.resources/media/icons/ico16-edit.png',
- iconCls: 'button-edit',
- disabled: true,
- handler: function(){
- var s = grid.getSelectionModel().getSelections();
- parent.openWindow('.magnolia/dialogs/' + s[0].data['mediaDialog'] + '.html'
- + '?mgnlPath=' + s[0].data['mediaHandle']
- + '&mgnlRepository=media');
- }
- }
- ];
-
- function removeEntry(r){
- Ext.Ajax.request({
- method: 'post',
- url: contextPath + '/.magnolia/trees/playlists.html',
- params: {
- browseMode: false,
- deleteNode: r.data['handle'].match(/\/?([^\/]+)$/)[1],
- mgnlCK: (new Date()).getTime(),
- path: playlist.handle,
- treeMode: 'snippet'
- },
- success: function(){
- grid.store.remove(r);
- }
- });
- }
-
- var dd = new Ext.ux.dd.GridDragDropRowOrder({});
-
- var playlistForm = new Ext.FormPanel({
- items: {
- xtype: 'fieldset',
- labelWidth: 90,
- title: 'Playlist details',
- defaults: {width: 140}, // Default config options for child items
- defaultType: 'textfield',
- autoHeight: true,
- bodyStyle: Ext.isIE ? 'padding:0 0 5px 15px;' : 'padding:10px 15px;',
- border: false,
- style: {
- "margin-left": "10px", // when you add custom margin in IE 6...
- "margin-right": Ext.isIE6 ? (Ext.isStrict ? "-10px" : "-13px") : "0" // you have to adjust for it somewhere else
- },
- items: [{
- xtype: 'hidden',
- name: 'command',
- value: 'save'
- }, {
- xtype: 'hidden',
- name: 'mgnlCK',
- value: (new Date()).getTime()
- }, {
- xtype: 'hidden',
- name: 'path',
- value: playlist.handle
- }, {
- fieldLabel: 'Title',
- name: 'title',
- value: playlist.title,
- anchor: '100% none'
- }, {
- xtype: 'textarea',
- fieldLabel: 'Description',
- name: 'description',
- value: playlist.description,
- anchor: '100% none'
- }],
- buttons: [{
- text: 'Save',
- handler: function(){
- if(playlistForm.getForm().isValid()){
- playlistForm.getForm().submit({
- url: contextPath + '/.magnolia/pages/playlistView.html',
- success: function(){
- Ext.Msg.alert('Success', 'Playlist successfully saved');
- },
- failure: function(){
- Ext.Msg.alert('Failure', 'Can\'t save the playlist');
- }
- });
- }
- }
- }]
- }
- });
-
- playlistView = new Ext.Panel({
- id: 'playlistView',
- frame: true,
- labelAlign: 'left',
- layout: 'column',
- items: [{
- columnWidth: 0.6,
- layout: 'fit',
- items: {
- xtype: 'grid',
- id: 'playlistEntries',
- viewConfig: {
- forceFit: true,
- autoFill : true
- },
- store: dataStore,
- cm: colModel,
- selModel: new Ext.grid.RowSelectionModel({
- singleSelect: true,
- listeners: {
- rowselect: function(sm, row, rec) {
- // nothing to do
- },
- rowdeselect: function(sm, row, rec) {
- // nothing to do
- }
- }
- }),
- autoSizeColumns: true,
- enableColLock: false,
- tbar: tbar,
- stripeRows: true,
- plugins: [dd]
- }
- },{
- columnWidth: 0.4,
- items: [
- playlistForm,
- {
- xtype: 'panel',
- bodyStyle: 'padding:0 35px;',
- html: '<a id="xspfLink" href="' + contextPath + '" class="x-form-item">xspf playlist</a>'
- }
- ]
- }],
- renderTo: Ext.getBody()
- });
-
- grid = Ext.getCmp('playlistEntries');
-
- var xspfLink = Ext.get('xspfLink');
- xspfLink.on('click', function() {
- Ext.Msg.show({
- title : 'xspf playlist',
- msg : 'xspf playlist',
- buttons: Ext.Msg.OK,
- minWidth: 400,
- prompt: true,
- value: this.dom.href + '/playlists' + playlist.handle + '.xspf'
- });
- Ext.Msg.getDialog().focusEl.dom.select();
- }, xspfLink, {stopEvent:true});
-
- dd.on('beforerowmove', function(dropTarget, i1, i2){
- if (i2 > i1 && i2 == grid.store.data.length - 1) return false;
- Ext.Ajax.request({
- method: 'post',
- url: contextPath + '/.magnolia/trees/playlists.html',
- params: {
- browseMode: false,
- mgnlCK: (new Date()).getTime(),
- pasteType: 0,
- path: playlist.handle,
- pathClipboard: grid.store.getAt(i1).data['handle'],
- pathSelected: grid.store.getAt(i2 + (i1 < i2 ? 1 : 0)).data['handle'],
- treeAction: 0,
- treeMode: 'snippet'
- }
- });
- });
- grid.getSelectionModel().on('selectionchange', function(sm){
- Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
- Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
- });
-
- container.on('bodyresize', resizeGrid);
- resizeGrid();
-}
-
-function disposePlaylistView(){
- if (!container) return;
- container.un('bodyresize', resizeGrid);
- delete container;
-}
-
-function resizeGrid(){
- playlistView.setWidth(container.body.getWidth(true));
- grid.setHeight(container.body.getHeight(true) - 13);
-};
-
-function performAction(action, sourceNode, destPath){
- Ext.MessageBox.show({
- title: 'Wait',
- msg: 'Adding entries...',
- progressText: 'Loading folder...',
- width: 300,
- progress: true,
- closable: false
- });
- Ext.Ajax.request({
- method: 'post',
- url: contextPath + '/.magnolia/pages/playlistView.html',
- params: {
- command: 'mediaFolder',
- path: destPath
- },
- success: function(r){
- var items = Ext.decode(r.responseText).items;
- var index = 0;
- var addNextEntry = function(){
- if (index == items.length){
- Ext.MessageBox.updateProgress(1, 'All entries added!');
- (function(){
- Ext.MessageBox.hide();
- parent.openPlaylist(playlist.handle);
- }).defer(1500);
- }
- else{
- Ext.Ajax.request({
- form: 'addEntryForm',
- params: {
- mgnlPath: playlist.handle,
- media: items[index]
- },
- success: function(){
- var p = (index + 1) / items.length;
- Ext.MessageBox.updateProgress(p, parseInt(p * 100, 10) + '% completed');
- index++;
- addNextEntry();
- }
- });
- }
- };
- addNextEntry();
- }
- });
-}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-06-17 19:03:03 UTC (rev 2662)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-06-17 19:09:09 UTC (rev 2663)
@@ -112,6 +112,14 @@
playlist.entries.addMany=Add entries
playlist.entries.remove=Remove entry
playlist.media.edit=Edit media
+playlist.xspf.export=XSPF playlist
+playlist.saved=Playlist successfully saved
+playlist.cantsave=Can''t save the playlist
+playlist.details.header=Playlist details
+playlist.details.description=Title
+playlist.details.description=Description
+playlist.save=Save
+playlist.folder.added=All entries added!
config.search.filters.locale=Locale
config.search.filters.text=Text
@@ -125,3 +133,4 @@
config.search.filters.options.all=All
config.search.filters.options.published=Published
config.search.filters.options.notpublished=Not published
+
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-06-17 19:03:03 UTC (rev 2662)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-06-17 19:09:09 UTC (rev 2663)
@@ -115,6 +115,14 @@
playlist.entries.addMany=Aggiungi elementi
playlist.entries.remove=Rimuovi elemento
playlist.media.edit=Modifica media
+playlist.xspf.export=Playlist in formato XSPF
+playlist.saved=Playlist salvata correttamente
+playlist.cantsave=Impossibile salvare la playlist
+playlist.details.header=Dettagli Playlist
+playlist.details.description=Titolo
+playlist.details.description=Descrizione
+playlist.save=Salva
+playlist.folder.added=Tutti i media sono stati aggiunti
config.search.filters.locale=Locale
config.search.filters.text=Testo
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-06-17 19:03:03 UTC (rev 2662)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-06-17 19:09:09 UTC (rev 2663)
@@ -1,5 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+[#setting url_escaping_charset="UTF-8"]
+[#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/ext/css/ext-all.css" />
@@ -8,10 +9,336 @@
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-base.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-all.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/ext-grid-dd-roworder.js"></script>
- <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/playlist-view.js"></script>
<script type="text/javascript">
// <![CDATA[
var contextPath = '${this.request.contextPath}';
+
+var playlist, container, playlistView, grid;
+
+function initPlaylistView(){
+ container = parent.viewport.getComponent('center-panel');
+
+ var dataStore = new Ext.data.SimpleStore({
+ fields: ['thumbnail', 'type', 'title', 'description', 'tags', 'handle', 'mediaHandle', 'mediaDialog']
+ });
+ dataStore.loadData(playlist.entries);
+
+ var colModel = new Ext.grid.ColumnModel([
+ {
+ header: 'Thumbnail',
+ renderer : function(v, p, record){
+ return v ? '<img border="0" alt="" src="' + contextPath + v + '" title="' + record.data['mediaHandle'] + '" />' : '';
+ }
+ },
+ {header: 'Type'},
+ {
+ id: 'title',
+ header: 'Title'
+ },
+ {
+ id: 'description',
+ header: 'Description'
+ },
+ {
+ id: 'tags',
+ header: 'Tags'
+ }
+ ]);
+
+ var tbar = [
+ {
+ text: playlist.msgs.addEntry,
+ icon: contextPath + '/.resources/media/icons/ico16-add.png',
+ iconCls: 'button-add',
+ handler: function(){
+ //parent.openWindow('.magnolia/dialogs/playlistentry.html?mgnlPath=' + playlist.handle + '&mgnlRepository=playlists');
+ var mgnlWin = parent.parent;
+ mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
+ Ext.Ajax.request({
+ form: 'addEntryForm',
+ params: {
+ mgnlPath: playlist.handle,
+ media: uuid
+ },
+ success: function(){
+ parent.openPlaylist(playlist.handle);
+ },
+ failure: function(){
+ // todo
+ }
+ });
+ };
+ mgnlWin.mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=media&selectMedia=true&mgnlCK=' + mgnlWin.mgnlGetCacheKiller(), 800, 500);
+ }
+ },
+ {
+ text: playlist.msgs.addEntries,
+ icon: contextPath + '/.resources/media/icons/ico16-addmany.png',
+ iconCls: 'button-addmany',
+ handler: function(){
+ var mgnlWin = parent.parent;
+ parent.openWindow(".magnolia/pages/mediaFolderSelection.html?parentFrame=playlistView&action=addEntries&mgnlCK=" + mgnlWin.mgnlGetCacheKiller());
+ }
+ },
+ {
+ id: 'removeEntryBtn',
+ text: playlist.msgs.removeEntry,
+ icon: contextPath + '/.resources/media/icons/ico16-remove.png',
+ iconCls: 'button-remove',
+ disabled: true,
+ handler: function(){
+ Ext.MessageBox.confirm('Confirm', 'Are you sure?', function(btn){
+ if (btn != 'yes') return;
+ var s = grid.getSelectionModel().getSelections();
+ for(var i = 0, r; r = s[i]; i++){
+ removeEntry(r);
+ }
+ });
+ }
+ },
+ {
+ id: 'editMediaBtn',
+ text: playlist.msgs.editMedia,
+ icon: contextPath + '/.resources/media/icons/ico16-edit.png',
+ iconCls: 'button-edit',
+ disabled: true,
+ handler: function(){
+ var s = grid.getSelectionModel().getSelections();
+ parent.openWindow('.magnolia/dialogs/' + s[0].data['mediaDialog'] + '.html'
+ + '?mgnlPath=' + s[0].data['mediaHandle']
+ + '&mgnlRepository=media');
+ }
+ }
+ ];
+
+ function removeEntry(r){
+ Ext.Ajax.request({
+ method: 'post',
+ url: contextPath + '/.magnolia/trees/playlists.html',
+ params: {
+ browseMode: false,
+ deleteNode: r.data['handle'].match(/\/?([^\/]+)$/)[1],
+ mgnlCK: (new Date()).getTime(),
+ path: playlist.handle,
+ treeMode: 'snippet'
+ },
+ success: function(){
+ grid.store.remove(r);
+ }
+ });
+ }
+
+ var dd = new Ext.ux.dd.GridDragDropRowOrder({});
+
+ var playlistForm = new Ext.FormPanel({
+ items: {
+ xtype: 'fieldset',
+ labelWidth: 90,
+ title: '${this.msgs.get('playlist.details.header')?js_string}',
+ defaults: {width: 140}, // Default config options for child items
+ defaultType: 'textfield',
+ autoHeight: true,
+ bodyStyle: Ext.isIE ? 'padding:0 0 5px 15px;' : 'padding:10px 15px;',
+ border: false,
+ style: {
+ "margin-left": "10px", // when you add custom margin in IE 6...
+ "margin-right": Ext.isIE6 ? (Ext.isStrict ? "-10px" : "-13px") : "0" // you have to adjust for it somewhere else
+ },
+ items: [{
+ xtype: 'hidden',
+ name: 'command',
+ value: 'save'
+ }, {
+ xtype: 'hidden',
+ name: 'mgnlCK',
+ value: (new Date()).getTime()
+ }, {
+ xtype: 'hidden',
+ name: 'path',
+ value: playlist.handle
+ }, {
+ fieldLabel: '${this.msgs.get('playlist.details.title')?js_string}',
+ name: 'title',
+ value: playlist.title,
+ anchor: '100% none'
+ }, {
+ xtype: 'textarea',
+ fieldLabel: '${this.msgs.get('playlist.details.description')?js_string}',
+ name: 'description',
+ value: playlist.description,
+ anchor: '100% none'
+ }],
+ buttons: [{
+ text: '${this.msgs.get('playlist.save')?js_string}',
+ handler: function(){
+ if(playlistForm.getForm().isValid()){
+ playlistForm.getForm().submit({
+ url: contextPath + '/.magnolia/pages/playlistView.html',
+ success: function(){
+ Ext.Msg.alert('', '${this.msgs.get('playlist.saved')?js_string}');
+ },
+ failure: function(){
+ Ext.Msg.alert('', '${this.msgs.get('playlist.cantsave')?js_string}');
+ }
+ });
+ }
+ }
+ }]
+ }
+ });
+
+ playlistView = new Ext.Panel({
+ id: 'playlistView',
+ frame: true,
+ labelAlign: 'left',
+ layout: 'column',
+ items: [{
+ columnWidth: 0.6,
+ layout: 'fit',
+ items: {
+ xtype: 'grid',
+ id: 'playlistEntries',
+ viewConfig: {
+ forceFit: true,
+ autoFill : true
+ },
+ store: dataStore,
+ cm: colModel,
+ selModel: new Ext.grid.RowSelectionModel({
+ singleSelect: true,
+ listeners: {
+ rowselect: function(sm, row, rec) {
+ // nothing to do
+ },
+ rowdeselect: function(sm, row, rec) {
+ // nothing to do
+ }
+ }
+ }),
+ autoSizeColumns: true,
+ enableColLock: false,
+ tbar: tbar,
+ stripeRows: true,
+ plugins: [dd]
+ }
+ },{
+ columnWidth: 0.4,
+ items: [
+ playlistForm,
+ {
+ xtype: 'panel',
+ bodyStyle: 'padding:0 35px;',
+ html: '<a id="xspfLink" href="${mgnlEl.baseUrl()}' + '/playlists' + playlist.handle + '.xml' + '" class="x-form-item">${this.msgs.get('playlist.xspf.export')}</a>'
+ },
+ {
+ xtype: 'panel',
+ bodyStyle: 'padding:0 35px;',
+ html: '<input id="xspfLinkBox" class="hidden" value="${mgnlEl.baseUrl()}' + '/playlists' + playlist.handle + '.xspf' + '" class="x-form-item" readonly="readonly"/>'
+ }
+ ]
+ }],
+ renderTo: Ext.getBody()
+ });
+
+ grid = Ext.getCmp('playlistEntries');
+
+ var xspfLink = Ext.get('xspfLink');
+ xspfLink.on('click', function() {
+ Ext.get('xspfLinkBox').toggleClass('hidden');
+ Ext.get('xspfLinkBox').dom.select();
+ }, xspfLink, {stopEvent:true});
+
+ dd.on('beforerowmove', function(dropTarget, i1, i2){
+ if (i2 > i1 && i2 == grid.store.data.length - 1) return false;
+ Ext.Ajax.request({
+ method: 'post',
+ url: contextPath + '/.magnolia/trees/playlists.html',
+ params: {
+ browseMode: false,
+ mgnlCK: (new Date()).getTime(),
+ pasteType: 0,
+ path: playlist.handle,
+ pathClipboard: grid.store.getAt(i1).data['handle'],
+ pathSelected: grid.store.getAt(i2 + (i1 < i2 ? 1 : 0)).data['handle'],
+ treeAction: 0,
+ treeMode: 'snippet'
+ }
+ });
+ });
+ grid.getSelectionModel().on('selectionchange', function(sm){
+ Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
+ Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
+ });
+
+ container.on('bodyresize', resizeGrid);
+ resizeGrid();
+}
+
+function disposePlaylistView(){
+ if (!container) return;
+ container.un('bodyresize', resizeGrid);
+ delete container;
+}
+
+function resizeGrid(){
+ playlistView.setWidth(container.body.getWidth(true));
+ grid.setHeight(container.body.getHeight(true) - 13);
+};
+
+function performAction(action, sourceNode, destPath){
+ Ext.MessageBox.show({
+ title: 'Wait',
+ msg: 'Adding entries...',
+ progressText: 'Loading folder...',
+ width: 300,
+ progress: true,
+ closable: false
+ });
+ Ext.Ajax.request({
+ method: 'post',
+ url: contextPath + '/.magnolia/pages/playlistView.html',
+ params: {
+ command: 'mediaFolder',
+ path: destPath
+ },
+ success: function(r){
+ var items = Ext.decode(r.responseText).items;
+ var index = 0;
+ var addNextEntry = function(){
+ if (index == items.length){
+ Ext.MessageBox.updateProgress(1, '${this.msgs.get('playlist.folder.added')?js_string}');
+ (function(){
+ Ext.MessageBox.hide();
+ parent.openPlaylist(playlist.handle);
+ }).defer(1500);
+ }
+ else{
+ Ext.Ajax.request({
+ form: 'addEntryForm',
+ params: {
+ mgnlPath: playlist.handle,
+ media: items[index]
+ },
+ success: function(){
+ var p = (index + 1) / items.length;
+ Ext.MessageBox.updateProgress(p, parseInt(p * 100, 10) + '% completed');
+ index++;
+ addNextEntry();
+ }
+ });
+ }
+ };
+ addNextEntry();
+ }
+ });
+}
+
+
+
+
+
+
+
Ext.onReady(function(){
[#if this.playlist?exists]
playlist = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-29 16:58:24
|
Revision: 2731
http://openutils.svn.sourceforge.net/openutils/?rev=2731&view=rev
Author: diego_schivo
Date: 2010-06-29 16:58:17 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
MEDIA-145 refactoring
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-06-29 16:41:46 UTC (rev 2730)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-06-29 16:58:17 UTC (rev 2731)
@@ -1,9 +1,13 @@
var MediaFolderView = new Class({
- initialize: function(){
+ Implements: Options,
+
+ initialize: function(options){
+ this.setOptions(options);
if (Browser.Engine.name == 'trident' && Browser.Engine.version == 4) this.fixNavWidthIE6();
else this.fixNavWidth();
new MediaFolderView.BgSelectors('#navigation a.bg-selector');
+ new MediaFolderView.Sorting('sorting', this.options);
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
},
@@ -56,6 +60,22 @@
});
+MediaFolderView.Sorting = new Class({
+
+ Implements: Options,
+
+ initialize: function(select, options){
+ this.select = $(select);
+ this.setOptions(options)
+ this.select.addEvent('change', this.handleSelectChange.bind(this));
+ },
+
+ handleSelectChange: function(){
+ location.href = '?type=' + this.options.type + '&path=' + this.options.path + '&sorting=' + this.select.get('value');
+ }
+
+});
+
MediaFolderView.EditMenus = new Class({
initialize: function(triggers){
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-29 16:41:46 UTC (rev 2730)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-29 16:58:17 UTC (rev 2731)
@@ -104,7 +104,10 @@
});
*/
- new MediaFolderView();
+ new MediaFolderView({
+ type: '${this.type}',
+ path: '${this.path!?url!''}'
+ });
[#if message?exists]
alert("${message?js_string}");
@@ -144,7 +147,7 @@
</div>
<div id="sortingblock">
<div class="voice right" style="padding-top: 3px;">
- <select name="sorting" onchange="location.href = '?type=${this.type}&path=${this.path!?url!''}&sorting=' + this.options[this.selectedIndex].value">
+ <select id="sorting" name="sorting">
<option value=""[#if this.sorting == ''] selected="selected"[/#if]>- order by -</option>
<option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>Title</option>
</select>
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