firewall: prune virtual ip section

src/www/firewall_virtual_ip.php

@@ -292,11 +292,10 @@ $main_buttons = array(
             print_info_box_apply(gettext("The VIP configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));
         ?>
         <section class="col-xs-12">
-            <div class="content-box-main content-box">
+          <div class="content-box tab-content">
             <form action="firewall_virtual_ip.php" method="post" name="iform" id="iform">
               <input type="hidden" id="id" name="id" value="" />
               <input type="hidden" id="action" name="act" value="" />
-                <div class="table-responsive">
               <table class="table table-striped">
                 <thead>
                   <tr>
@@ -371,14 +370,13 @@ $main_buttons = array(
                       </a>
                     </td>
                   </tr>
+                  <tr>
+                    <td colspan="6">
+                      <?=sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %shere%s.'),'<a href="carp_status.php">','</a>')?></span>
+                    </td>
+                  </tr>
                 </tbody>
               </table>
-                </div>
-                <div class="container-fluid">
-                  <p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br />
-                  </strong></span><?=sprintf(gettext("The virtual IP addresses defined on this page may be used in %sNAT mappings%s."),'<a href="firewall_nat.php">','</a>');?><br />
-                  <?=sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %shere%s.'),'<a href="carp_status.php">','</a>')?></span></p>
-                </div>
             </form>
           </div>
         </section>

src/www/firewall_virtual_ip_edit.php

@@ -308,9 +308,8 @@ $( document ).ready(function() {
       <div class="row">
         <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
         <section class="col-xs-12">
-          <div class="content-box">
+          <div class="content-box tab-content">
             <form action="firewall_virtual_ip_edit.php" method="post" name="iform" id="iform">
-              <div class="table-responsive">
               <table class="table table-striped">
                 <thead></thead>
                 <tbody>
@@ -322,7 +321,7 @@ $( document ).ready(function() {
                     </td>
                   </tr>
                   <tr>
-                      <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Type");?></td>
+                    <td><a id="help_for_mode" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Type');?></td>
                     <td>
                       <select id="mode" name="mode" class="selectpicker" data-width="auto" data-live-search="true">
                         <option value="ipalias" <?=$pconfig['mode'] == "ipalias" ? "selected=\"selected\"" : ""; ?>><?=gettext("IP Alias");?></option>
@@ -330,6 +329,9 @@ $( document ).ready(function() {
                         <option value="proxyarp" <?=$pconfig['mode'] == "proxyarp" ? "selected=\"selected\"" : ""; ?>><?=gettext("Proxy ARP");?></option>
                         <option value="other" <?=$pconfig['mode'] == "other" ? "selected=\"selected\"" : ""; ?>><?=gettext("Other");?></option>
                       </select>
+                      <div class="hidden" for="help_for_mode">
+                        <?=gettext("Proxy ARP and other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these cases.");?>
+                      </div>
                     </td>
                   </tr>
                   <tr>
@@ -470,16 +472,7 @@ $( document ).ready(function() {
                   </tr>
                 </tbody>
               </table>
-              </div>
             </form>
-            <div class="container-fluid">
-              <span class="text-danger">
-                <strong><?=gettext("Note:");?><br /></strong>
-              </span>
-              <?=gettext("Proxy ARP and other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these cases.");?>
-              <br /><br />
-              <?= sprintf(gettext("For more information on CARP and the above values, visit the OpenBSD %sCARP FAQ%s."), "<a href='http://www.openbsd.org/faq/pf/carp.html'>","</a>" ) ?>
-            </div>
           </div>
         </section>
       </div>