[Openutils-svn] SF.net SVN: openutils:[2729] trunk/openutils-mgnlmedia/src/main

[<die...@us...>]

Revision: 2729
          http://openutils.svn.sourceforge.net/openutils/?rev=2729&view=rev
Author:   diego_schivo
Date:     2010-06-29 16:36:28 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
MEDIA-145 paging

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
    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/MediaFolderViewPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-29 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-29 16:36:28 UTC (rev 2729)
@@ -406,6 +406,10 @@
         {
             criteria.addOrder(Order.asc("@title"));
         }
+        else
+        {
+            criteria.addOrder(Order.asc("@jcr:created"));
+        }
         if (pageSize > 0)
         {
             criteria.setFirstResult(pageIndex * pageSize);

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-06-29 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-29 16:36:28 UTC (rev 2729)
@@ -51,6 +51,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -241,12 +243,13 @@
             typeResult = MediaConfigurationManager.getInstance().find(null, type, search, false, sorting, 0, -1);
         }
 
-        if (typeResult != null && typeResult.getItems().hasNext())
+        medias = null;
+        if (typeResult != null)
         {
-            Iterator<MediaBean> it = Iterators.transform(typeResult.getItems(), new MediaBeanBuilder(mtc));
-            medias = Lists.newArrayList(it);
+            ResultIterator<AdvancedResultItem> items = typeResult.getItems();
+            medias = Lists.newArrayList(Iterators.transform(items, new MediaBeanBuilder(mtc)));
         }
-        else
+        if (medias == null)
         {
             medias = CollectionUtils.EMPTY_COLLECTION;
         }

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-06-29 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css	2010-06-29 16:36:28 UTC (rev 2729)
@@ -113,6 +113,49 @@
   color: #000;
 }
 
+.paging {
+  clear: left;
+  list-style: none outside none;
+  display: block;
+  height: 24px;
+  padding: 10px 0 0 10px;
+}
+
+.paging .page-current-true {
+  background-color: #006699;
+  font-weight: bold;
+}
+
+.paging li.page-active-false {
+  background-color: #EEEEEE;
+  font-weight: normal;
+}
+
+.paging li.page-active-false a,.paging li.page-active-false a:visited {
+  color: #CCCCCC;
+}
+
+.paging .page-current-true a,.paging .page-current-true a:visited {
+  color: #FFFFFF;
+}
+
+.paging li {
+  background-color: #EEEEEE;
+  float: left;
+  height: 24px;
+  margin: 1px;
+  text-align: center;
+  width: 24px;
+}
+
+.paging li a {
+  display: block;
+  padding-top: 5px;
+  text-decoration: none;
+  vertical-align: middle;
+  width: 24px;
+}
+
 .mediaList {
   list-style: none;
   margin: 0;

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 15:59:47 UTC (rev 2728)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-06-29 16:36:28 UTC (rev 2729)
@@ -163,13 +163,15 @@
       [/#list]
     </div>
 
+  [#if this.pages?size > 5]
   <ul class="paging">
     [#list this.pages as page]
-      <li class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
-        <a href="${page.url}">${page.label}</a>
-      </li>
+    <li class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}">
+      <a href="${page.url}">${page.label}</a>
+    </li>
     [/#list]
   </ul>
+  [/#if]
 
     <ul class="mediaList">
       [#assign index = 0]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.