Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/mail/templates/xmpp_domain_edit.htm

@@ -73,38 +73,44 @@




<!--
management by maildomain is currently not supported
<div class="form-group">
    <label for="management_method" class="col-sm-3 control-label">{tmpl_var name='management_method_txt'}</label>
    <div class="col-sm-9"><select name="management_method" id="management_method" class="form-control">
        {tmpl_var name='management_method'}
    </select></div>
</div>
-->
<input type="hidden" name="management_method" id="management_method" value="0" />

<div id="toggle-management-normal" class="collapse">
    <div class="form-group">
    <!--
    Currently not supported
    div class="form-group">
        <label class="col-sm-3 control-label">{tmpl_var name='public_registration_txt'}</label>
        <div class="col-sm-9">
            {tmpl_var name='public_registration'}
        </div>
    </div>
    </div-->
</div>
<div id="toggle-registration-closed" class="collapse">
        <input type="hidden" name="public_registration" id="public_registration" value="n" />
<div id="toggle-registration-closed" class="collapse in">
    <div class="form-group">
        <label for="registration_url" class="col-sm-3 control-label">{tmpl_var name='registration_url_txt'}</label>
        <div class="col-sm-9">
            <input type="text" name="registration_url" id="registration_url" value="{tmpl_var name='registration_url'}" class="form-control" />
            <input type="text" name="registration_url" id="registration_url" value="{tmpl_var name='registration_url'}" class="form-control" placeholder="<tmpl_var name='about_registration_url_txt'>" />
        </div>
    </div>
    <div class="form-group">
        <label class="col-sm-3 control-label">{tmpl_var name='registration_message_txt'}</label>
        <div class="col-sm-9"><textarea class="form-control" name="registration_message" id="registration_message" rows='3' cols='30'>{tmpl_var name='registration_message'}</textarea></div>
        <div class="col-sm-9"><textarea class="form-control" name="registration_message" id="registration_message" rows='3' cols='30' placeholder="<tmpl_var name='about_registration_message_txt'>">{tmpl_var name='registration_message'}</textarea></div>
    </div>
</div>

<div class="form-group">
    <label class="col-sm-3 control-label">{tmpl_var name='domain_admins_txt'}</label>
    <div class="col-sm-9"><textarea class="form-control" name="domain_admins" id="domain_admins" rows='3' cols='30'>{tmpl_var name='domain_admins'}</textarea></div>
    <div class="col-sm-9"><textarea class="form-control" name="domain_admins" id="domain_admins" rows='3' cols='30' placeholder="admin@service.com, superuser@service.com">{tmpl_var name='domain_admins'}</textarea></div>
</div>