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

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

Revision: 2728
          http://openutils.svn.sourceforge.net/openutils/?rev=2728&view=rev
Author:   diego_schivo
Date:     2010-06-29 15:59:47 +0000 (Tue, 29 Jun 2010)

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

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    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-06-29 15:28:18 UTC (rev 2727)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-29 15:59:47 UTC (rev 2728)
@@ -33,12 +33,15 @@
 import info.magnolia.context.Context;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.admininterface.commands.ActivationCommand;
+import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
+import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import javax.jcr.RepositoryException;
@@ -114,6 +117,10 @@
 
     protected String search;
 
+    private List<Page> pages;
+
+    private int page;
+
     /**
      * @param name
      * @param request
@@ -162,6 +169,11 @@
             sorting = SORT_BY_MODIFICATIONDATE;
         }
 
+        if (page <= 0)
+        {
+            page = 1;
+        }
+
         develop = SystemProperty.getBooleanProperty("magnolia.develop");
     }
 
@@ -212,8 +224,9 @@
                     null,
                     true,
                     sorting,
-                    0,
-                    -1);
+                    page - 1,
+                    5);
+                pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
             }
             catch (RepositoryException ex)
             {
@@ -754,6 +767,33 @@
         this.search = search;
     }
 
+    /**
+     * Returns the pages.
+     * @return the pages
+     */
+    public List<Page> getPages()
+    {
+        return pages;
+    }
+
+    /**
+     * Returns the page.
+     * @return the page
+     */
+    public int getPage()
+    {
+        return page;
+    }
+
+    /**
+     * Sets the page.
+     * @param page the page to set
+     */
+    public void setPage(int page)
+    {
+        this.page = page;
+    }
+
     public boolean isSingleInstance()
     {
         return MediaEl.module().isSingleinstance();

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:28:18 UTC (rev 2727)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-06-29 15:59:47 UTC (rev 2728)
@@ -162,6 +162,15 @@
       </div>
       [/#list]
     </div>
+
+  <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>
+    [/#list]
+  </ul>
+
     <ul class="mediaList">
       [#assign index = 0]
       [#list this.medias as media]


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