baculum: Fix small issues with old not using svg icons

diff --git a/gui/baculum/protected/Web/JavaScript/misc.js b/gui/baculum/protected/Web/JavaScript/misc.js
index 8bf2a8fcb3078c5f4750a2065df9f0c45c0df424..9e701aedb9206461e10361e82e5762e24ad8cdcf 100644 (file)
--- a/gui/baculum/protected/Web/JavaScript/misc.js
+++ b/gui/baculum/protected/Web/JavaScript/misc.js
@@ -494,11 +494,6 @@ var oLastJobsList = {
        set_events: function() {
                var self = this;
                $('#' + this.ids.last_jobs_list + ' tbody').on('click', 'tr', function (e) {
-                       var node_name = e.target.nodeName.toUpperCase();
-                       if (node_name === 'BUTTON' || node_name === 'SVG' || node_name === 'PATH') {
-                               // clicking on button doesn't cause directing to job details
-                               return;
-                       }
                        var data = self.last_jobs_table.row(this).data();
                        document.location.href = '/web/job/history/' + data.jobid + '/'
                });
@@ -747,7 +742,7 @@ var Users = {
        hide_loader: function() {
                setTimeout(function() {
                        if (this.current_action === 'set_host') {
-                               $('svg[rel=\'' + this.ids.set_host.rel_user_host + '\']').css({visibility: 'hidden'});
+                               $('I[rel=\'' + this.ids.set_host.rel_user_host + '\']').css({visibility: 'hidden'});
                        }
                }.bind(this), 300);
 

diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
index 8598d99b05272ef41faf07a3c23e858dace0a62e..397d1c161e9d189a95b17bb1d4d97f5ffd24ee40 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
@@ -9,18 +9,18 @@
                                        var t = (event.target||event.srcElement);
                                        var nn = t.nodeName.toUpperCase();
                                        var res_id = '<%=$this->Resource->ClientID%>';
-                                       if (nn != 'SVG' && nn != 'PATH' && t.parentNode.id != res_id && t.id != res_id && !/^<%=$this->RemoveResource->ClientID%>/.test(t.id)) {
+                                       if (nn != 'I' && t.parentNode.id != res_id && t.id != res_id && !/^<%=$this->RemoveResource->ClientID%>/.test(t.id)) {
                                                $('.validate, .validator').hide(); // hide validator messages
                                                $('#' + res_id).trigger('click');
                                        }
                                };
                                document.getElementById('<%=$this->RemoveResource->ClientID%>').onclick = function(event) {
-                                       var t = (event.target||event.srcElement);
+                                       var t = event.target || event.srcElement;
                                        var nn = t.nodeName.toUpperCase();
                                        var cmsg = '<%[ Are you sure that you want to remove %s resource "%s"? ]%>';
                                        cmsg = cmsg.replace('%s', '<%=$this->Data['resource_type']%>');
                                        cmsg = cmsg.replace('%s', '<%=$this->Data['resource_name']%>');
-                                       if ((/^<%=$this->RemoveResource->ClientID%>/.test(t.id) || nn == 'SVG' || nn == 'PATH') && confirm(cmsg)) {
+                                       if ((/^<%=$this->RemoveResource->ClientID%>/.test(t.id) || nn == 'I') && confirm(cmsg)) {
                                                return true;
                                        }
                                        return false;

diff --git a/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl b/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl
index c7ee08a51eef6ba9bdfe271ad77036d6086d05d3..ec935a057bb03e82759cbc51c67c5d17e42c42ee 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl
+++ b/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl
@@ -250,10 +250,6 @@ var oFileSetBrowser<%=$this->ClientID%> = {
                el.setAttribute('rel', item);
                var name = document.createElement('DIV');
                name.textContent = item;
-               /**
-                * Container is needed, because <i> is replaced to SVG icon
-                * and it is impossible to set click event.
-                */
                var del_btn_container = document.createElement('DIV');
                var del_btn = document.createElement('I');
                del_btn.className = 'fa fa-trash-alt item_selected_del_btn';
@@ -271,10 +267,6 @@ var oFileSetBrowser<%=$this->ClientID%> = {
                el.setAttribute('rel', item);
                var name = document.createElement('DIV');
                name.textContent = item;
-               /**
-                * Container is needed, because <i> is replaced to SVG icon
-                * and it is impossible to set click event.
-                */
                var del_btn_container = document.createElement('DIV');
                var del_btn = document.createElement('I');
                del_btn.className = 'fa fa-trash-alt item_selected_del_btn';