Merge branch 'master' into 'master'

Marius Cramer

2014-09-29 178258f86cdf00b9c047023b97937c794bac88ec

 interface/web/mail/templates/mail_domain_edit.htm

old mode 100644
new mode 100755
@@ -97,7 +97,7 @@
              <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>
<a href="javascript:setRequest('create','{tmpl_var name='domain'}','{tmpl_var name='dkim_selector'}')">{tmpl_var name='dkim_generate_txt'}</a>
              </div>
      <div class="ctrlHolder">
                <textarea name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea>
@@ -108,6 +108,7 @@
              </div>

            </div>

        </fieldset>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -118,6 +119,5 @@
            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
        </div>
    </div>

</div>
<script language="JavaScript" type="text/javascript" src="js/mail_domain_dkim.js"></script>