Changeset 545 for branches/stable/templates/newgrp.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/newgrp.tmpl (modified) (2 diffs)

branches/stable/templates/newgrp.tmpl

@@ -15 +15 @@
 <tr><td>
     <table border="0" cellspacing="2" cellpadding="2" width="100%">
-<TMPL_IF add_failed>    <tr><td class="errhead" colspan="4">Error adding group <TMPL_VAR NAME=newgroup>: <TMPL_VAR NAME=errmsg></td></tr></TMPL_IF>
-        <tr class="darkrowheader"><td colspan="4" align="center">Add Group</td></tr>
+<TMPL_IF add_failed>    <tr><td class="errhead" colspan="2">Error adding group <TMPL_VAR NAME=newgroup>: <TMPL_VAR NAME=errmsg></td></tr></TMPL_IF>
+        <tr class="darkrowheader"><td colspan="2" align="center">Add Group</td></tr>
 
         <tr class="datalinelight">
-                <td colspan=2>Group Name:</td>
-                <td align="left" colspan=2><input type="text" name="newgroup" value="<TMPL_VAR NAME=newgroup>" /></td>
+                <td>Group Name:</td>
+                <td align="left"><input type="text" name="newgroup" value="<TMPL_VAR NAME=newgroup>" /></td>
         </tr>
         <tr class="datalinelight">
-                <td colspan=2>Add as subgroup of:</td>
-                <td colspan=2><select name="pargroup">
+                <td>Add as subgroup of:</td>
+                <td><select name="pargroup">
 <TMPL_LOOP name=pargroup>               <option value="<TMPL_VAR NAME=groupval>"<TMPL_IF groupactive> selected="selected"</TMPL_IF>><TMPL_VAR name=groupname></option>
 </TMPL_LOOP>
@@ -30 +30 @@
         </tr>
         <tr class="darkrowheader border">
-                <td colspan="4" align="center">Default permissions for users created in this group:</td>
+                <td colspan="2" align="center">Default permissions for users created in this group:</td>
         </tr>
+        <tr><td colspan="2"><table>
 <TMPL_INCLUDE name="permlist.tmpl">
+        </table></td></tr>
         <tr class="darkrowheader">
-                <td colspan="4" align="center"><input type="submit" value="Add group" /></td>
+                <td colspan="2" align="center"><input type="submit" value="Add group" /></td>
         </tr>
     </table>