3 files changed, 10 insertions, 28 deletions
diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php
deleted file mode 100644
index c1b7dbde..00000000
--- a/modules/user/views/admin_groups.html.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="gBlock">
-  <h2><?= t("Group Administration") ?></h2>
-  <div class="gBlockContent">
-    <p><?= t("These are the groups in your system") ?></p>
-  </div>
-  <ul>
-    <? foreach ($groups as $i => $group): ?>
-    <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
-      <?= $group->name ?>
-      <a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink"
-        title="<?= t("Edit group") ?>"><?= t("edit") ?></a>
-      <? if (!$group->special): ?>
-        <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink"
-          title="<?= t("Do you really want to delete %group_name", array("group_name" => $group->name)) ?>">
-        <?= t("delete") ?></a>
-      <? endif ?>
-    </li>
-    <? endforeach ?>
-    <li><a href="groups/add_form" class="gDialogLink"
-      title="<?= t("Add group") ?>"><?= t("Add group") ?></a></li>
-  </ul>
-</div>
-
-
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 57e0864f..72ad0fcd 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -73,9 +73,9 @@
           <?= ($user->last_login == 0) ? "" : date("m j, y", $user->last_login) ?>
         </span>
         <span class="gActions">
-          <a href="users/edit_form/<?= $user->id ?>" class="gPanelLink"><?= t("edit") ?></a>
+          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>" class="gPanelLink"><?= t("edit") ?></a>
           <? if (user::active()->id != $user->id && !$user->guest): ?>
-          <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"><?= t("delete") ?></a>
+          <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>" class="gDialogLink"><?= t("delete") ?></a>
           <? else: ?>
           <span class="inactive" title="<?= t("This user cannot be deleted") ?>">
             <?= t("delete") ?>
@@ -96,7 +96,7 @@
 </div>
 
 <div id="gGroupAdmin" class="gBlock">
-  <a href="groups/add_form"
+  <a href="<?= url::site("admin/users/add_group_form") ?>"
      class="gDialogLink gButtonLink right"
      title="<?= t("Create a new group") ?>">
     + <?= t("Add a new group") ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 1d6c127d..66ad9a78 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -1,4 +1,11 @@
 <strong><?= $group->name?></strong>
+<? if (!$group->special): ?>
+<a href="<?= url::site("users/delete_group_form/$group->id") ?>" class="gDialogLink"><?= t("delete") ?></a>
+<? else: ?>
+<span class="inactive" title="<?= t("This group cannot be deleted") ?>">
+  <?= t("delete") ?>
+</span>
+<? endif ?>
 <ul>
   <? foreach ($group->users as $i => $user): ?>
   <li class="gUser">