Till Brehm
2016-01-10 a076c24fd2a45f7a46bdf4415eb0c91a745965e5
Improved several forms in mail module.
7 files modified
79 ■■■■■ changed files
interface/web/mail/templates/mail_alias_edit.htm 12 ●●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_domain_catchall_edit.htm 12 ●●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_forward_edit.htm 12 ●●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_mailinglist_edit.htm 9 ●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_transport_edit.htm 4 ●●● patch | view | raw | blame | history
interface/web/mail/templates/spamfilter_other_edit.htm 4 ●●●● patch | view | raw | blame | history
interface/web/mail/templates/xmpp_user_edit.htm 26 ●●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_alias_edit.htm
@@ -3,14 +3,16 @@
</div>
<p><tmpl_var name="list_desc_txt"></p>
            <div class="form-group">
                <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
                <div class="col-sm-9">
                    <label for="email_local_part" class="col-sm-3 control-label">Alias<div class="col-sm-9"><input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" /></div></label>
                    <label for="email_at" class="col-sm-3 control-label">&nbsp;<span id="email_at" name="email_at" />@</label>
                    <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
                    <div class='input-group'>
                        <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
                        <span class='input-group-addon'>@</span>
                        <div class='input-group-field'>
                            <select name="email_domain" id="email_domain" class="form-control" style="height:50px;">{tmpl_var name='email_domain'}</select>
                        </div>
                    </div>
                </div>
            </div>
            <div class="form-group">
interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -2,14 +2,13 @@
    <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                <div class="col-sm-9">
                    <label for="email_at" class="col-sm-3 control-label">&nbsp;<span id="email_at" name="email_at" />@</label>
                    <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
                    <div class="input-group">
                        <span class="input-group-addon" id="domain-desc">* @</span>
                        <select name="email_domain" id="email_domain" class="form-control" aria-describedby="domain-desc">{tmpl_var name='email_domain'}</select>
                    </div>
                </div>
            </div>
            <div class="form-group">
@@ -21,7 +20,6 @@
                    {tmpl_var name='active'}
                </div>
            </div>
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <input type="hidden" name="type" value="catchall">
interface/web/mail/templates/mail_forward_edit.htm
@@ -3,14 +3,16 @@
</div>
<p><tmpl_var name="list_desc_txt"></p>
            <div class="form-group">
                <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
                <div class="col-sm-9">
                    <label for="email_local_part" class="col-sm-3 control-label">Alias<div class="col-sm-9"><input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" /></div></label>
                    <label for="email_at" class="col-sm-3 control-label">&nbsp;<span id="email_at" name="email_at" />@</label>
                    <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
                    <div class='input-group'>
                        <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
                        <span class='input-group-addon'>@</span>
                        <div class='input-group-field'>
                            <select name="email_domain" id="email_domain" class="form-control" style="height:50px;">{tmpl_var name='email_domain'}</select>
                        </div>
                    </div>
                </div>
            </div>
            <div class="form-group">
interface/web/mail/templates/mail_mailinglist_edit.htm
@@ -56,7 +56,14 @@
            </tmpl_if>
            <div class="form-group">
                <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
                <div class="col-sm-6"><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');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><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>
interface/web/mail/templates/mail_transport_edit.htm
@@ -22,7 +22,9 @@
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='mx_txt'}</label>
                <div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} /></div>
                <div class="col-sm-9">
                    <input type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} />
                </div>
            </div>
            <div class="form-group">
                <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
interface/web/mail/templates/spamfilter_other_edit.htm
@@ -52,8 +52,8 @@
                <div class="col-sm-9"><input type="text" name="spam_admin" id="spam_admin" value="{tmpl_var name='spam_admin'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="message_size_limit" class="col-sm-3 control-label">{tmpl_var name='message_size_limit_txt'}</label>
                <div class="col-sm-6"><input type="text" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;Bytes
            </div></div>
                <div class="col-sm-9"><div class="input-group"><input type="text" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" aria-describedby="message_size_limit-desc" /><span class="input-group-addon" id="message_size_limit-desc">Bytes</span></div></div>
            </div>
            <div class="form-group">
                <label for="banned_rulenames" class="col-sm-3 control-label">{tmpl_var name='banned_rulenames_txt'}</label>
                <div class="col-sm-9"><input type="text" name="banned_rulenames" id="banned_rulenames" value="{tmpl_var name='banned_rulenames'}" class="form-control" /></div></div>
interface/web/mail/templates/xmpp_user_edit.htm
@@ -2,24 +2,28 @@
    <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
            <div class="form-group">
                <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='jid_txt'}</label>
                <div class="col-sm-4">
                <div class="col-sm-9">
                    <div class='input-group'>
                    <input type="text" id="jid_local_part" name="jid_local_part" value="{tmpl_var name='jid_local_part'}" class="form-control" />
                </div>
                <div class="col-sm-1 text-center">@</div>
                <div class="col-sm-4">
                    <select name="jid_domain" id="jid_domain" class="form-control">{tmpl_var name='jid_domain'}</select>
                        <span class='input-group-addon'>@</span>
                        <div class='input-group-field'>
                            <select name="jid_domain" id="jid_domain" class="form-control" style="height:50px;">{tmpl_var name='jid_domain'}</select>
                </div>
            </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-6"><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');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><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>