Fixed a few bugs in the previous check-in.

[cocanwiki.git] / templates / users.html

diff --git a/templates/users.html b/templates/users.html
index b11f8e7..39ab050 100644 (file)
--- a/templates/users.html
+++ b/templates/users.html
@@ -15,10 +15,9 @@
 <li><a href="/_bin/create_user_form.cmo">Create a user account</a></li>
 </ul>
 
-<table id="users">
+<table class="top_table">
 <tr>
-<th rowspan="2"> Username </th>
-<th rowspan="2"> Email address </th>
+<th rowspan="2"> Username, email address </th>
 <th rowspan="2"> Registration </th>
 <th colspan="6"> Permissions </th>
 </tr>
@@ -33,9 +32,13 @@
 
 ::table(users)::
 <tr>
-<td> <a href="/_bin/edit_user_form.cmo?userid=::userid::" title="Modify details, permissions, set password, or delete this user"><strong>::name_html::</strong></a> </td>
-<td> ::email_html:: </td>
-<td> ::registration_date_html:: </td>
+<td>
+  <a href="/_bin/edit_user_form.cmo?userid=::userid::" title="Modify details, permissions, set password, or delete this user"><strong>::name_html::</strong></a> <br/>
+  <small> ::email_html:: </small>
+</td>
+<td>
+  ::registration_date_html::::if(invite_pending)::<span class="pending">*</span>::end::
+</td>
 <td> ::if(can_edit)::<img src="/_graphics/tick.png" width="10" height="10" alt="Can edit"/>::end:: </td>
 <td> ::if(can_manage_users)::<img src="/_graphics/tick.png" width="10" height="10" alt="Can manage users"/>::end:: </td>
 <td> ::if(can_manage_contacts)::<img src="/_graphics/tick.png" width="10" height="10" alt="Can manage contacts"/>::end:: </td>
@@ -44,9 +47,13 @@
 <td> ::if(can_import_mail)::<img src="/_graphics/tick.png" width="10" height="10" alt="Can import mail"/>::end:: </td>
 </tr>
 ::end::
-
 </table>
 
+<p>
+<span class="pending">*</span> User has been invited, but has not yet
+accepted the invitation.
+</p>
+
 <h2>Explanation of permissions</h2>
 
 <dl>
@@ -137,29 +144,6 @@ If set, user may import e-mail.
 
 </dl>
 
-<ul id="topmenu" class="menu">
-<li class="first"> <a href="/">Home&nbsp;page</a> </li>
-<li> <a href="/_sitemap">Sitemap</a> </li>
-<li> <a href="/_recent">Recent&nbsp;changes</a> </li>
-</ul>
-
-<div id="menu_div">
-<ul id="bottommenu" class="menu">
-<li class="first"> <a href="/">Home&nbsp;page</a> </li>
-::table(sitemenu)::<li> <a href="/::url_html_tag::">::label_html::</a> </li>
-::end::
-<li> <a href="/_sitemap">Sitemap</a> </li>
-</ul>
-</div>
-
-<div id="footer_div">
-<hr/>
-
-<ul id="footer" class="menu">
-<li class="first"> <a href="/copyright">Copyright &copy; ::year::</a> </li>
-<li> Powered by <a href="http://sandbox.merjis.com/">::cocanwiki_package_html:: ::cocanwiki_version_html::</a> </li>
-</ul>
-</div>
-
+::include(footer.html)::
 </body>
 </html>
\ No newline at end of file