Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/sites/templates/web_vhost_domain_backup.htm

@@ -12,23 +12,22 @@
</div>
</tmpl_if>


        <legend>Backup</legend>
            <div class="form-group">
                <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>
         <div class="form-group">
                <label for="backup_excludes" class="col-sm-3 control-label">{tmpl_var name='backup_excludes_txt'}</label>
                <div class="col-sm-9"><input type="text" name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" class="form-control" />&nbsp;{tmpl_var name='backup_excludes_note_txt'}
                <div class="col-sm-6"><input type="text" name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='backup_excludes_note_txt'}
            </div></div>
        

@@ -37,6 +36,6 @@
        <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','sites/web_vhost_domain_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="sites/web_vhost_domain_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="sites/web_vhost_domain_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="sites/web_vhost_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>