Changeset 394 for trunk

Timestamp:

09/21/12 16:19:53 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix a minor XHTMLism missed when adding the location management
link in the menu
Fix a layout glitch on the "New group" page caused by the layout
for the new permission types in the permission list subtemplate

Location:

trunk/templates

Files:

• menu.tmpl (modified) (1 diff)
• newgrp.tmpl (modified) (2 diffs)

trunk/templates/menu.tmpl

@@ -9 +9 @@
 <TMPL_IF maydefrec><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y">Default Records</a><br />
 <TMPL_IF mayrdns><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y&amp;revrec=y">Default Reverse Records</a><br /></TMPL_IF></TMPL_IF>
-<TMPL_IF mayloc><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=loclist&id=<TMPL_VAR NAME=group>">Locations/Views</a><br /></TMPL_IF>
+<TMPL_IF mayloc><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=loclist&amp;id=<TMPL_VAR NAME=group>">Locations/Views</a><br /></TMPL_IF>
 <TMPL_IF mayimport><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=axfr">AXFR Import</a><br /></TMPL_IF>
 <TMPL_IF maybulk><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=bulkdomain">Bulk Domain Operations</a><br /></TMPL_IF>

trunk/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>