From 9bc6eca57b0fb35ab1667da0a1f54f6f71b7035b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 27 Dec 2017 13:57:18 +0000
Subject: [PATCH] net-mgmt/zabbix-agent: fold and fix tabbing

---
 .../models/OPNsense/ZabbixAgent/Menu/Menu.xml |   6 +-
 .../app/views/OPNsense/ZabbixAgent/index.volt | 201 +++++++-----------
 2 files changed, 78 insertions(+), 129 deletions(-)

diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
index 43e9a26b4..03a723c1a 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
@@ -2,9 +2,9 @@
     <Services>
       <ZabbixAgent VisibleName="Zabbix Agent" cssClass="fa fa-certificate fa-fw">
           <Settings order="10" url="/ui/zabbixagent/">
-              <MainSettings VisibleName="Main Settings" url="/ui/zabbixagent/#subtab_zabbixagent-settings-main"/>
-              <Features VisibleName="Features" url="/ui/zabbixagent/#subtab_zabbixagent-settings-features"/>
-              <Tuning VisibleName="Tuning Parameters" url="/ui/zabbixagent/#subtab_zabbixagent-settings-features"/>
+              <Main url="/ui/zabbixagent/#tab_zabbixagent-settings-main"/>
+              <Features url="/ui/zabbixagent/#tab_zabbixagent-settings-features"/>
+              <Tuning url="/ui/zabbixagent/#tab_zabbixagent-settings-tuning"/>
           </Settings>
           <Log VisibleName="Log File" order="50" url="/diag_logs_zabbixagent.php"/>
       </ZabbixAgent>
diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/views/OPNsense/ZabbixAgent/index.volt b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/views/OPNsense/ZabbixAgent/index.volt
index 23760f1df..a8acec7d9 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/views/OPNsense/ZabbixAgent/index.volt
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/views/OPNsense/ZabbixAgent/index.volt
@@ -1,146 +1,95 @@
 {#
-
-Copyright (C) 2017 Frank Wall
-OPNsense® is Copyright © 2014 – 2015 by Deciso B.V.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1.  Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-
-2.  Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-#}
+ # Copyright (C) 2017 Frank Wall
+ # Copyright (C) 2014-2015 Deciso B.V.
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without modification,
+ # are permitted provided that the following conditions are met:
+ #
+ # 1.  Redistributions of source code must retain the above copyright notice,
+ #     this list of conditions and the following disclaimer.
+ #
+ # 2.  Redistributions in binary form must reproduce the above copyright notice,
+ #     this list of conditions and the following disclaimer in the documentation
+ #     and/or other materials provided with the distribution.
+ #
+ # THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ # AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ # AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ # OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ #}
 
 <script type="text/javascript">
+$( document ).ready(function() {
+    var data_get_map = {'frm_zabbixagent':"/api/zabbixagent/settings/get"};
 
-    $( document ).ready(function() {
-
-        var data_get_map = {'frm_zabbixagent':"/api/zabbixagent/settings/get"};
-
-        // load initial data
-        mapDataToFormUI(data_get_map).done(function(){
-            formatTokenizersUI();
-            $('.selectpicker').selectpicker('refresh');
-            // request service status on load and update status box
-            ajaxCall(url="/api/zabbixagent/service/status", sendData={}, callback=function(data,status) {
-                updateServiceStatusUI(data['status']);
-            });
+    // load initial data
+    mapDataToFormUI(data_get_map).done(function(){
+        formatTokenizersUI();
+        $('.selectpicker').selectpicker('refresh');
+        // request service status on load and update status box
+        ajaxCall(url="/api/zabbixagent/service/status", sendData={}, callback=function(data,status) {
+            updateServiceStatusUI(data['status']);
         });
+    });
 
-        /***********************************************************************
-         * Commands
-         **********************************************************************/
+    /***********************************************************************
+     * Commands
+     **********************************************************************/
 
-        // form save event handlers for all defined forms
-        $('[id*="save_"]').each(function(){
-            $(this).click(function(){
-                var frm_id = $(this).closest("form").attr("id");
-                var frm_title = $(this).closest("form").attr("data-title");
-                // save data for tab
-                saveFormToEndpoint(url="/api/zabbixagent/settings/set",formid=frm_id,callback_ok=function(){
-                    // set progress animation when reloading
-                    $("#"+frm_id+"_progress").addClass("fa fa-spinner fa-pulse");
+    // form save event handlers for all defined forms
+    $('[id*="save_"]').each(function(){
+        $(this).click(function(){
+            var frm_id = $(this).closest("form").attr("id");
+            var frm_title = $(this).closest("form").attr("data-title");
+            // save data for tab
+            saveFormToEndpoint(url="/api/zabbixagent/settings/set",formid=frm_id,callback_ok=function(){
+                // set progress animation when reloading
+                $("#"+frm_id+"_progress").addClass("fa fa-spinner fa-pulse");
 
-                    // on correct save, perform restart
-                    ajaxCall(url="/api/zabbixagent/service/reconfigure", sendData={}, callback=function(data,status){
-                        // when done, disable progress animation.
-                        $("#"+frm_id+"_progress").removeClass("fa fa-spinner fa-pulse");
+                // on correct save, perform restart
+                ajaxCall(url="/api/zabbixagent/service/reconfigure", sendData={}, callback=function(data,status){
+                    // when done, disable progress animation.
+                    $("#"+frm_id+"_progress").removeClass("fa fa-spinner fa-pulse");
 
-                        if (status != "success" || data['status'] != 'ok' ) {
-                            // fix error handling
-                            BootstrapDialog.show({
-                                type:BootstrapDialog.TYPE_WARNING,
-                                title: frm_title,
-                                message: JSON.stringify(data),
-                                draggable: true
-                            });
-                        } else {
-                            ajaxCall(url="/api/zabbixagent/service/status", sendData={}, callback=function(data,status) {
-                                updateServiceStatusUI(data['status']);
-                            });
-                        }
-                    });
+                    if (status != "success" || data['status'] != 'ok' ) {
+                        // fix error handling
+                        BootstrapDialog.show({
+                            type:BootstrapDialog.TYPE_WARNING,
+                            title: frm_title,
+                            message: JSON.stringify(data),
+                            draggable: true
+                        });
+                    } else {
+                        ajaxCall(url="/api/zabbixagent/service/status", sendData={}, callback=function(data,status) {
+                            updateServiceStatusUI(data['status']);
+                        });
+                    }
                 });
             });
         });
-
-        // update history on tab state and implement navigation
-        if(window.location.hash != "") {
-            $('a[href="' + window.location.hash + '"]').click()
-        }
-        $('.nav-tabs a').on('shown.bs.tab', function (e) {
-            history.pushState(null, null, e.target.hash);
-        });
-
     });
 
+    // update history on tab state and implement navigation
+    if(window.location.hash != "") {
+        $('a[href="' + window.location.hash + '"]').click()
+    }
+    $('.nav-tabs a').on('shown.bs.tab', function (e) {
+        history.pushState(null, null, e.target.hash);
+    });
+});
 </script>
 
-<ul class="nav nav-tabs" role="tablist"  id="maintabs">
-{% for tab in settingsForm['tabs']|default([]) %}
-    {% if tab['subtabs']|default(false) %}
-        {# Tab with dropdown #}
-
-        {# Find active subtab #}
-        {% set active_subtab="" %}
-        {% for subtab in tab['subtabs']|default({}) %}
-            {% if subtab[0]==settingsForm['activetab']|default("") %}
-                {% set active_subtab=subtab[0] %}
-            {% endif %}
-        {% endfor %}
-
-        <li role="presentation" class="dropdown {% if settingsForm['activetab']|default("") == active_subtab %}active{% endif %}">
-            <a data-toggle="dropdown" href="#" class="dropdown-toggle pull-right visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" role="button" style="border-left: 1px dashed lightgray;">
-                <b><span class="caret"></span></b>
-            </a>
-            <a data-toggle="tab" href="#subtab_{{tab['subtabs'][0][0]}}" class="visible-lg-inline-block visible-md-inline-block visible-xs-inline-block visible-sm-inline-block" style="border-right:0px;"><b>{{tab[1]}}</b></a>
-            <ul class="dropdown-menu" role="menu">
-                {% for subtab in tab['subtabs']|default({})%}
-                <li class="{% if settingsForm['activetab']|default("") == subtab[0] %}active{% endif %}"><a data-toggle="tab" href="#subtab_{{subtab[0]}}"><i class="fa fa-check-square"></i> {{subtab[1]}}</a></li>
-                {% endfor %}
-            </ul>
-        </li>
-    {% else %}
-        {# Standard Tab #}
-        <li {% if settingsForm['activetab']|default("") == tab[0] %} class="active" {% endif %}>
-            <a data-toggle="tab" href="#tab_{{tab[0]}}">
-               <b>{{tab[1]}}</b>
-            </a>
-        </li>
-    {% endif %}
-{% endfor %}
+<ul class="nav nav-tabs" role="tablist" id="maintabs">
+    {{ partial("layout_partials/base_tabs_header",['formData':settingsForm]) }}
 </ul>
 
 <div class="content-box tab-content">
-    {% for tab in settingsForm['tabs']|default([]) %}
-        {% if tab['subtabs']|default(false) %}
-            {# Tab with dropdown #}
-            {% for subtab in tab['subtabs']|default({})%}
-                <div id="subtab_{{subtab[0]}}" class="tab-pane fade{% if settingsForm['activetab']|default("") == subtab[0] %} in active {% endif %}">
-                    {{ partial("layout_partials/base_form",['fields':subtab[2],'id':'frm_'~subtab[0],'data_title':subtab[1],'apply_btn_id':'save_'~subtab[0]])}}
-                </div>
-            {% endfor %}
-        {% endif %}
-        {% if tab['subtabs']|default(false)==false %}
-            <div id="tab_{{tab[0]}}" class="tab-pane fade{% if settingsForm['activetab']|default("") == tab[0] %} in active {% endif %}">
-                {{ partial("layout_partials/base_form",['fields':tab[2],'id':'frm_'~tab[0],'apply_btn_id':'save_'~tab[0]])}}
-            </div>
-        {% endif %}
-    {% endfor %}
+    {{ partial("layout_partials/base_tabs_content",['formData':settingsForm]) }}
 </div>