Merge branch 'master' into 'master'

Marius Cramer

2014-07-07 b4945ae0c3f4e108090d05b34b3e7df8a753a2ec

 interface/web/mail/templates/mail_domain_edit.htm

@@ -26,6 +26,25 @@
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
            <tmpl_else>
                <tmpl_if name="only_one_server">
                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
                <tmpl_else>
                    <div class="ctrlHolder">
                        <tmpl_if name="edit_disabled">
                            <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
                            <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
                                {tmpl_var name='client_server_id'}
                            </select>
                            <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                        <tmpl_else>
                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
                            <select name="server_id" id="server_id" class="selectInput">
                                {tmpl_var name='client_server_id'}
                            </select>
                        </tmpl_if>
                    </div>
                </tmpl_if>
            </tmpl_if>

            <tmpl_if name="is_reseller">
@@ -68,6 +87,10 @@
                </div>
              </div>
              <div class="ctrlHolder">
                <label for="dkim_selector">{tmpl_var name='dkim_selector_txt'}</label>
                <input name="dkim_selector" id="dkim_selector" value="{tmpl_var name='dkim_selector'}" size="20" maxlength="63" type="text" class="textInput" />
              </div>
              <div class="ctrlHolder">
                <label for="dkim_private">{tmpl_var name='dkim_private_txt'}</label>
                <textarea name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea>
<a href="javascript:setRequest('create','{tmpl_var name='domain'}')">{tmpl_var name='dkim_generate_txt'}</a>
@@ -75,6 +98,10 @@
      <div class="ctrlHolder">
                <textarea name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea>
              </div>
              <div class="ctrlHolder">
                <label for="dns_record">{tmpl_var name='dkim_dns_txt'}</label>
                <textarea name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea>
              </div>

            </div>
        </fieldset>