diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-08-27 20:56:03 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-08-27 20:56:03 -0700 |
| commit | 084c2717c0ddff6c5caa79c62abb3cdb9b4aea31 (patch) | |
| tree | af0fc03f042d11715cbbb3d137390d7df706ec3c /modules/user/views | |
| parent | dc21cf36b606048dc24532407d39bc8f5b4211fa (diff) | |
| parent | 246f5b59cb0e525a5ff6eaffce6b13e9af7e70b2 (diff) | |
Merge branch 'master' into bharat_dev
Diffstat (limited to 'modules/user/views')
| -rw-r--r-- | modules/user/views/admin_users.html.php | 2 | ||||
| -rw-r--r-- | modules/user/views/admin_users_group.html.php | 2 | ||||
| -rw-r--r-- | modules/user/views/reset_password.html.php | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index a7bd6b27..033c9dae 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -110,7 +110,7 @@ </table> <div class="g-paginator"> - <?= $pager ?> + <?= $theme->paginator() ?> </div> </div> diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php index 2362e42b..31b91351 100644 --- a/modules/user/views/admin_users_group.html.php +++ b/modules/user/views/admin_users_group.html.php @@ -17,7 +17,7 @@ <? if ($group->users->count_all() > 0): ?> <ul class="g-member-list"> - <? foreach ($group->users->find_all() as $i => $user): ?> + <? foreach ($group->users->order_by("name", "ASC")->find_all() as $i => $user): ?> <li class="g-user"> <?= html::clean($user->name) ?> <? if (!$group->special): ?> diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php index 3afca881..d939ad42 100644 --- a/modules/user/views/reset_password.html.php +++ b/modules/user/views/reset_password.html.php @@ -9,8 +9,9 @@ <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?> </p> <p> - <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>. If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>. If you didn't request this password reset, it's ok to ignore this mail.", - array("site_url" => html::mark_clean(url::base(false, "http")), + <?= t("We received a request to reset your password for <a href=\"%site_url\">%base_url</a>. If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>. If you didn't request this password reset, it's ok to ignore this mail.", + array("site_url" => html::mark_clean(url::abs_site("/")), + "base_url" => html::mark_clean(url::base(false)), "confirm_url" => $confirm_url)) ?> </p> </body> |