From 2e9ac915cb0efc7474443d317e317d9875a1feef Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 08 Jan 2015 12:18:40 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

---
 interface/web/sites/templates/cron_edit.htm |   89 ++++++++++++++++++++------------------------
 1 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm
index 20b1922..7fb59c7 100644
--- a/interface/web/sites/templates/cron_edit.htm
+++ b/interface/web/sites/templates/cron_edit.htm
@@ -1,74 +1,65 @@
-<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>
 
-<div class="panel panel_cron">
 
-    <div class="pnl_formsarea">
-        <fieldset class="inlineLabels"><legend>Cron Job</legend>
-            <div class="ctrlHolder">
+        <legend>Cron Job</legend>
+            <div class="form-group">
                 <tmpl_if name="edit_disabled">
-                    <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
-                    <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+                    <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+                    <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
                         {tmpl_var name='parent_domain_id'}
-                    </select>
+                    </select></div>
                     <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
                     <tmpl_else>
-                        <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
-                        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                        <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+                        <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                             {tmpl_var name='parent_domain_id'}
-                        </select>
+                        </select></div>
                 </tmpl_if>
             </div>
-            <div class="ctrlHolder">
-                <label for="run_min">{tmpl_var name='run_min_txt'}</label>
-                <input name="run_min" id="run_min" value="{tmpl_var name='run_min'}" size="10" maxlength="255" type="text" class="textInput" />
-                <p class="formHint">e.g. *, */3, 10-20</p>
+            <div class="form-group">
+                <label for="run_min" class="col-sm-3 control-label">{tmpl_var name='run_min_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="run_min" id="run_min" value="{tmpl_var name='run_min'}" class="form-control" /></div><p class="formHint">e.g. *, */3, 10-20</p>
             </div>
-            <div class="ctrlHolder">
-                <label for="run_hour">{tmpl_var name='run_hour_txt'}</label>
-                <input name="run_hour" id="run_hour" value="{tmpl_var name='run_hour'}" size="10" maxlength="255" type="text" class="textInput" />
-                <p class="formHint">e.g. *, */2, 0, 10-12</p>
+            <div class="form-group">
+                <label for="run_hour" class="col-sm-3 control-label">{tmpl_var name='run_hour_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="run_hour" id="run_hour" value="{tmpl_var name='run_hour'}" class="form-control" /></div><p class="formHint">e.g. *, */2, 0, 10-12</p>
             </div>
-            <div class="ctrlHolder">
-                <label for="run_mday">{tmpl_var name='run_mday_txt'}</label>
-                <input name="run_mday" id="run_mday" value="{tmpl_var name='run_mday'}" size="10" maxlength="255" type="text" class="textInput" />
-                <p class="formHint">e.g. *, */4, 1-5</p>
+            <div class="form-group">
+                <label for="run_mday" class="col-sm-3 control-label">{tmpl_var name='run_mday_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="run_mday" id="run_mday" value="{tmpl_var name='run_mday'}" class="form-control" /></div><p class="formHint">e.g. *, */4, 1-5</p>
             </div>
-            <div class="ctrlHolder">
-                <label for="run_month">{tmpl_var name='run_month_txt'}</label>
-                <input name="run_month" id="run_month" value="{tmpl_var name='run_month'}" size="10" maxlength="255" type="text" class="textInput" />
-                <p class="formHint">e.g. *, 1-6</p>
+            <div class="form-group">
+                <label for="run_month" class="col-sm-3 control-label">{tmpl_var name='run_month_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="run_month" id="run_month" value="{tmpl_var name='run_month'}" class="form-control" /></div><p class="formHint">e.g. *, 1-6</p>
             </div>
-            <div class="ctrlHolder">
-                <label for="run_wday">{tmpl_var name='run_wday_txt'}</label>
-                <input name="run_wday" id="run_wday" value="{tmpl_var name='run_wday'}" size="10" maxlength="255" type="text" class="textInput" />
-                <p class="formHint">e.g. *, 0, 1-5</p>
+            <div class="form-group">
+                <label for="run_wday" class="col-sm-3 control-label">{tmpl_var name='run_wday_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="run_wday" id="run_wday" value="{tmpl_var name='run_wday'}" class="form-control" /></div><p class="formHint">e.g. *, 0, 1-5</p>
             </div>
-            <div class="ctrlHolder">
-                <label for="command">{tmpl_var name='command_txt'}</label>
-                <input name="command" id="command" value="{tmpl_var name='command'}" size="30" maxlength="255" type="text" class="textInput" />
-                <p class="formHint">{tmpl_var name='command_hint_txt'}</p>
+            <div class="form-group">
+                <label for="command" class="col-sm-3 control-label">{tmpl_var name='command_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="command" id="command" value="{tmpl_var name='command'}" class="form-control" /></div><p class="formHint">{tmpl_var name='command_hint_txt'}</p>
             </div>
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='log_output_txt'}</p>
-                <div class="multiField">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='log_output_txt'}</label>
+                <div class="col-sm-9">
                     {tmpl_var name='log'}
                 </div>
             </div>
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='active_txt'}</p>
-                <div class="multiField">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+                <div class="col-sm-9">
                     {tmpl_var name='active'}
                 </div>
             </div>
-        </fieldset>
+        
 
         <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/cron_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/cron_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'}" onclick="submitForm('pageForm','sites/cron_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/cron_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+        </div></div>
\ No newline at end of file

--
Gitblit v1.9.1