From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/sites/templates/web_vhost_domain_backup.htm |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/interface/web/sites/templates/web_vhost_domain_backup.htm b/interface/web/sites/templates/web_vhost_domain_backup.htm
index 7f573b8..c31a579 100644
--- a/interface/web/sites/templates/web_vhost_domain_backup.htm
+++ b/interface/web/sites/templates/web_vhost_domain_backup.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+	<h1><tmpl_var name="list_head_txt"></h1>
+</div>
 <p><tmpl_var name="list_desc_txt"></p>
 
 <tmpl_if name="config_error_msg">
@@ -10,36 +12,30 @@
 </div>
 </tmpl_if>
 
-<div class="panel panel_web_domain">
-
-    <div class="pnl_formsarea">
-        <fieldset class="inlineLabels"><legend>Backup</legend>
-            <div class="ctrlHolder">
-                <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
-                <select name="backup_interval" id="backup_interval" class="selectInput">
+        <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>
+                </select></div>
             </div>
-            <div class="ctrlHolder">
-                <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
-                <select name="backup_copies" id="backup_copies" class="selectInput">
+            <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>
+                </select></div>
             </div>
-			<div class="ctrlHolder">
-                <label for="backup_excludes">{tmpl_var name='backup_excludes_txt'}</label>
-                <input name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" size="30" type="text" class="textInput" />&nbsp;{tmpl_var name='backup_excludes_note_txt'}
-            </div>
-        </fieldset>
+			<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-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>
+        
 
         {tmpl_var name='backup_records'}
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
-        <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-        </div>
-    </div>
-
-</div>
\ No newline at end of file
+        <div class="clear"><div class="right">
+            <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>
\ No newline at end of file

--
Gitblit v1.9.1