From fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 07 Jun 2015 12:16:19 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/mail/templates/mail_mailinglist_edit.htm | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm
index b1c73f4..f6d7784 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,8 +28,8 @@
<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">
@@ -45,8 +45,8 @@
<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>
@@ -65,7 +65,7 @@
</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" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></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 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>
@@ -73,6 +73,6 @@
<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','mail/mail_mailinglist_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="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