Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3031] trunk/openutils-mgnlmedia/src/main
|
From: <fg...@us...> - 2010-09-10 14:59:53
|
Revision: 3031
http://openutils.svn.sourceforge.net/openutils/?rev=3031&view=rev
Author: fgiust
Date: 2010-09-10 14:59:47 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-167 new paginator (and toolbar) layout
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
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
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:59:47 UTC (rev 3031)
@@ -73,37 +73,37 @@
{
/**
- *
+ *
*/
public static final String SORT_BY_NAME = "name";
/**
- *
+ *
*/
public static final String SORT_BY_CREATIONDATE = "creationdate";
/**
- *
+ *
*/
public static final String SORT_BY_FILENAME = "filename";
/**
- *
+ *
*/
public static final String SORT_BY_MODIFICATIONDATE = "modificationdate";
/**
- *
+ *
*/
public static final String SORT_BY_SCORE = "score";
/**
- *
+ *
*/
public static final String SORT_BY_TITLE = "title";
/**
- *
+ *
*/
public static final String SORT_BY_USAGE = "usage";
@@ -282,7 +282,7 @@
// casts Iterator<AdvancedResultItem> to Iterator<Content>
Iterator<Content> contentIterator = Iterators.filter(searchResult.getItems(), Content.class);
medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc));
- pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 5, "page");
+ pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 10, "page");
}
if (medias == null)
{
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-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 14:59:47 UTC (rev 3031)
@@ -14,9 +14,21 @@
width: 100%;
float: left;
line-height: 30px;
- background: #E4F5C9 url(images/toolbar-background.png) repeat-x bottom left;
+ min-height: 56px;
+ background: #E4F5C9 url(images/toolbar-background-light.png) repeat-x top left;
}
+.tabsrow1 {
+ height: 28px;
+ background: #E4F5C9 url(images/toolbar-background.png) repeat-x top left;
+}
+
+.tabsrow2 {
+ display: block;
+ clear: both;
+ height: 30px;
+}
+
.separator {
color: #fff;
font-size: 1.3em;
@@ -88,6 +100,7 @@
#navigation select#sorting {
width: 150px;
+ visibility: hidden;
}
.voice a,.voice a:visited,.voice a:hover {
@@ -123,15 +136,17 @@
.paging {
border-collapse: collapse;
- margin: 10px auto 0;
+ margin: 6px 20px 0 0;
}
.paging td {
padding: 0;
- border: 1px solid #999;
+ border: 2px solid #c9e090;
width: 16px;
+ height: 18px;
text-align: center;
background-color: #fff;
+ text-align: center;
}
.paging td a,.paging td a:visited {
@@ -165,10 +180,19 @@
color: #FFFFFF;
}
-.paging .page-active-false a,.paging .page-active-false a:visited {
- color: #CCCCCC;
+.paging .page-first,.paging .page-previous,.paging .page-next,.paging .page-last {
+ background-color: #afcd66;
}
+.paging .page-first a,.paging .page-previous a,.paging .page-next a,.paging .page-last a {
+ color: #fff !important;
+ font-weight: normal;
+}
+
+.pagincontainer {
+ float: right;
+}
+
.mediaList {
list-style: none;
margin: 0;
@@ -343,7 +367,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
div.sexy-tooltip {
@@ -366,7 +390,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;
@@ -411,4 +435,9 @@
ul.mediamenu li,ul.mediamenu li a {
height: 20px;
cursor: pointer;
+}
+
+#scrollablecontent {
+ overflow-y: scroll;
+ height: 300px;
}
\ 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-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-10 14:59:47 UTC (rev 3031)
@@ -291,7 +291,7 @@
<iframe id="advancedSearchView" name="advancedSearchView" class="x-panel-body"
src="" style="width:100%; height:100%; border:0 none; margin:0; padding:0; overflow:auto;" frameborder="0" scrolling="no"></iframe>
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
- style="width:100%; height:100%; border:0 none; overflow:auto;" frameborder="0" scrolling="auto"></iframe>
+ style="width:100%; height:100%; border:0 none; overflow:hidden;" frameborder="0" scrolling="no"></iframe>
<div id="formDiv" style="display:none">
<form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
<input type="hidden" name="command" value="saveZip" />
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-09-10 14:55:38 UTC (rev 3030)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:59:47 UTC (rev 3031)
@@ -350,6 +350,31 @@
</form>
<div id="navigation">
+
+
+
+
+ <div class="tabsrow1">
+ [#list this.types as type]
+ [#if type.name == this.type]
+ [#assign actual = "actual"]
+ [#else]
+ [#assign actual = ""]
+ [/#if]
+ <div class="voice mediatab ${actual}">
+ <a href="${this.mediatabLink(type)}">
+ <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>
+ [/#list]
+ </div>
+
+
+ <div class="tabsrow2">
+
+
+
<div id="bgselectorblock">
<div class="voice right">
<a name="bg-black" href="#" class="bg-selector black [#if this.bgSelector == 'black']black-active[/#if]" title="${this.msgs.get('media.bgselector.black')}"><!-- --></a>
@@ -380,35 +405,32 @@
</select>
</div>
</div>
- [#list this.types as type]
- [#if type.name == this.type]
- [#assign actual = "actual"]
- [#else]
- [#assign actual = ""]
+
+
+ [#if this.pages?has_content && this.pages?size > 5]
+ <div class="pagincontainer">
+ <table class="paging">
+ <tr>
+ [#list this.pages as page]
+ <td class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
+ <a href="${page.url}">${page.label}</a>
+ </td>
+ [/#list]
+ </tr>
+ </table>
+ </div>
[/#if]
- <div class="voice mediatab ${actual}">
- <a href="${this.mediatabLink(type)}">
- <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>
- [/#list]
+
+
</div>
- [#if this.pages?has_content && this.pages?size > 5]
- <div style="clear: left;">
- <table class="paging">
- <tr>
- [#list this.pages as page]
- <td class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
- <a href="${page.url}">${page.label}</a>
- </td>
- [/#list]
- </tr>
- </table>
- </div>
- [/#if]
+ <div style="clear:both; height: 1px"><!-- --></div>
+ <div id="scrollablecontent">
<ul class="mediaList">
[#assign index = 0]
[#list this.medias as media]
@@ -588,5 +610,7 @@
</li>
[/#list]
</ul>
+ </div>
+
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
