From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/templates/users_groups_edit.htm |   52 +++++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/interface/web/admin/templates/users_groups_edit.htm b/interface/web/admin/templates/users_groups_edit.htm
index cc98bb8..5f09bfa 100644
--- a/interface/web/admin/templates/users_groups_edit.htm
+++ b/interface/web/admin/templates/users_groups_edit.htm
@@ -1,25 +1,27 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_users">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_users"><legend>Groups</legend>
-      <span class="wf_oneField">
-        <label for="default_group" class="wf_preField">{tmpl_var name='default_group_txt'}</label>
-        <select id="default_group" name="default_group">{tmpl_var name='default_group'}</select>
-      </span>
-      <span class="wf_oneField">
-        <span class="wf_label wf_preField">{tmpl_var name='groups_txt'}</span>                    
-        <fieldset>{tmpl_var name='groups'}</fieldset>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_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('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<div class='page-header'>
+	<h1><tmpl_var name="list_head_txt"></h1>
+</div>
+<p><tmpl_var name="list_desc_txt"></p>
+
+
+        
+            <div class="form-group">
+                <label for="default_group" class="col-sm-3 control-label">{tmpl_var name='default_group_txt'}</label>
+                <div class="col-sm-9"><select name="default_group" id="default_group" class="form-control">
+                    {tmpl_var name='default_group'}
+                </select></div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='groups_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='groups'}
+                </div>
+            </div>
+        
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <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="admin/users_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="admin/users_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+        </div></div>
\ No newline at end of file

--
Gitblit v1.9.1