Changeset 546 for branches/stable/templates/newdomain.tmpl

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/newdomain.tmpl (modified) (1 diff)

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>