Use url:site() on add user link, change user list from class to id to make it unique, changed gFirstRow to gHeaderRow to make more semantically meaningful. Fixed closing span that I broke after Bharat fixed it last night.

1 files changed, 25 insertions, 18 deletions

diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index ab04b164..0b84cf5b 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -1,6 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="gBlock">
-	<a href="users/add_form" class="gDialogLink gButtonLink right"
+	<a href="<?= url::site("admin/users/add_form") ?>"
+      class="gDialogLink gButtonLink right"
       title="<?= t("Create a new user") ?>">
   	+ <?= t("Add a new user") ?>
 	</a>
@@ -10,46 +11,52 @@
 	</h2>
 	
   <div class="gBlockContent">
-    <ul class="gUserAdminList">
-      <li class="gFirstRow">
-    	<strong><?= t("Username") ?></strong> <?= t("(Full name)") ?>
-	<span class="understate"><?= t("last login") ?></span>
+    <ul id="gUserAdminList">
+      <li class="gHeaderRow">
+    	  <strong><?= t("Username") ?></strong> <?= t("(Full name)") ?>
+	      <span class="understate"><?= t("last login") ?></span>
       </li>
 
       <? foreach ($users as $i => $user): ?>
       <li class="<?= text::alternate("gOddRow", "gEvenRow") ?>">
         <img src="<?= $theme->url("images/avatar.jpg") ?>"
-          title="<?= t("Drag user onto group below to add as a new member") ?>"
-          alt="<?= $user->name ?>" 
-          width="20"
-          height="20" />
+            title="<?= t("Drag user onto group below to add as a new member") ?>"
+            alt="<?= $user->name ?>"
+            width="20"
+            height="20" />
         <strong><?= $user->name ?></strong>
         (<?= $user->full_name ?>)
         <span class="understate">
           <?= ($user->last_login == 0) ? "" : date("m j, y", $user->last_login) ?>
         </span>
-        <span class="gactions">
+        <span class="gActions">
           <a href="users/edit_form/<?= $user->id ?>" class="gPanelLink"><?= t("edit") ?></a>
-          <? if (user::active()->id != $user->id && !$user->guest): ?>
+        <? if (user::active()->id != $user->id && !$user->guest): ?>
           <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"><?= t("delete") ?></a>
-          <? else: ?>
+        <? else: ?>
           <span class="inactive" title="<?= t("This user can't be deleted") ?>">
             <?= t("delete") ?>
           </span>
         <? endif ?>
+        </span>
       </li>
       <? endforeach ?>
     </ul>
-    <br />
-    <a href="<?= url::site("admin/users/add_form") ?>" class="gDialogLink gButtonLink"
-       title="<?= t("Create a new user") ?>">
-      + <?= t("Add a new user") ?>
-    </a>
+    <p>
+      <a href="<?= url::site("admin/users/add_form") ?>"
+         class="gDialogLink gButtonLink"
+         title="<?= t("Create a new user") ?>">
+        + <?= t("Add a new user") ?>
+      </a>
+    </p>
+    
   </div>
 </div>
 
 <div id="gGroupAdmin" class="gBlock">
-  <a href="groups/add_form" title="<?= t("Create a new group") ?>" class="gDialogLink gButtonLink right">
+  <a href="groups/add_form"
+      class="gDialogLink gButtonLink right" 
+      title="<?= t("Create a new group") ?>">
   	+ <?= t("Add a new group") ?>
 	</a>