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

branches/stable/templates/axfr.tmpl

@@ -39 +39 @@
 </tr>
 <tr class="datalinelight">
+        <td>Merge records on A+PTR or AAAA+PTR match?</td>
+        <td><input type="checkbox" name="mergematching"<TMPL_IF mergematching> checked="checked"</TMPL_IF> /></td>
+</tr>
+<tr class="datalinelight">
         <td>Import as active?</td>
         <td><input type="checkbox" name="domactive"<TMPL_UNLESS dominactive> checked="checked"</TMPL_UNLESS> /></td>
@@ -44 +48 @@
 <tr class="datalinelight">
         <td valign="top">Domains to import:<br />(one per line)</td>
-        <td><textarea name="importdoms" rows="10" cols="25"><TMPL_IF importdoms><TMPL_VAR NAME=importdoms></TMPL_IF></textarea></td>
+        <td><textarea name="importdoms" rows="10" cols="45"><TMPL_IF importdoms><TMPL_VAR NAME=importdoms></TMPL_IF></textarea></td>
 </tr>
 <tr class="datalinelight">