Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/mailuser/templates/mail_user_cc_edit.htm

@@ -7,7 +7,7 @@
        
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
                <p class="value">{tmpl_var name='email'}</p>
                <div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
            </div>
            <div class="form-group">
                <label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
@@ -18,6 +18,6 @@
        <input type="hidden" name="id" value="{tmpl_var name='id'}">

        <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','mailuser/mail_user_cc_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="mailuser/mail_user_cc_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="mailuser/index.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>