Changeset 546 for branches/stable/templates

Timestamp:

12/11/13 15:31:44 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work from /trunk, 3 of mumble.

Includes changes through r440. One minor conflict
due to old partial merge

Location:

branches/stable

Files:

• . (modified) (1 prop)
• templates/deldom.tmpl (modified) (1 diff)
• templates/delgrp.tmpl (modified) (1 diff)
• templates/delloc.tmpl (copied) (copied from trunk/templates/delloc.tmpl )
• templates/delrevzone.tmpl (modified) (1 diff)
• templates/deluser.tmpl (modified) (1 diff)
• templates/loclist.tmpl (modified) (1 diff)
• templates/newdomain.tmpl (modified) (1 diff)

branches/stable/templates/deldom.tmpl

@@ -5 +5 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete domain <TMPL_VAR NAME=domain>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 

branches/stable/templates/delgrp.tmpl

@@ -4 +4 @@
 
 <td align="center" valign="top">
-
 <h3>Are you really sure you want to delete group <TMPL_VAR NAME=delgroupname>?</h3>
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delgrp&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delgrp&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
-
-<!--
- fixme:  do a check for "group has stuff in it", and splatter a big warning
- up along with an unchecked-by-default check box to YES DAMMIT DELETE THE WHOLE THING
- -->
-
 </td></tr></table>
 

branches/stable/templates/delrevzone.tmpl

@@ -5 +5 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete reverse zone <TMPL_VAR NAME=revzone>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 

branches/stable/templates/deluser.tmpl

@@ -5 +5 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete user <TMPL_VAR NAME=user>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 

branches/stable/templates/loclist.tmpl

@@ -36 +36 @@
         <td><TMPL_VAR name=group_name></td>
 <TMPL_IF delloc>
-        <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;id=<TMPL_VAR 
-NAME=loc>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
+        <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;locid=<TMPL_VAR 
+NAME=location>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
 </TMPL_IF>
 </tr>

branches/stable/templates/newdomain.tmpl

@@ -32 +32 @@
                 <td>Make domain active on next DNS propagation</td><td><input type="checkbox" name="makeactive"<TMPL_UNLESS addinactive> checked="checked"</TMPL_UNLESS> /></td>
         </tr>
-<TMPL_IF location_view>
+<TMPL_IF location_view><TMPL_IF record_locchg>
         <tr class="datalinelight">
                 <td>Default location/view:</td>
                 <td><select name="defloc">
-                <option value="">(None/public)</option>
 <TMPL_LOOP name=loclist>                <option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected="selected"</TMPL_IF>><TMPL_VAR NAME=locname></option>
 </TMPL_LOOP>
                 </select></td>
         </tr>
-</TMPL_IF>
+</TMPL_IF></TMPL_IF>
         <tr><td colspan="2" class="tblsubmit"><input type="submit" value="Add domain" /></td></tr>
     </table>