Changeset 545 for branches/stable/templates/useradmin.tmpl

Timestamp:

12/10/13 17:47:44 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS and location work; 2 of mumble

• from r263 through r416

Numerous conflicts due to hand-copy or partial merges

Location:

branches/stable

Files:

• . (modified) (1 prop)
• templates/useradmin.tmpl (modified) (2 diffs)

branches/stable/templates/useradmin.tmpl

@@ -5 +5 @@
 <td align="center" valign="top">
 
-<TMPL_IF resultmsg>
-<div class="result"><TMPL_VAR NAME=resultmsg></div>
-</TMPL_IF>
-<TMPL_IF warnmsg>
-<div class="warning">Warning: <TMPL_VAR NAME=warnmsg></div>
-</TMPL_IF>
-<TMPL_IF errmsg>
-<div class="errmsg"><TMPL_VAR NAME=errmsg></div>
-</TMPL_IF>
+<TMPL_INCLUDE NAME="msgblock.tmpl">
 
 <table width="98%" class="csubtable">
@@ -30 +22 @@
 <table width="98%" border="0" cellspacing="4" cellpadding="3" class="csubtable">
 <tr>
-<TMPL_LOOP NAME=colheads>
-        <td class="datahead_<TMPL_IF firstcol>l<TMPL_ELSE>s</TMPL_IF>"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></td></TMPL_LOOP>
+<TMPL_LOOP NAME=colheads>       <td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="dns.cgi?sid=<TMPL_VAR
+ NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR
+ NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR
+ NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" src="images/<TMPL_VAR
+ NAME=sortorder>.png" /></TMPL_IF></td>
+</TMPL_LOOP>
 <TMPL_IF deluser>       <td class="datahead_s">Delete</td></TMPL_IF>
 </tr>
 <TMPL_IF name=usertable>
 <TMPL_LOOP name=usertable>
-<tr class="row<TMPL_VAR name=bg>">
-        <td align="left"><TMPL_IF eduser><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=user&amp;useraction=edit&amp;user=<TMPL_VAR NAME=userid>"><TMPL_VAR NAME=username></a><TMPL_ELSE><TMPL_VAR NAME=username></TMPL_IF></td>
-        <td class="data_nowrap"><TMPL_VAR name=userfull></td>
-        <td><TMPL_VAR name=usertype></td>
-        <td><TMPL_VAR name=usergroup></td>
+<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
+        <td align="left"><TMPL_IF eduser><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=user&amp;useraction=edit&amp;user=<TMPL_VAR NAME=user_id>"><TMPL_VAR NAME=username></a><TMPL_ELSE><TMPL_VAR NAME=username></TMPL_IF></td>
+        <td class="data_nowrap"><TMPL_VAR name=fname></td>
+        <td><TMPL_VAR name=type></td>
+        <td><TMPL_VAR name=group_name></td>
         <td align="center">
 <TMPL_IF eduser>
-                <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=useradmin<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=userid>&amp;userstatus=<TMPL_IF active>useroff<TMPL_ELSE>useron</TMPL_IF>"><TMPL_IF active>enabled<TMPL_ELSE>disabled</TMPL_IF></a>
+                <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=useradmin<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=user_id>&amp;userstatus=<TMPL_IF status>useroff<TMPL_ELSE>useron</TMPL_IF>"><TMPL_IF status>enabled<TMPL_ELSE>disabled</TMPL_IF></a>
 <TMPL_ELSE>
-                <TMPL_IF active>enabled<TMPL_ELSE>disabled</TMPL_IF>
+                <TMPL_IF status>enabled<TMPL_ELSE>disabled</TMPL_IF>
 </TMPL_IF>
 </td>
 <TMPL_IF deluser>
-        <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;id=<TMPL_VAR NAME=userid>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
+        <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;id=<TMPL_VAR NAME=user_id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
 </TMPL_IF>
 </tr>