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/sites/templates/shell_user_advanced.htm | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/interface/web/sites/templates/shell_user_advanced.htm b/interface/web/sites/templates/shell_user_advanced.htm
index c7cc2fe..bcbbdfa 100644
--- a/interface/web/sites/templates/shell_user_advanced.htm
+++ b/interface/web/sites/templates/shell_user_advanced.htm
@@ -3,25 +3,31 @@
</div>
<p><tmpl_var name="list_desc_txt"></p>
-
-
- <div class="form-group">
- <label for="puser" class="col-sm-3 control-label">{tmpl_var name='puser_txt'}</label>
- <div class="col-sm-9"><input type="text" name="puser" id="puser" value="{tmpl_var name='puser'}" class="form-control" /></div></div>
- <div class="form-group">
- <label for="pgroup" class="col-sm-3 control-label">{tmpl_var name='pgroup_txt'}</label>
- <div class="col-sm-9"><input type="text" name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" class="form-control" /></div></div>
- <div class="form-group">
- <label for="shell" class="col-sm-3 control-label">{tmpl_var name='shell_txt'}</label>
- <div class="col-sm-9"><input type="text" name="shell" id="shell" value="{tmpl_var name='shell'}" class="form-control" /></div></div>
- <div class="form-group">
- <label for="dir" class="col-sm-3 control-label">{tmpl_var name='dir_txt'}</label>
- <div class="col-sm-9"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" /></div></div>
-
+ <div class="form-group">
+ <label for="puser" class="col-sm-3 control-label">{tmpl_var name='puser_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="puser" id="puser" value="{tmpl_var name='puser'}" class="form-control" /></div>
+ </div>
+ <div class="form-group">
+ <label for="pgroup" class="col-sm-3 control-label">{tmpl_var name='pgroup_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" class="form-control" /></div>
+ </div>
+ <div class="form-group">
+ <label for="shell" class="col-sm-3 control-label">{tmpl_var name='shell_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="shell" id="shell" value="{tmpl_var name='shell'}" class="form-control" /></div>
+ </div>
+ <tmpl_if name="is_jailkit">
+ <input type="hidden" name="dir" id="dir" value="{tmpl_var name='dir'}">
+ </tmpl_else>
+ <div class="form-group">
+ <label for="dir" class="col-sm-3 control-label">{tmpl_var name='dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" /></div>
+ </div>
+ </tmpl_if>
+
<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'}" onclick="submitForm('pageForm','sites/shell_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="sites/shell_user_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/shell_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
--
Gitblit v1.9.1