From 3560c8d8e14e5ddc8a619844d9ab86d3b9d8d52e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 06 Jul 2016 10:29:10 -0400
Subject: [PATCH] Fixed issue in SQL lib.
---
interface/web/mail/templates/mail_mailinglist_edit.htm | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm
index e7256b7..9d6f8bd 100644
--- a/interface/web/mail/templates/mail_mailinglist_edit.htm
+++ b/interface/web/mail/templates/mail_mailinglist_edit.htm
@@ -10,8 +10,8 @@
<label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
<div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
</tmpl_if>
<tmpl_if name="is_reseller">
@@ -19,8 +19,8 @@
<label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
<div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
</tmpl_if>
<tmpl_if name="edit_disabled">
@@ -28,56 +28,64 @@
<label for="domain_disabled" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<div class="col-sm-9"><select name="domain_disabled" id="domain_disabled" class="form-control" disabled="disabled">
{tmpl_var name='domain_option'}
- </select>
- </div><input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
+ </select></div>
+ <input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
</div>
<div class="form-group">
<label for="listname_disabled" class="col-sm-3 control-label">{tmpl_var name='listname_txt'}</label>
- <div class="col-sm-9"><input type="text" name="listname_disabled" id="listname_disabled" value="{tmpl_var name='listname'}" class="form-control" disabled="disabled" />
- </div><input type="hidden" name="listname" value="{tmpl_var name='listname_value'}" />
+ <div class="col-sm-9"><input type="text" name="listname_disabled" id="listname_disabled" value="{tmpl_var name='listname'}" class="form-control" disabled="disabled" /></div><input type="hidden" name="listname" value="{tmpl_var name='listname_value'}" />
</div>
<div class="form-group">
<label for="email_disabled" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
- <div class="col-sm-9"><input type="text" name="email_disabled" id="email_disabled" value="{tmpl_var name='email'}" class="form-control" disabled="disabled" />
- </div><input type="hidden" name="email" value="{tmpl_var name='email_value'}" />
+ <div class="col-sm-9"><input type="text" name="email_disabled" id="email_disabled" value="{tmpl_var name='email'}" class="form-control" disabled="disabled" /></div><input type="hidden" name="email" value="{tmpl_var name='email_value'}" />
</div>
<tmpl_else>
<div class="form-group">
<label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="listname" class="col-sm-3 control-label">{tmpl_var name='listname_txt'}</label>
- <div class="col-sm-9"><input type="text" name="listname" id="listname" value="{tmpl_var name='listname'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="listname" id="listname" value="{tmpl_var name='listname'}" class="form-control" /></div></div>
<div class="form-group">
<label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
- <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
</tmpl_if>
<div class="form-group">
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
- <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+ <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>
- <p class="formHint"><span id="passText"> </span></p>
+ <span id="passText"> </span>
+ </div>
</div>
<div class="form-group">
<label for="repeat_password" class="col-sm-3 control-label">{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;" autocomplete="off" 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="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>
<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','mail/mail_mailinglist_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="mail/mail_mailinglist_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="mail/mail_mailinglist_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="mail/mail_mailinglist_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
--
Gitblit v1.9.1