From f0b03be2a39f1bc31fa3488bd457fadb878a32cd Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sat, 16 Jan 2016 04:43:38 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/sites/templates/shell_user_advanced.htm | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/interface/web/sites/templates/shell_user_advanced.htm b/interface/web/sites/templates/shell_user_advanced.htm
index 3e335f9..bcbbdfa 100644
--- a/interface/web/sites/templates/shell_user_advanced.htm
+++ b/interface/web/sites/templates/shell_user_advanced.htm
@@ -3,21 +3,27 @@
</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'}">
--
Gitblit v1.9.1