From 7dab3a42734f105e1d35016b7c3e242978a04251 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 24 Nov 2017 07:34:10 +0000
Subject: [PATCH] */*: minor UX tweaks for clamav / c-icap

---
 .../app/controllers/OPNsense/ClamAV/GeneralController.php | 1 -
 .../opnsense/mvc/app/views/OPNsense/ClamAV/general.volt   | 4 ++--
 .../app/controllers/OPNsense/CICAP/GeneralController.php  | 1 -
 .../opnsense/mvc/app/views/OPNsense/CICAP/general.volt    | 8 ++++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/GeneralController.php b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/GeneralController.php
index 6e2eb9c0b..2e09c7307 100644
--- a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/GeneralController.php
+++ b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/GeneralController.php
@@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("ClamAV Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->versionForm = $this->getForm("version");
         $this->view->pick('OPNsense/ClamAV/general');
diff --git a/security/clamav/src/opnsense/mvc/app/views/OPNsense/ClamAV/general.volt b/security/clamav/src/opnsense/mvc/app/views/OPNsense/ClamAV/general.volt
index e574f1fe9..90335480d 100644
--- a/security/clamav/src/opnsense/mvc/app/views/OPNsense/ClamAV/general.volt
+++ b/security/clamav/src/opnsense/mvc/app/views/OPNsense/ClamAV/general.volt
@@ -41,9 +41,9 @@ POSSIBILITY OF SUCH DAMAGE.
     <div id="general" class="tab-pane fade in active">
         <div class="content-box" style="padding-bottom: 1.5em;">
             {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
+                <hr />
+                <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
             </div>
         </div>
     </div>
diff --git a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/GeneralController.php b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/GeneralController.php
index 878f1f325..acc1bcf06 100644
--- a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/GeneralController.php
+++ b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/GeneralController.php
@@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("C-ICAP Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->antivirusForm = $this->getForm("antivirus");
         $this->view->pick('OPNsense/CICAP/general');
diff --git a/www/c-icap/src/opnsense/mvc/app/views/OPNsense/CICAP/general.volt b/www/c-icap/src/opnsense/mvc/app/views/OPNsense/CICAP/general.volt
index e8ed5ff26..a8a751b35 100644
--- a/www/c-icap/src/opnsense/mvc/app/views/OPNsense/CICAP/general.volt
+++ b/www/c-icap/src/opnsense/mvc/app/views/OPNsense/CICAP/general.volt
@@ -37,18 +37,18 @@ POSSIBILITY OF SUCH DAMAGE.
     <div id="general" class="tab-pane fade in active">
         <div class="content-box" style="padding-bottom: 1.5em;">
             {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
+                <hr />
+                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
             </div>
         </div>
     </div>
     <div id="antivirus" class="tab-pane fade in">
         <div class="content-box" style="padding-bottom: 1.5em;">
             {{ partial("layout_partials/base_form",['fields':antivirusForm,'id':'frm_antivirus_settings'])}}
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct2" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct2_progress" class=""></i></button>
+                <hr />
+                <button class="btn btn-primary"  id="saveAct2" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct2_progress"></i></button>
             </div>
         </div>
     </div>