From 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 03 Feb 2015 04:10:04 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

---
 interface/web/help/templates/faq_edit.htm |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/web/help/templates/faq_edit.htm b/interface/web/help/templates/faq_edit.htm
index 4fa1c18..3bf9d8a 100644
--- a/interface/web/help/templates/faq_edit.htm
+++ b/interface/web/help/templates/faq_edit.htm
@@ -4,21 +4,20 @@
                 <label for="hf_section" class="col-sm-3 control-label">{tmpl_var name='faq_section_txt'}</label>
                 <div class="col-sm-9"><select name="hf_section" id="hf_section" class="form-control">
                     {tmpl_var name='hf_section'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="hf_question" class="col-sm-3 control-label">{tmpl_var name='faq_question_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="hf_question" id="hf_question" value="{tmpl_var name='hf_question'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="hf_question" id="hf_question" value="{tmpl_var name='hf_question'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="hf_answer" class="col-sm-3 control-label">{tmpl_var name='faq_answer_txt'}</label>
-                <textarea name="hf_answer" id="hf_answer" rows='10' cols='30'>{tmpl_var name='hf_answer'}</textarea>
+                <div class="col-sm-9"><textarea class="form-control" name="hf_answer" id="hf_answer" rows='10' cols='30'>{tmpl_var name='hf_answer'}</textarea></div>
             </div>
         
 
         <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','help/faq_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="help/faq_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="help/faq_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="help/faq_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>
\ No newline at end of file

--
Gitblit v1.9.1