Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/mail/templates/mail_domain_catchall_edit.htm

@@ -2,20 +2,18 @@
   <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>


        
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
         <div class="form-group">
                <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                <div class="col-sm-9">
                    <label for="email_at" class="col-sm-3 control-label">&nbsp;<span id="email_at" name="email_at" />@</label>
                    <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
                </div>
               <div class="input-group">
                  <span class="input-group-addon" id="domain-desc">* @</span>
                  <select name="email_domain" id="email_domain" class="form-control" aria-describedby="domain-desc">{tmpl_var name='email_domain'}</select>
               </div>
            </div>
            </div>
            <div class="form-group">
                <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
                <div class="col-sm-9"><input type="text" name="destination" id="destination" value="{tmpl_var name='destination'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="destination" id="destination" value="{tmpl_var name='destination'}" 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">
@@ -23,11 +21,10 @@
                </div>
            </div>
        

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <input type="hidden" name="type" value="catchall">

        <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','mail/mail_domain_catchall_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="mail/mail_domain_catchall_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="mail/mail_domain_catchall_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>