From: Marcin Haba <marcin.haba@bacula.pl>
Date: Tue, 3 Dec 2019 05:09:48 +0000 (+0100)
Subject: baculum: Use new icons in restore and fileset browsers
X-Git-Tag: Release-9.6.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488c72d83b8505c93d0d70ff808dbb3eefd865a4;p=thirdparty%2Fbacula.git

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 6ad943e51..2e750fdb1 100644
--- 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 ec935a057..104c83150 100644
--- 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 496d14abd..c4f616773 100644
--- 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
index b488acba5..000000000
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
index e808ec91d..000000000
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
index 7f56713a9..000000000
Binary files a/gui/baculum/themes/Baculum-v2/link-icon.png and /dev/null differ