Pager for user theme gallery added, closes #175.

zikula · Apr 29, 2012 · 8af6ea4 · 8af6ea4
1 parent 44e5749
commit 8af6ea4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/web/system/ThemeModule/Controller/UserController.php b/web/system/ThemeModule/Controller/UserController.php
@@ -33,15 +33,21 @@ public function indexAction()
             throw new \Zikula\Framework\Exception\ForbiddenException();
         }
 
+        // get our input
+        $startnum = FormUtil::getPassedValue('startnum', isset($args['startnum']) ? $args['startnum'] : 1, 'GET');
+
+        // we need this value multiple times, so we keep it
+        $itemsperpage = $this->getVar('itemsperpage');
+
         // get some use information about our environment
         $currenttheme = ThemeUtil::getInfo(ThemeUtil::getIDFromName(UserUtil::getTheme()));
 
         // get all themes in our environment
-        $themes = ThemeUtil::getAllThemes(ThemeUtil::FILTER_USER);
+        $allthemes = ThemeUtil::getAllThemes(ThemeUtil::FILTER_USER);
 
         $previewthemes = array();
         $currentthemepic = null;
-        foreach ($themes as $themeinfo) {
+        foreach ($allthemes as $key => $themeinfo) {
             $themename = $themeinfo['name'];
             if (file_exists($themepic = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/public/images/preview_medium.png')) {
                 $themeinfo['previewImage'] = $themepic;
@@ -51,19 +57,27 @@ public function indexAction()
                 $themeinfo['previewImage'] = 'system/Theme/Resources/public/images/preview_medium.png';
                 $themeinfo['largeImage'] = 'system/Theme/Resources/public/images/preview_large.png';
             }
-            $previewthemes[$themename] = $themeinfo;
             if ($themename == $currenttheme['name']) {
                 $currentthemepic = $themepic;
+                unset($allthemes[$key]);
+            } else {
+                $previewthemes[$themename] = $themeinfo;
             }
         }
 
+        $previewthemes = array_slice($previewthemes, $startnum-1, $itemsperpage);
+
         $this->view->setCaching(Zikula_View::CACHE_DISABLED);
 
         $this->view->assign('currentthemepic', $currentthemepic)
                    ->assign('currenttheme', $currenttheme)
                    ->assign('themes', $previewthemes)
                    ->assign('defaulttheme', ThemeUtil::getInfo(ThemeUtil::getIDFromName(System::getVar('Default_Theme'))));
 
+        // assign the values for the pager plugin
+        $this->view->assign('pager', array('numitems' => sizeof($allthemes),
+                                           'itemsperpage' => $itemsperpage));
+
         // Return the output that has been generated by this function
         return $this->response($this->view->fetch('theme_user_main.tpl'));
     }

diff --git a/web/system/ThemeModule/Resources/views/theme_user_main.tpl b/web/system/ThemeModule/Resources/views/theme_user_main.tpl
@@ -15,7 +15,6 @@
 <h3>{gt text="Themes list"}</h3>
 <div id="themes_list" class="z-clearfix">
     {foreach from=$themes item=theme}
-    {if $theme.name neq $currenttheme.name and $theme.structure}
     <dl class="theme_item">
         <dt><strong>{$theme.displayname}</strong></dt>
         <dt>
@@ -34,8 +33,9 @@
         <dd><a class="z-icon-es-preview" href="{$themeurl|safetext}">{gt text="Preview theme"}</a></dd>
         <dd><a class="z-icon-es-ok" href="?newtheme={$theme.name}">{gt text="Use theme"}</a></dd>
     </dl>
-    {/if}
     {/foreach}
 </div>
 
+<br />{pager rowcount=$pager.numitems limit=$pager.itemsperpage posvar='startnum'}
+