Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2015-01-06 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870

 interface/web/dns/templates/dns_dkim_edit.htm

@@ -7,11 +7,11 @@
        
              <div class="form-group">
                <label for="data" class="col-sm-3 control-label">{tmpl_var name='public_key_txt'}</label>
                <textarea name="data" id="data" >{tmpl_var name='public_key'}</textarea>
                <textarea name="data" readonly id="data" >{tmpl_var name='public_key'}</textarea>
              </div>
           <div class="form-group">
            <label for="selector" class="col-sm-3 control-label">{tmpl_var name='selector_txt'}</label>
            <div class="col-sm-9"><input type="text" name="selector" id="selector" value="{tmpl_var name='selector'}" class="form-control" />
            <div class="col-sm-9"><input type="text" name="selector" id="selector" value="{tmpl_var name='selector'}" readonly class="form-control" />
           </div></div>
            <div class="form-group">
                <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
@@ -36,5 +36,4 @@
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_dkim_edit.php');">{tmpl_var name='btn_save_txt'}</button>
            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
        </div></div>
<script language="JavaScript" type="text/javascript" src="js/dns_dkim.js"></script>