Merge branch 'reject_sender_login_mismatch' into mdbox-format

Dominik

2015-04-25 afe87b044dc20ceb104b31213543c14b562facd7

 interface/web/dns/templates/dns_wizard.htm

@@ -1,80 +1,133 @@
<h2><tmpl_var name="list_head_txt"></h2>
<div class='page-header'>
   <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>

<tmpl_if name="error">
   <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
    <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
</tmpl_if>

<div class="panel panel_dns_wizard">

  <div class="pnl_formsarea">
    <fieldset class="inlineLabels"><legend>DNS Zone</legend>
      <div class="ctrlHolder">
         <label for="template_id">{tmpl_var name='template_id_txt'}</label>
        <select name="template_id" id="template_id" class="selectInput">
               {tmpl_var name='template_id_option'}
            </select>
      </div>
      <tmpl_if name="is_admin">
      <div class="ctrlHolder">
         <label for="server_id">{tmpl_var name='server_id_txt'}</label>
        <select name="server_id" id="server_id" class="selectInput">
               {tmpl_var name='server_id'}
            </select>
      </div>
      <div class="ctrlHolder">
         <label for="client_group_id">{tmpl_var name='client_txt'}</label>
        <select name="client_group_id" id="client_group_id" class="selectInput">
               {tmpl_var name='client_group_id'}
            </select>
      </div>
      </tmpl_if>
     <tmpl_if name="is_reseller">
     <div class="ctrlHolder">
         <label for="client_group_id">{tmpl_var name='client_txt'}</label>
        <select name="client_group_id" id="client_group_id" class="selectInput">
               {tmpl_var name='client_group_id'}
            </select>
      </div>
     </tmpl_if>
        <tmpl_if name="DOMAIN_VISIBLE">
         <div class="ctrlHolder">
            <label for="domain">{tmpl_var name='domain_txt'}</label>
           <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
        </tmpl_if>
        <tmpl_if name="IP_VISIBLE">
         <div class="ctrlHolder">
            <label for="ip">{tmpl_var name='ip_txt'}</label>
           <input name="ip" id="ip" value="{tmpl_var name='ip'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
        </tmpl_if>
        <tmpl_if name="NS1_VISIBLE">
         <div class="ctrlHolder">
            <label for="ns1">{tmpl_var name='ns1_txt'}</label>
           <input name="ns1" id="ns1" value="{tmpl_var name='ns1'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
        </tmpl_if>
        <tmpl_if name="NS2_VISIBLE">
         <div class="ctrlHolder">
            <label for="ns2">{tmpl_var name='ns2_txt'}</label>
           <input name="ns2" id="ns2" value="{tmpl_var name='ns2'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
        </tmpl_if>
        <tmpl_if name="EMAIL_VISIBLE">
         <div class="ctrlHolder">
            <label for="email">{tmpl_var name='email_txt'}</label>
           <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
            </div>
        </tmpl_if>
    </fieldset>
        <legend><tmpl_var name="dns_zone_txt"></legend>
            <div class="form-group">
                <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
                <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control" onChange="ISPConfig.submitForm('pageForm','dns/dns_wizard.php')">
                    {tmpl_var name='template_id_option'}
                </select></div>
            </div>
            <tmpl_if name="is_admin">
                <div class="form-group">
                    <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                    <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                        {tmpl_var name='server_id'}
                    </select></div>
                </div>
                <tmpl_unless name="domain_option">
                    <div class="form-group">
                        <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>
                </tmpl_unless>
            <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="form-group">
                        <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                        <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                            {tmpl_var name='server_id'}
                        </select></div>
                    </div>
                </tmpl_if>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <tmpl_unless name="domain_option">
                    <div class="form-group">
                        <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>
                </tmpl_unless>
            </tmpl_if>
            <tmpl_if name="DOMAIN_VISIBLE">
                <div class="form-group">
                    <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                    <tmpl_if name="domain_option">
                        <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                            {tmpl_var name='domain_option'}
                        </select></div>
                        <tmpl_else>
                            <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
                </div>
            </tmpl_if>
            <tmpl_if name="IP_VISIBLE">
                <div class="form-group">
                    <label for="ip" class="col-sm-3 control-label">{tmpl_var name='ip_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" /></div></div>
            </tmpl_if>
            <tmpl_if name="IPV6_VISIBLE">
                <div class="form-group">
                    <label for="ipv6" class="col-sm-3 control-label">{tmpl_var name='ipv6_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" /></div></div>
            </tmpl_if>
            <tmpl_if name="NS1_VISIBLE">
                <div class="form-group">
                    <label for="ns1" class="col-sm-3 control-label">{tmpl_var name='ns1_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="ns1" id="ns1" value="{tmpl_var name='ns1'}" class="form-control" /></div></div>
            </tmpl_if>
            <tmpl_if name="NS2_VISIBLE">
                <div class="form-group">
                    <label for="ns2" class="col-sm-3 control-label">{tmpl_var name='ns2_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="ns2" id="ns2" value="{tmpl_var name='ns2'}" class="form-control" /></div></div>
            </tmpl_if>
            <tmpl_if name="EMAIL_VISIBLE">
                <div class="form-group">
                    <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
            </tmpl_if>
            <tmpl_if name="DKIM_VISIBLE">
          <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
                    <input name="dkim" type="hidden" maxlength="255" type="text"/>
            </tmpl_if>

     <input type="hidden" name="create" value="0" />
    
    <div class="buttonHolder buttons">
      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onClick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
    </div>
  </div>
  
</div>
        
            
        <input type="hidden" name="create" value="0" />
            
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; ISPConfig.submitForm('pageForm','dns/dns_wizard.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="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
<script language="JavaScript" type="text/javascript">
    jQuery('#ip').ispconfigSearch({
        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
        minChars: 0,
        cssPrefix: 'df-',
        fillSearchField: true,
        fillSearchFieldWith: 'fill_text',
        searchFieldWatermark: '',
        resultBoxPosition: ''
    });	
</script>
<script language="JavaScript" type="text/javascript">
    jQuery('#ipv6').ispconfigSearch({
        dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
        minChars: 0,
        cssPrefix: 'df-',
        fillSearchField: true,
        fillSearchFieldWith: 'fill_text',
        searchFieldWatermark: '',
        resultBoxPosition: ''
    });
</script>