Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/mail/templates/mail_alias_edit.htm

@@ -3,34 +3,47 @@
</div>
<p><tmpl_var name="list_desc_txt"></p>


        
            <div class="form-group">
         <div class="form-group">
                <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
                <div class="col-sm-9">
                    <label for="email_local_part" class="col-sm-3 control-label">Alias<div class="col-sm-9"><input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" /></div></label>
                    <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'>
                  <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
                  <span class='input-group-addon'>@</span>
                        <div class='input-group-field'>
                     <select name="email_domain" id="email_domain" class="form-control" style="height:50px;min-width:170px;">{tmpl_var name='email_domain'}</select>
                        </div>
                    </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"><select name="destination" id="destination" class="form-control">
                    {tmpl_var name='destination'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='active'}
                </div>
            </div>
        
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='allow_send_as'} <small>{tmpl_var name='send_as_exp'}</small>
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='greylisting'}
                </div>
            </div>

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

        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_alias_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="mail/mail_alias_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
        </div></div>
            <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_alias_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_alias_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>