baculum: Fix sub-tabs on client and on storage pages

diff --git a/gui/baculum/protected/Common/JavaScript/misc.js b/gui/baculum/protected/Common/JavaScript/misc.js
index 252443cfb82e1a074d4ce4e9de0998e9970a355c..0457f3129635e196259b83f4a6e99349cb99c569 100644 (file)
--- a/gui/baculum/protected/Common/JavaScript/misc.js
+++ b/gui/baculum/protected/Common/JavaScript/misc.js
@@ -26,8 +26,9 @@ var Cookies = {
 }
 
 var W3TabsCommon = {
-       open: function(btn_id, item_id) {
-               var tab_items = document.getElementsByClassName(this.css.tab_item);
+       open: function(btn_id, item_id, item_container_id) {
+               var root = document.getElementById(item_container_id) || document;
+               var tab_items = root.getElementsByClassName(this.css.tab_item);
                for (var i = 0; i < tab_items.length; i++) {
                        if (tab_items[i].id === item_id) {
                                tab_items[i].style.display = 'block';
@@ -35,7 +36,7 @@ var W3TabsCommon = {
                                tab_items[i].style.display = 'none';
                        }
                }
-               var tab_btns = document.getElementsByClassName(this.css.tab_btn);
+               var tab_btns = root.getElementsByClassName(this.css.tab_btn);
                for (var i = 0; i < tab_btns.length; i++) {
                        if (tab_btns[i].id === btn_id && !tab_btns[i].classList.contains(this.css.tab_item_hover)) {
                                tab_btns[i].classList.add(this.css.tab_item_hover);
@@ -70,8 +71,8 @@ var W3SubTabs = {
                tab_item: 'subtab_item',
                tab_item_hover: 'w3-border-red'
        },
-       open: function(btn_id, item_id) {
-               W3TabsCommon.open.call(this, btn_id, item_id);
+       open: function(btn_id, item_id, item_container_id) {
+               W3TabsCommon.open.call(this, btn_id, item_id, item_container_id);
        }
 };
 

diff --git a/gui/baculum/protected/Web/Pages/ClientView.page b/gui/baculum/protected/Web/Pages/ClientView.page
index f6b20458a3abbe96664cfa6d32dbc1b517585222..45b1007afe527b8e608f73119652f3e37fca8c3d 100644 (file)
--- a/gui/baculum/protected/Web/Pages/ClientView.page
+++ b/gui/baculum/protected/Web/Pages/ClientView.page
@@ -95,10 +95,10 @@
                        </div>
                        <div class="w3-panel w3-card w3-light-grey" style="padding-bottom: 16px;">
                                <div class="w3-row">
-                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_client_subtab_graphical', 'status_client_graphical_output');">
+                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_client_subtab_graphical', 'status_client_graphical_output', 'status_client_container');">
                                                <div id="status_client_subtab_graphical" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-border-red w3-padding"><%[ Graphical status ]%></div>
                                         </a>
-                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_client_subtab_text', 'status_client_text_output');">
+                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_client_subtab_text', 'status_client_text_output', 'status_client_container');">
                                                <div id="status_client_subtab_text" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-padding"><%[ Raw status ]%></div>
                                        </a>
                                </div>
@@ -545,7 +545,7 @@ var oGraphicalClientStatus = {
                } else if (not_supported.style.display == 'none') {
                        not_supported.style.display = '';
                        graphical_container.style.display = 'none';
-                       W3SubTabs.open('status_client_subtab_text', 'status_client_text_output');
+                       W3SubTabs.open('status_client_subtab_text', 'status_client_text_output', 'status_client_container');
                }
                return supported;
        },
@@ -914,22 +914,22 @@ function load_fd_res_config(resource) {
 }
                </script>
                <div class="w3-row w3-margin-bottom">
-                       <a href="javascript:void(0)" onclick="load_fd_filedaemon_config('FileDaemon'); W3SubTabs.open('filedaemon_filedaemon_config_btn', 'filedaemon_filedaemon_config_form');">
+                       <a href="javascript:void(0)" onclick="load_fd_filedaemon_config('FileDaemon'); W3SubTabs.open('filedaemon_filedaemon_config_btn', 'filedaemon_filedaemon_config_form', 'filedaemon_config');">
                                <div id="filedaemon_filedaemon_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding w3-border-red">File Daemon</div>
                         </a>
-                       <a href="javascript:void(0)" onclick="load_fd_res_config('Director'); W3SubTabs.open('filedaemon_director_config_btn', 'filedaemon_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_fd_res_config('Director'); W3SubTabs.open('filedaemon_director_config_btn', 'filedaemon_resources_config_form', 'filedaemon_config');">
                                <div id="filedaemon_director_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Director</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_fd_res_config('Messages'); W3SubTabs.open('filedaemon_messages_config_btn', 'filedaemon_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_fd_res_config('Messages'); W3SubTabs.open('filedaemon_messages_config_btn', 'filedaemon_resources_config_form', 'filedaemon_config');">
                                <div id="filedaemon_messages_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Messages</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_fd_res_config('Schedule'); W3SubTabs.open('filedaemon_schedule_config_btn', 'filedaemon_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_fd_res_config('Schedule'); W3SubTabs.open('filedaemon_schedule_config_btn', 'filedaemon_resources_config_form', 'filedaemon_config');">
                                <div id="filedaemon_schedule_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Schedule</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_fd_res_config('Console'); W3SubTabs.open('filedaemon_console_config_btn', 'filedaemon_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_fd_res_config('Console'); W3SubTabs.open('filedaemon_console_config_btn', 'filedaemon_resources_config_form', 'filedaemon_config');">
                                <div id="filedaemon_console_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Console</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_fd_res_config('Statistics'); W3SubTabs.open('filedaemon_statistics_config_btn', 'filedaemon_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_fd_res_config('Statistics'); W3SubTabs.open('filedaemon_statistics_config_btn', 'filedaemon_resources_config_form', 'filedaemon_config');">
                                <div id="filedaemon_statistics_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Statistics</div>
                        </a>
                </div>

diff --git a/gui/baculum/protected/Web/Pages/StorageView.page b/gui/baculum/protected/Web/Pages/StorageView.page
index b3a87083550e8552396642757b75855ce10de6e3..a31cb0084dd5f17d925714315b0cea0cf9c191eb 100644 (file)
--- a/gui/baculum/protected/Web/Pages/StorageView.page
+++ b/gui/baculum/protected/Web/Pages/StorageView.page
@@ -226,10 +226,10 @@ var oStorageActions = {
                        </div>
                        <div class="w3-panel w3-card w3-light-grey" style="padding-bottom: 16px;">
                                <div class="w3-row">
-                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_storage_subtab_graphical', 'status_storage_graphical_output');">
+                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_storage_subtab_graphical', 'status_storage_graphical_output', 'status_storage_container');">
                                                <div id="status_storage_subtab_graphical" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-border-red w3-padding"><%[ Graphical status ]%></div>
                                         </a>
-                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_storage_subtab_text', 'status_storage_text_output');">
+                                       <a href="javascript:void(0)" onclick="W3SubTabs.open('status_storage_subtab_text', 'status_storage_text_output', 'status_storage_container');">
                                                <div id="status_storage_subtab_text" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-padding"><%[ Raw status ]%></div>
                                        </a>
                                </div>
@@ -1568,7 +1568,7 @@ var oGraphicalStorageStatus = {
                } else if (not_supported.style.display == 'none') {
                        not_supported.style.display = '';
                        graphical_container.style.display = 'none';
-                       W3SubTabs.open('status_storage_subtab_text', 'status_storage_text_output');
+                       W3SubTabs.open('status_storage_subtab_text', 'status_storage_text_output', 'status_storage_container');
                }
                return supported;
        },
@@ -1662,25 +1662,25 @@ function load_sd_res_config(resource) {
 }
                </script>
                <div class="w3-row w3-margin-bottom">
-                       <a href="javascript:void(0)" onclick="load_sd_storagedaemon_config(); W3SubTabs.open('sd_storagedaemon_config_btn', 'sd_storagedaemon_config_form');">
+                       <a href="javascript:void(0)" onclick="load_sd_storagedaemon_config(); W3SubTabs.open('sd_storagedaemon_config_btn', 'sd_storagedaemon_config_form', 'configure_storage_daemon');">
                                <div id="sd_storagedaemon_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding w3-border-red">Storage</div>
                         </a>
-                       <a href="javascript:void(0)" onclick="load_sd_res_config('Director'); W3SubTabs.open('storagedaemon_director_config_btn', 'sd_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_sd_res_config('Director'); W3SubTabs.open('storagedaemon_director_config_btn', 'sd_resources_config_form', 'configure_storage_daemon');">
                                <div id="storagedaemon_director_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Director</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_sd_res_config('Device'); W3SubTabs.open('storagedaemon_device_config_btn', 'sd_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_sd_res_config('Device'); W3SubTabs.open('storagedaemon_device_config_btn', 'sd_resources_config_form', 'configure_storage_daemon');">
                                <div id="storagedaemon_device_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Device</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_sd_res_config('Autochanger'); W3SubTabs.open('storagedaemon_autochanger_config_btn', 'sd_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_sd_res_config('Autochanger'); W3SubTabs.open('storagedaemon_autochanger_config_btn', 'sd_resources_config_form', 'configure_storage_daemon');">
                                <div id="storagedaemon_autochanger_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Autochanger</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_sd_res_config('Messages'); W3SubTabs.open('storagedaemon_messages_config_btn', 'sd_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_sd_res_config('Messages'); W3SubTabs.open('storagedaemon_messages_config_btn', 'sd_resources_config_form', 'configure_storage_daemon');">
                                <div id="storagedaemon_messages_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Messages</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_sd_res_config('Cloud'); W3SubTabs.open('storagedaemon_cloud_config_btn', 'sd_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_sd_res_config('Cloud'); W3SubTabs.open('storagedaemon_cloud_config_btn', 'sd_resources_config_form', 'configure_storage_daemon');">
                                <div id="storagedaemon_cloud_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Cloud</div>
                        </a>
-                       <a href="javascript:void(0)" onclick="load_sd_res_config('Statistics'); W3SubTabs.open('storagedaemon_statistics_config_btn', 'sd_resources_config_form');">
+                       <a href="javascript:void(0)" onclick="load_sd_res_config('Statistics'); W3SubTabs.open('storagedaemon_statistics_config_btn', 'sd_resources_config_form', 'configure_storage_daemon');">
                                <div id="storagedaemon_statistics_config_btn" class="subtab_btn w3-col m1 w3-bottombar w3-hover-light-grey w3-padding">Statistics</div>
                        </a>
                </div>