Merge branch 'stable-3.1'

Marius Burkard

2016-02-21 8a4a057376d8371aa976f3f37b178cd738c4eb59

 interface/web/mail/templates/mail_aliasdomain_edit.htm

@@ -9,14 +9,14 @@
                <label for="destination" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                <div class="col-sm-9"><select name="source" id="source" class="form-control">
                    {tmpl_var name='source_domain'}
                </select>
            </div></div>
                </select></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_domain'}
                </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">
@@ -29,6 +29,6 @@
        <input type="hidden" name="type" value="aliasdomain">

        <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_aliasdomain_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_aliasdomain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></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_aliasdomain_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_aliasdomain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>