From 222aaefbbc817b18ec8ded587b711caaaacae36e Mon Sep 17 00:00:00 2001
From: NOYB <Al_Stu@Frontier.com>
Date: Tue, 6 Feb 2018 13:42:04 -0800
Subject: [PATCH] Firewall Logs Widget - Settings Form Layout

Options labeling and arrangement
Space utilization
---
 .../opnsense/assets/stylesheets/main.scss     | 22 +++++++++--
 .../www/themes/opnsense/build/css/main.css    | 17 +++++++--
 src/www/widgets/widgets/log.widget.php        | 37 ++++++++-----------
 3 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/opnsense/www/themes/opnsense/assets/stylesheets/main.scss b/src/opnsense/www/themes/opnsense/assets/stylesheets/main.scss
index 6c3cbad04..c7372c5e1 100644
--- a/src/opnsense/www/themes/opnsense/assets/stylesheets/main.scss
+++ b/src/opnsense/www/themes/opnsense/assets/stylesheets/main.scss
@@ -676,11 +676,25 @@ label>input[type="radio"] {
   float:left;
 }
 
-#log-settings label[for^="act"] {
-  margin-right: 1.5em;
-}
-
 output[for*="help_for"] {
   padding-top: 0.4em;
   padding-bottom: 0.4em;
 }
+
+#log-settings label[for^="act"] {
+  margin-right: 1.5em;
+}
+
+#log-settings table>tbody>tr>td {
+  vertical-align: middle;
+}
+
+#log-settings select#filterlogentries,
+#log-settings select#filterlogentriesupdateinterval {
+  width: 5em;
+}
+
+#log-settings select#filterlogentriesinterfaces {
+  min-width: 100%;
+  max-width: 100%;
+}
diff --git a/src/opnsense/www/themes/opnsense/build/css/main.css b/src/opnsense/www/themes/opnsense/build/css/main.css
index cadaf11b9..326d8d414 100644
--- a/src/opnsense/www/themes/opnsense/build/css/main.css
+++ b/src/opnsense/www/themes/opnsense/build/css/main.css
@@ -5891,9 +5891,20 @@ label > input[type="radio"] {
   margin-right: .4em;
   float: left; }
 
-#log-settings label[for^="act"] {
-  margin-right: 1.5em; }
-
 output[for*="help_for"] {
   padding-top: 0.4em;
   padding-bottom: 0.4em; }
+
+#log-settings label[for^="act"] {
+  margin-right: 1.5em; }
+
+#log-settings table>tbody>tr>td {
+  vertical-align: middle; }
+
+#log-settings select#filterlogentries,
+#log-settings select#filterlogentriesupdateinterval {
+  width: 5em; }
+
+#log-settings select#filterlogentriesinterfaces {
+  min-width: 100%;
+  max-width: 100%; }
diff --git a/src/www/widgets/widgets/log.widget.php b/src/www/widgets/widgets/log.widget.php
index bb53e6417..e5b9594e1 100644
--- a/src/www/widgets/widgets/log.widget.php
+++ b/src/www/widgets/widgets/log.widget.php
@@ -176,14 +176,12 @@ $nentriesinterfaces = isset($config['widgets']['filterlogentriesinterfaces']) ?
 
 <div id="log-settings" class="widgetconfigdiv" style="display:none;">
   <form action="/widgets/widgets/log.widget.php" method="post" name="iforma">
-      <table class="table table-striped">
+      <table class="table table-striped table-condensed">
         <tbody>
           <tr>
             <td>
-              <?= gettext('Number of lines to display:') ?>
+              <label for="filterlogentries"><?= gettext('Quantity:') ?><br /><small>(<?= gettext('log entires') ?>)</small></label>
             </td>
-          </tr>
-          <tr>
             <td>
               <select name="filterlogentries" class="formfld unknown" id="filterlogentries">
 <?php
@@ -193,13 +191,9 @@ $nentriesinterfaces = isset($config['widgets']['filterlogentriesinterfaces']) ?
               endfor;?>
               </select>
             </td>
-          </tr>
-          <tr>
-            <td>
-              <?= gettext('Update interval (seconds):') ?>
+            <td class="text-right" style="width: 100%">
+              <label for="filterlogentriesupdateinterval"><?= gettext('Update interval:') ?><br /><small>(<?= gettext('seconds') ?>)</small></label>
             </td>
-          </tr>
-          <tr>
             <td>
               <select name="filterlogentriesupdateinterval" class="formfld unknown" id="filterlogentriesupdateinterval">
 <?php
@@ -212,18 +206,9 @@ $nentriesinterfaces = isset($config['widgets']['filterlogentriesinterfaces']) ?
           </tr>
           <tr>
             <td>
-              <label for="actpass"><input id="actpass"   name="actpass"   type="checkbox" value="Pass"   <?=in_array('Pass', $nentriesacts) ? "checked=\"checked\"" : "";?>/>Pass</label>
-              <label for="actblock"><input id="actblock"  name="actblock"  type="checkbox" value="Block"  <?=in_array('Block', $nentriesacts) ? "checked=\"checked\"" : "";?>/>Block</label>
-              <label for="actreject"><input id="actreject" name="actreject" type="checkbox" value="Reject" <?=in_array('Reject', $nentriesacts) ? "checked=\"checked\"" : "";?>/>Reject</label>
+              <label for="filterlogentriesinterfaces"><?= gettext('Interfaces:'); ?></label>
             </td>
-          </tr>
-          <tr>
-            <td>
-              <?= gettext('Interfaces:'); ?>
-            </td>
-          </tr>
-          <tr>
-            <td>
+            <td colspan="3" style="width: 100%">
               <select id="filterlogentriesinterfaces" name="filterlogentriesinterfaces">
                 <option value="All"><?= gettext('ALL') ?></option>
 <?php
@@ -238,7 +223,15 @@ $nentriesinterfaces = isset($config['widgets']['filterlogentriesinterfaces']) ?
           </tr>
           <tr>
             <td>
-              <input id="submita" name="submita" type="submit" class="btn btn-primary formbtn" value="<?= gettext('Save') ?>" />
+              <label><?= gettext('Filter:') ?><br /><small>(<?= gettext('action') ?>)</small></label>
+            </td>
+            <td colspan="2" style="width: 100%">
+              <label for="actpass"><input id="actpass" name="actpass" type="checkbox" value="Pass" <?=in_array('Pass', $nentriesacts) ? "checked=\"checked\"" : "";?> />Pass</label>
+              <label for="actblock"><input id="actblock" name="actblock" type="checkbox" value="Block" <?=in_array('Block', $nentriesacts) ? "checked=\"checked\"" : "";?> />Block</label>
+              <label for="actreject"><input id="actreject" name="actreject" type="checkbox" value="Reject" <?=in_array('Reject', $nentriesacts) ? "checked=\"checked\"" : "";?> />Reject</label>
+            </td>
+            <td class="text-right">
+              <input id="submit_firewall_logs_widget" name="submit_firewall_logs_widget" type="submit" class="btn btn-primary formbtn" value="<?= gettext('Save') ?>" />
             </td>
           </tr>
         </tbody>