Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/dns/templates/dns_srv_edit.htm

@@ -7,28 +7,22 @@
        
            <div class="form-group">
                <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
                <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="target" class="col-sm-3 control-label">{tmpl_var name='target_txt'}</label>
                <div class="col-sm-9"><input type="text" name="target" id="target" value="{tmpl_var name='target'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="target" id="target" value="{tmpl_var name='target'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="weight" class="col-sm-3 control-label">{tmpl_var name='weight_txt'}</label>
                <div class="col-sm-9"><input type="text" name="weight" id="weight" value="{tmpl_var name='weight'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="weight" id="weight" value="{tmpl_var name='weight'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="port" class="col-sm-3 control-label">{tmpl_var name='port_txt'}</label>
                <div class="col-sm-9"><input type="text" name="port" id="port" value="{tmpl_var name='port'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="port" id="port" value="{tmpl_var name='port'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="aux" class="col-sm-3 control-label">{tmpl_var name='aux_txt'}</label>
                <div class="col-sm-9"><input type="text" name="aux" id="aux" value="{tmpl_var name='aux'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="aux" id="aux" value="{tmpl_var name='aux'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
                <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" /></div></div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-9">
@@ -42,6 +36,6 @@
        <input type="hidden" name="type" value="{tmpl_var name='type'}">
            
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_srv_edit.php');">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_srv_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>