4 files changed, 37 insertions, 5 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 23032ab3..9ef6f8c1 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,8 +22,34 @@ class Admin_Users_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->page_title = t("Users and groups");
     $view->content = new View("admin_users.html");
-    $view->content->users = ORM::factory("user")->order_by("name", "ASC")->find_all();
+
+    // @todo: add this as a config option
+    $page_size = module::get_var("user", "page_size", 10);
+    $page = Input::instance()->get("page", "1");
+    $builder = db::build();
+    $user_count = $builder->from("users")->count_records();
+
+    $view->content->pager = new Pagination();
+    $view->content->pager->initialize(
+      array("query_string" => "page",
+            "total_items" => $user_count,
+            "items_per_page" => $page_size,
+            "style" => "classic"));
+
+    // Make sure that the page references a valid offset
+    if ($page < 1) {
+      url::redirect(url::merge(array("page" => 1)));
+    } else if ($page > $view->content->pager->total_pages) {
+      url::redirect(url::merge(array("page" => $view->content->pager->total_pages)));
+    }
+
+    // Join our users against the items table so that we can get a count of their items
+    // in the same query.
+    $view->content->users = ORM::factory("user")
+      ->order_by("users.name", "ASC")
+      ->find_all($page_size, $view->content->pager->sql_offset);
     $view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
+
     print $view;
   }
 
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 084eac31..93e3d02e 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -12,6 +12,7 @@
 
 #g-user-admin {
   width: auto;
+  margin-bottom: 4em;
 }
 
 #g-group-admin {
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 5a7161ed..70e96f70 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -19,12 +19,12 @@
  */
 class user_theme_Core {
   static function head($theme) {
-    $theme->css("user.css");
-    $theme->script("password_strength.js");
+    return $theme->css("user.css")
+      . $theme->script("password_strength.js");
   }
 
   static function admin_head($theme) {
-    $theme->css("user.css");
-    $theme->script("password_strength.js");
+    return $theme->css("user.css")
+      . $theme->script("password_strength.js");
   }
 }
 \ No newline at end of file
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index f067cae8..a7bd6b27 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -108,6 +108,11 @@
           </tr>
           <? endforeach ?>
         </table>
+
+        <div class="g-paginator">
+          <?= $pager ?>
+        </div>
+
       </div>
     </div>