Merged revisions 2681-2739 from 3.0.4 stable branch.

tbrehm

2011-10-21 8ab3cdc09cfbac3157e996664616c229214f6c8d

 interface/web/admin/templates/server_edit_services.htm

@@ -46,18 +46,6 @@
               </div>
         </div>
     <div class="ctrlHolder">
                <p class="label">{tmpl_var name='proxy_server_txt'}</p>
                    <div class="multiField">
                        {tmpl_var name='proxy_server'}
                    </div>
      </div>
      <div class="ctrlHolder">
                <p class="label">{tmpl_var name='firewall_server_txt'}</p>
                    <div class="multiField">
                        {tmpl_var name='firewall_server'}
                    </div>
      </div>
     <div class="ctrlHolder">
      <label for="mirror_server_id">{tmpl_var name='mirror_server_id_txt'}</label>
        <select name="mirror_server_id" id="server_id" class="selectInput">
        {tmpl_var name='mirror_server_id'}