baculum: Use new icons in restore and fileset browsers

diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page
index 6ad943e5157058d18d2c2e84e3c04ece0ba4cfc5..2e750fdb1a7a4096a26a90a833f9cfb7bca8605f 100644 (file)
--- a/gui/baculum/protected/Web/Pages/RestoreWizard.page
+++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page
@@ -432,7 +432,7 @@ oJobsToRestoreList.init();
                                                                <com:TActiveTemplateColumn>
                                                                        <prop:ItemTemplate>
                                                                                <com:TPanel ID="FileElementLeft" CssClass="draggable">
-                                                                                       <img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/<%=($this->getParent()->Data['type'] == 'dir' ? 'directory-icon' : 'file-icon')%>.png" alt="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file' %>" /> <%=($this->getParent()->Data['name'] != '/') ? preg_replace('/\/$/', '', $this->getParent()->Data['name']) : '/'%>
+                                                                                       <i class="fas fa-<%=($this->getParent()->Data['type'] == 'dir' ? 'folder w3-text-green' : 'file-alt w3-text-gray')%> item_icon" alt="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file' %>"></i> <%=($this->getParent()->Data['name'] != '/') ? preg_replace('/\/$/', '', $this->getParent()->Data['name']) : '/'%>
                                                                                <div class="restore-browser-element-size">
                                                                                        <com:TActiveLinkButton
                                                                                                CssClass="link"
@@ -504,7 +504,7 @@ oJobsToRestoreList.init();
                                                                        <prop:ItemTemplate>
                                                                                <com:TPanel ID="FileElementToRestore" CssClass="draggable" Style="height: 28px;">
                                                                                        <span class="w3-third">
-                                                                                               <img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/<%=($this->getParent()->Data['type'] == 'dir' ? 'directory-icon' : 'file-icon')%>.png" alt="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file'%>" />
+                                                                                               <i class="fas fa-<%=($this->getParent()->Data['type'] == 'dir' ? 'folder w3-text-green' : 'file-alt w3-text-gray')%> item_icon" alt="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file'%>"></i>
                                                                                                 <%=$this->getParent()->Data['name']%>
                                                                                        </span>
                                                                                        <span class="w3-third">
@@ -579,7 +579,7 @@ oJobsToRestoreList.init();
                                                                                <prop:ItemTemplate>
                                                                                                <com:TPanel ID="FileElement" Style="clear: both">
                                                                                                        <span class="w3-third">
-                                                                                                               <img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/<%=($this->getParent()->Data['type'] == 'dir' ? 'directory-icon' : 'file-icon')%>.png" alt="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file'%>" />
+                                                                                                               <i class="fas fa-<%=($this->getParent()->Data['type'] == 'dir' ? 'folder w3-text-green' : 'file-alt w3-text-gray')%> item_icon" title="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file'%>"></i>
                                                                                                                <%=$this->getParent()->Data['name']%>
                                                                                                        </span>
                                                                                                        <span class="w3-third">

diff --git a/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl b/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl
index ec935a057bb03e82759cbc51c67c5d17e42c42ee..104c83150eff8bd388edab879827c672b8976372 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl
+++ b/gui/baculum/protected/Web/Portlets/FileSetBrowser.tpl
@@ -60,9 +60,9 @@ var oFileSetBrowser<%=$this->ClientID%> = {
                item_inc_exc_btn: 'item_inc_exc_btn w3-medium',
                item_selected_del_btn: 'item_selected_del_btn',
                item_name: 'item_name w3-medium',
-               dir_img: 'dir_item_img',
-               file_img: 'file_item_img',
-               link_img: 'link_item_img'
+               dir_img: 'fas fa-folder w3-text-green item_icon',
+               file_img: 'fas fa-file-alt w3-text-gray item_icon',
+               link_img: 'fas fa-link w3-text-gray item_icon'
        },
        init: function() {
                this.file_content = document.getElementById(this.ids.file_container);
@@ -153,7 +153,7 @@ var oFileSetBrowser<%=$this->ClientID%> = {
                el.className = this.css.item;
                el.setAttribute('rel', item.item);
                var title = item_name;
-               var img = document.createElement('DIV');
+               var img = document.createElement('I');
                if (item.type === 'd') {
                        img.className = this.css.dir_img;
                        el.addEventListener('click', function(e) {
@@ -208,7 +208,7 @@ var oFileSetBrowser<%=$this->ClientID%> = {
                var el = document.createElement('DIV');
                el.className = this.css.item;
                el.setAttribute('rel', item_name);
-               var img = document.createElement('DIV');
+               var img = document.createElement('I');
                img.className = this.css.dir_img;
                var name = document.createElement('DIV');
                name.className  = this.css.item_name;

diff --git a/gui/baculum/themes/Baculum-v2/css/baculum.css b/gui/baculum/themes/Baculum-v2/css/baculum.css
index 496d14abd59d9e05a0fcf131527eed67d2af8f09..c4f616773c64b1e4d503c5e6719dbfae355d0b54 100644 (file)
--- a/gui/baculum/themes/Baculum-v2/css/baculum.css
+++ b/gui/baculum/themes/Baculum-v2/css/baculum.css
@@ -167,6 +167,10 @@ div.config_directives {
        text-decoration: underline;
 }
 
+.item i {
+       float: left;
+}
+
 .item, .item_included, .item_excluded {
        padding: 4px 0 4px 4px;
        background-color: transparent;
@@ -200,23 +204,9 @@ div.config_directives {
        padding-left: 5px;
 }
 
-.dir_item_img, .file_item_img, .link_item_img {
-       width: 30px;
-       height: 24px;
-       background-repeat: no-repeat;
-       float: left;
-}
-
-.dir_item_img {
-       background-image: url('/themes/Baculum-v2/directory-icon.png');
-}
-
-.file_item_img {
-       background-image: url('/themes/Baculum-v2/file-icon.png');
-}
-
-.link_item_img {
-       background-image: url('/themes/Baculum-v2/link-icon.png');
+.item_icon {
+       font-size: 24px;
+       vertical-align: bottom;
 }
 
 ul.new_element_menu {

diff --git a/gui/baculum/themes/Baculum-v2/directory-icon.png b/gui/baculum/themes/Baculum-v2/directory-icon.png
deleted file mode 100644 (file)
index b488acb..0000000
Binary files a/gui/baculum/themes/Baculum-v2/directory-icon.png and /dev/null differ

diff --git a/gui/baculum/themes/Baculum-v2/file-icon.png b/gui/baculum/themes/Baculum-v2/file-icon.png
deleted file mode 100644 (file)
index e808ec9..0000000
Binary files a/gui/baculum/themes/Baculum-v2/file-icon.png and /dev/null differ

diff --git a/gui/baculum/themes/Baculum-v2/link-icon.png b/gui/baculum/themes/Baculum-v2/link-icon.png
deleted file mode 100644 (file)
index 7f56713..0000000
Binary files a/gui/baculum/themes/Baculum-v2/link-icon.png and /dev/null differ