Stop using Pagination() and instead use $theme->pager() in views.

Move the pager() function up to Gallery_View and replace
themes/admin_wind/views/pager.html.php (Pagination based) with a
modified version from the wind theme in
themes/admin_wind/views/paginator.html.php.  Fixes #1718.

2 files changed, 88 insertions, 44 deletions

diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
deleted file mode 100644
index 5fff5845..00000000
--- a/themes/admin_wind/views/pager.html.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-paginator">
-  <? /* @todo This message isn't easily localizable */
-     $from_to_msg = t2("Item %from_number of %count",
-                       "Items %from_number - %to_number of %count",
-                       $total_items,
-                       array("from_number" => $current_first_item,
-                             "to_number" => $current_last_item,
-                             "count" => $total_items)) ?>
-  <li>
-  <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
-  <? else: ?>
-    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
-  <? endif ?>
-  <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
-  <? else: ?>
-    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
-  <? endif ?>
-  </li>
-  <li class="g-info"><?= $from_to_msg ?></li>
-  <li class="g-text-right">
-  <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
-  <? else: ?>
-    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
-  <? endif ?>
-  <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
-  <? else: ?>
-    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
-  <? endif ?>
-  </li>
-</ul>
diff --git a/themes/admin_wind/views/paginator.html.php b/themes/admin_wind/views/paginator.html.php
new file mode 100644
index 00000000..3cb0223d
--- /dev/null
+++ b/themes/admin_wind/views/paginator.html.php
@@ -0,0 +1,88 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+// This is a generic paginator for admin collections.  Depending on the page type, there are
+// different sets of variables available.  With this data, you can make a paginator that
+// lets you say "You're viewing photo 5 of 35", or "You're viewing photos 10 - 18 of 37"
+// for album views.
+
+//
+// Available variables for all page types:
+//   $page_type               - "collection", "item", or "other"
+//   $page_subtype            - "album", "movie", "photo", "tag", etc.
+//   $previous_page_url       - the url to the previous page, if there is one
+//   $next_page_url           - the url to the next page, if there is one
+//   $total                   - the total number of photos in this album
+//
+// Available for the "collection" page types:
+//   $page                    - what page number we're on
+//   $max_pages               - the maximum page number
+//   $page_size               - the page size
+//   $first_page_url          - the url to the first page, or null if we're on the first page
+//   $last_page_url           - the url to the last page, or null if we're on the last page
+//   $first_visible_position  - the position number of the first visible photo on this page
+//   $last_visible_position   - the position number of the last visible photo on this page
+//
+// Available for "item" page types:
+//   $position                - the position number of this photo
+//
+?>
+
+<ul class="g-paginator ui-helper-clearfix">
+  <li class="g-first">
+  <? if ($page_type == "collection"): ?>
+    <? if (isset($first_page_url)): ?>
+      <a href="<?= $first_page_url ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
+        <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
+    <? else: ?>
+      <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
+        <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
+    <? endif ?>
+  <? endif ?>
+
+  <? if (isset($previous_page_url)): ?>
+    <a href="<?= $previous_page_url ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
+  <? else: ?>
+    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
+  <? endif ?>
+  </li>
+
+  <li class="g-info">
+    <? if ($total): ?>
+      <? if ($page_type == "collection"): ?>
+        <?= /* @todo This message isn't easily localizable */
+            t2("Viewing %from_number of %count",
+               "Viewing %from_number - %to_number of %count",
+               $total,
+               array("from_number" => $first_visible_position,
+                     "to_number" => $last_visible_position,
+                     "count" => $total)) ?>
+      <? else: ?>
+        <?= t("%position of %total", array("position" => $position, "total" => $total)) ?>
+      <? endif ?>
+    <? else: ?>
+      <?= t("No photos") ?>
+    <? endif ?>
+  </li>
+
+  <li class="g-text-right">
+  <? if (isset($next_page_url)): ?>
+    <a href="<?= $next_page_url ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
+  <? else: ?>
+    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
+  <? endif ?>
+
+  <? if ($page_type == "collection"): ?>
+    <? if (isset($last_page_url)): ?>
+      <a href="<?= $last_page_url ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
+        <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
+    <? else: ?>
+      <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
+        <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
+    <? endif ?>
+  <? endif ?>
+  </li>
+</ul>