Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/mail/templates/mail_user_backup.htm

@@ -18,19 +18,19 @@
                <label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
                <div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
                    {tmpl_var name='backup_interval'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="backup_copies" class="col-sm-3 control-label">{tmpl_var name='backup_copies_txt'}</label>
                <div class="col-sm-9"><select name="backup_copies" id="backup_copies" class="form-control">
                    {tmpl_var name='backup_copies'}
                </select>
            </div></div>
                </select></div>
            </div>
        
        {tmpl_var name='backup_records'}
        <input type="hidden" name="id" value="{tmpl_var name='id'}">

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