From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 interface/web/client/templates/client_template_edit_template.htm |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/interface/web/client/templates/client_template_edit_template.htm b/interface/web/client/templates/client_template_edit_template.htm
index 79ea109..e06d077 100644
--- a/interface/web/client/templates/client_template_edit_template.htm
+++ b/interface/web/client/templates/client_template_edit_template.htm
@@ -1,28 +1,26 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
+<tmpl_if name="list_head_txt">
+<div class='page-header'>
+	<h1><tmpl_var name="list_head_txt"></h1>
+</div>
+</tmpl_if>
+<tmpl_if name="list_desc_txt"><p><tmpl_var name="list_desc_txt"></p></tmpl_if>
 
-<div class="panel panel_client_template">
 
-    <div class="pnl_formsarea">
-        <fieldset class="inlineLabels"><legend>Template</legend>
-            <div class="ctrlHolder">
-                <label for="template_type">{tmpl_var name='template_type_txt'}</label>
-                <select name="template_type" id="template_type" class="selectInput">
+        <legend>Template</legend>
+            <div class="form-group">
+                <label for="template_type" class="col-sm-3 control-label">{tmpl_var name='template_type_txt'}</label>
+                <div class="col-sm-9"><select name="template_type" id="template_type" class="form-control">
                     {tmpl_var name='template_type'}
-                </select>
+                </select></div>
             </div>
-            <div class="ctrlHolder">
-                <label for="template_name">{tmpl_var name='template_name_txt'}</label>
-                <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
-            </div>
-        </fieldset>
+            <div class="form-group">
+                <label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" /></div></div>
+        
 
         <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','client/client_template_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('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-        </div>
-    </div>
-
-</div>
+        <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="client/client_template_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="client/client_template_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+        </div></div>

--
Gitblit v1.9.1