Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/sites/templates/shell_user_edit.htm

@@ -1,72 +1,85 @@
<h2><tmpl_var name="list_head_txt"></h2>
<div class='page-header'>
   <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_shell_user">

  <div class="pnl_formsarea">
    <fieldset class="inlineLabels">
      <div class="ctrlHolder">
       <tmpl_if name="edit_disabled">
      <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
        <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
               {tmpl_var name='parent_domain_id'}
      </select>
      <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
      <tmpl_else>
      <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
               {tmpl_var name='parent_domain_id'}
      </select>
      </tmpl_if>
      </div>
      <div class="ctrlHolder">
         <label for="username">{tmpl_var name='username_txt'}</label>
            <div style="float: left;">{tmpl_var name='username_prefix'} </div>
        <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput formLengthFourth"/>
         </div>
      <div class="ctrlHolder">
         <label for="password">{tmpl_var name='password_txt'}</label>
        <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
         </div>
      <div class="ctrlHolder">
            <p class="label">{tmpl_var name='password_strength_txt'}</p>
            <div id="passBar"></div>
            <p class="formHint"><span id="passText">&nbsp;</span></p>
         </div>
      <div class="ctrlHolder">
         <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
        <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
      </div>
      <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
      <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
      <div class="ctrlHolder">
         <label for="chroot">{tmpl_var name='chroot_txt'}</label>
        <select name="chroot" id="chroot" class="selectInput formLengthHalf">
               {tmpl_var name='chroot'}
            </select>
      </div>
      <div class="ctrlHolder">
         <label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
        <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
         </div>
   <div class="ctrlHolder">
            <label for="ssh_rsa">{tmpl_var name='ssh_rsa_txt'}</label>
         <textarea name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea>
         </div>
      <div class="ctrlHolder">
            <p class="label">{tmpl_var name='active_txt'}</p>
               <div class="multiField">
                  {tmpl_var name='active'}
        
            <div class="form-group">
                <tmpl_if name="edit_disabled">
                    <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                    <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
                        {tmpl_var name='parent_domain_id'}
                    </select></div>
                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
                <tmpl_else>
                        <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                        <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                            {tmpl_var name='parent_domain_id'}
                        </select></div>
                </tmpl_if>
            </div>
         <div class="form-group">
                <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
                <div class="col-sm-9">
               <div class="input-group">
                  <span class="input-group-addon" id="username-desc">{tmpl_var name='username_prefix'}</span>
                  <input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" aria-describedby="username-desc" />
               </div>
            </div>
            </div>
         <div class="form-group">
                <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
                <div class="col-sm-9">
            <div class="input-group">
               <input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
               <span class="input-group-btn">
                  <button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
               </span>
            </div>
            </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
                <div class="col-sm-9 checkbox">
                <div id="passBar"></div>
                <span id="passText">&nbsp;</span>
                </div>
            </div>
            <div class="form-group">
                <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
                <div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
            <div class="form-group">
            <div class="col-sm-offset-3 col-sm-9">
               <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
               <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
            </div>
         </div>
    </fieldset>
            <div class="form-group">
                <label for="chroot" class="col-sm-3 control-label">{tmpl_var name='chroot_txt'}</label>
                <div class="col-sm-9"><select name="chroot" id="chroot" class="form-control">
                    {tmpl_var name='chroot'}
                </select></div>
            </div>
            <div class="form-group">
                <label for="quota_size" class="col-sm-3 control-label">{tmpl_var name='quota_size_txt'}</label>
                <div class="col-sm-9"><div class="input-group"><input type="text" name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" class="form-control" aria-describedby="quota_size-desc" /><span class="input-group-addon" id="quota_size-desc">MB</span></div></div>
            </div>
            <div class="form-group">
                <label for="ssh_rsa" class="col-sm-3 control-label">{tmpl_var name='ssh_rsa_txt'}</label>
                <div class="col-sm-9"><textarea class="form-control" name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='active'}
                </div>
            </div>
        

    <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <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','sites/shell_user_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('sites/shell_user_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="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>