Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1298] trunk/openutils-mgnlmedia/src/main/resources
|
From: <mol...@us...> - 2009-08-24 14:53:10
|
Revision: 1298
http://openutils.svn.sourceforge.net/openutils/?rev=1298&view=rev
Author: molaschi
Date: 2009-08-24 14:52:59 +0000 (Mon, 24 Aug 2009)
Log Message:
-----------
MEDIA-7 show both command buttons and select media link
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 2009-08-24 11:15:58 UTC (rev 1297)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2009-08-24 14:52:59 UTC (rev 1298)
@@ -66,7 +66,7 @@
}
.mediaList li.selectMedia {
- height: 210px;
+ height: 235px;
}
.mediaList li:hover {
@@ -122,6 +122,13 @@
background: transparent url(../../icons/16/indicator_green.gif) no-repeat center left;
}
+.selectMediaLine {
+ /*border-top: dotted 1px #cfcfcf;*/
+ border-bottom: dotted 1px #cfcfcf;
+ margin: 0px 3px 5px 3px;
+ padding: 5px 0 5px 0;
+}
+
.icons {
border-top: dotted 1px #cfcfcf;
border-bottom: dotted 1px #cfcfcf;
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 2009-08-24 11:15:58 UTC (rev 1297)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2009-08-24 14:52:59 UTC (rev 1298)
@@ -13,7 +13,6 @@
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/multibox/multibox.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/multibox/overlay.js"></script>
<script type="text/javascript">
- <![CDATA[
<#list this.types as type> <#if type.name == this.type> <#assign currentType = type> </#if> </#list>
function openDialog(path) {
@@ -84,7 +83,6 @@
});
});
- ]]>
</script>
</head>
<body>
@@ -100,7 +98,9 @@
</#if>
<input type="hidden" name="search" value="${this.search!''}" />
<input type="hidden" name="type" value="${this.type}" />
- <input type="hidden" name="path" value="${this.path}" />
+ <#if this.path?exists>
+ <input type="hidden" name="path" value="${this.path}" />
+ </#if>
</form>
<div id="navigation">
<#list this.types as type>
@@ -157,21 +157,6 @@
</div>
</div>
<div class="icons">
- <#if this.selectMedia>
- <#if media.metaData.activationStatus = 2 || this.develop >
- <a href="javascript:$empty()" onclick="selectMedia('${media.uuid}', '${this.request.contextPath}${media.thumbnailUrl}', '${media.filename}')" title="modifica">
- ${this.msgs.get('media.select')}
- </a>
- <#else>
- <#if media.canPublish && media.metaData.activationStatus < 2>
- <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="pubblica">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
- </a>
- <#else>
- ${this.msgs.get('media.notpublished')}
- </#if>
- </#if>
- </#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" />
@@ -219,7 +204,6 @@
align="middle" />
</a>
</#if>
-<!-- </#if>-->
</div>
<div class="used">
<#if media.usedInWebPages?size = 0>
@@ -232,6 +216,23 @@
<span class="tips" rel="${pages}">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
</#if>
</div>
+ <#if this.selectMedia>
+ <div class="selectMediaLine">
+ <#if media.metaData.activationStatus = 2 || this.develop >
+ <a href="javascript:$empty()" onclick="selectMedia('${media.uuid}', '${this.request.contextPath}${media.thumbnailUrl}', '${media.filename}')" title="modifica">
+ ${this.msgs.get('media.select')}
+ </a>
+ <#else>
+ <#if media.canPublish && media.metaData.activationStatus < 2>
+ <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="pubblica">
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
+ </a>
+ <#else>
+ ${this.msgs.get('media.notpublished')}
+ </#if>
+ </#if>
+ </div>
+ </#if>
<span class="name status${media.metaData.activationStatus}" title="${media.filename}">
<#if this.type != 'youtube'><a href="?command=download&path=${media.handle}">${name}</a>
<#else>${name}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
