Changeset 207 for trunk/templates

Timestamp:

12/19/11 17:20:54 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix overloaded-$webvar{action}-related buglet - changing the default
group can cause the page to mutate due to template/page overloading.
Reported by Reid Sutherland on the "Edit user" page, when clicking
a group to change the default group.

Group edit and bulk domain change pages tweaked although the impact
is limited to changing the starting data, not the page operation.

Location:

trunk/templates

Files:

• bulkdomain.tmpl (modified) (1 diff)
• edgroup.tmpl (modified) (1 diff)
• newgrp.tmpl (modified) (1 diff)
• user.tmpl (modified) (1 diff)
• useradmin.tmpl (modified) (1 diff)

trunk/templates/bulkdomain.tmpl

@@ -21 +21 @@
                 <td>Action:</td>
                 <td align="left">
-<TMPL_IF maymove>               <input type="radio" name="action" value="move" checked="checked" /> Move to group: <select name="destgroup">
+<TMPL_IF maymove>               <input type="radio" name="bulkaction" value="move" checked="checked" /> Move to group: <select name="destgroup">
 <TMPL_LOOP name=grouplist>              <option value="<TMPL_VAR NAME=groupval>"<TMPL_IF groupactive> selected="selected"</TMPL_IF>><TMPL_VAR name=groupname></option>
 </TMPL_LOOP>
                 </select><br /></TMPL_IF>
-<TMPL_IF maystatus>             <input type="radio" name="action" value="deactivate" /> Deactivate<br />
-                <input type="radio" name="action" value="activate" /> Activate<br /></TMPL_IF>
-<TMPL_IF maydelete>             <input type="radio" name="action" value="delete" /> Delete<br /></TMPL_IF>
+<TMPL_IF maystatus>             <input type="radio" name="bulkaction" value="deactivate" /> Deactivate<br />
+                <input type="radio" name="bulkaction" value="activate" /> Activate<br /></TMPL_IF>
+<TMPL_IF maydelete>             <input type="radio" name="bulkaction" value="delete" /> Delete<br /></TMPL_IF>
                 </td>
         </tr>

trunk/templates/edgroup.tmpl

@@ -9 +9 @@
 <input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="edgroup" />
-<input type="hidden" name="action" value="updperms" />
+<input type="hidden" name="grpaction" value="updperms" />
 <input type="hidden" name="gid" value="<TMPL_VAR NAME=gid>" />
 

trunk/templates/newgrp.tmpl

@@ -10 +10 @@
 <input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="newgrp" />
-<input type="hidden" name="action" value="add" />
+<input type="hidden" name="grpaction" value="add" />
 
 <table class="container" width="450">

trunk/templates/user.tmpl

@@ -10 +10 @@
 <input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
 <input type="hidden" name="page" value="user" />
-<input type="hidden" name="action" value="<TMPL_VAR NAME=action>" />
+<input type="hidden" name="useraction" value="<TMPL_VAR NAME=action>" />
 <TMPL_IF uid><input type="hidden" name="uid" value="<TMPL_VAR NAME=uid>" /></TMPL_IF>
 <TMPL_IF gid><input type="hidden" name="gid" value="<TMPL_VAR NAME=gid>" /></TMPL_IF>

trunk/templates/useradmin.tmpl

@@ -37 +37 @@
 <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;action=edit&amp;user=<TMPL_VAR NAME=userid>"><TMPL_VAR NAME=username></a><TMPL_ELSE><TMPL_VAR NAME=username></TMPL_IF></td>
+        <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>