From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 29 Nov 2014 20:20:14 +0000 (+0100)
Subject: baculum: Add window options button
X-Git-Tag: Release-7.2.0~110
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5e43035a57b39b65650698f3ff35d206b97234c9;p=bacula%2Fbacula

baculum: Add window options button
---

diff --git a/gui/baculum/protected/JavaScript/slide-window.js b/gui/baculum/protected/JavaScript/slide-window.js
index ed9857410e..8ee9938172 100644
--- a/gui/baculum/protected/JavaScript/slide-window.js
+++ b/gui/baculum/protected/JavaScript/slide-window.js
@@ -7,6 +7,8 @@ var SlideWindowClass = Class.create({
 	fullSizeEl : null,
 	search: null,
 	toolbar: null,
+	tools: null,
+	options: null,
 	configurationObj: null,
 	loadRequest : null,
 	repeaterEl: null,
@@ -30,6 +32,7 @@ var SlideWindowClass = Class.create({
 		contentItems : 'slide-window-element',
 		contentAlternatingItems : 'slide-window-element-alternating',
 		toolsButtonSuffix : '-slide-window-tools',
+		optionsButtonSuffix : '-slide-window-options',
 		actionsSuffix : '-slide-window-actions',
 		toolbarSuffix : '-slide-window-toolbar',
 		titleSuffix : '-slide-window-title'
@@ -43,6 +46,7 @@ var SlideWindowClass = Class.create({
 		this.windowId = windowId;
 		this.window = $(this.windowId + this.elements.containerSuffix);
 		this.tools = $(this.windowId + this.elements.toolsButtonSuffix);
+		this.options = $(this.windowId + this.elements.optionsButtonSuffix);
 		
 		if(data.hasOwnProperty('showId')) {
 				this.showEl = $(data.showId);
@@ -112,6 +116,10 @@ var SlideWindowClass = Class.create({
 		this.tools.observe('click', function() {
 			this.toggleToolbar();
 		}.bind(this));
+
+		this.options.observe('click', function() {
+			this.toggleToolbar();
+		}.bind(this));
 	},
 	
 	openWindow : function() {
diff --git a/gui/baculum/protected/Portlets/SlideWindow.tpl b/gui/baculum/protected/Portlets/SlideWindow.tpl
index 01e06f7f92..aa0ca6b5a8 100644
--- a/gui/baculum/protected/Portlets/SlideWindow.tpl
+++ b/gui/baculum/protected/Portlets/SlideWindow.tpl
@@ -2,6 +2,7 @@
 	<div id="<%=$this->getParent()->getID()%>-slide-window-progress" class="slide-window-progress"></div>
 	<div class="slide-window-content">
 		<com:TContentPlaceHolder ID="SlideWindowContent" />
+		<div id="<%=$this->getParent()->getID()%>-slide-window-options" class="slide-window-options"></div>
 		<div id="<%=$this->getParent()->getID()%>-slide-window-toolbar" class="slide-window-toolbar" style="display: none">
 			<com:TImageButton ImageUrl="<%=$this->getPage()->getTheme()->getBaseUrl()%>/close.png" Style="margin: 5px 5px 0 0;float: right;" Attributes.onclick="SlideWindow.getObj('<%=$this->getParent()->getID()%>').toggleToolbar(); return false;" Attributes.alt="<%[ Close ]%>" ToolTip="<%[ Close ]%>" />
 			<table>
@@ -74,15 +75,15 @@
 				SlideWindow.getObj('<%=$this->getParent()->getID()%>').setLoadRequest();
 			</prop:ClientSide.OnComplete>
 		</com:TCallback>
-			<script type="text/javascript">
-				<%=$this->getParent()->getID()%>_refresh_window_func = function() {
-						var request = <%= $this->DetailView->ActiveControl->Javascript %>;
-						request.dispatch();
-					}
-				$$('input[id=<%=$this->Simple->ClientID%>], input[id=<%=$this->Details->ClientID%>], select[id=<%=$this->Limit->ClientID%>]').each(function(el) {
-					el.observe('change', <%=$this->getParent()->getID()%>_refresh_window_func);
-				});
-			</script>
+		<script type="text/javascript">
+			<%=$this->getParent()->getID()%>_refresh_window_func = function() {
+					var request = <%= $this->DetailView->ActiveControl->Javascript %>;
+					request.dispatch();
+				}
+			$$('input[id=<%=$this->Simple->ClientID%>], input[id=<%=$this->Details->ClientID%>], select[id=<%=$this->Limit->ClientID%>]').each(function(el) {
+				el.observe('change', <%=$this->getParent()->getID()%>_refresh_window_func);
+			});
+		</script>
 	</div>
 </div>
 <script type="text/javascript">
diff --git a/gui/baculum/themes/Baculum-v1/gear-icon-alpha.png b/gui/baculum/themes/Baculum-v1/gear-icon-alpha.png
new file mode 100644
index 0000000000..421396f97d
Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/gear-icon-alpha.png differ
diff --git a/gui/baculum/themes/Baculum-v1/gear-icon.png b/gui/baculum/themes/Baculum-v1/gear-icon.png
new file mode 100644
index 0000000000..7d7ee8b3ab
Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/gear-icon.png differ
diff --git a/gui/baculum/themes/Baculum-v1/style.css b/gui/baculum/themes/Baculum-v1/style.css
index bd134bb68b..326e3008f4 100644
--- a/gui/baculum/themes/Baculum-v1/style.css
+++ b/gui/baculum/themes/Baculum-v1/style.css
@@ -549,7 +549,23 @@ div.configuration-window-content {
 	padding: 10px 12px;;
 }
 
+div.slide-window-options {
+	height: 36px;
+	width: 36px;
+	z-index: 20;
+	position: absolute;
+	margin: 0;
+	padding: 0;
+	bottom: 0;
+	right: 0;
+	border: 0;
+	background: transparent url('gear-icon-alpha.png') no-repeat left 0;
+}
 
+div.slide-window-options:hover {
+	cursor: pointer;
+	background: transparent url('gear-icon.png') no-repeat left 0;
+}
 div.status-bar-append, div.status-bar-full, div.status-bar-used, div.status-bar-error, div.status-bar-purged, div.status-bar-recycle, div.status-bar-busy, div.status-bar-disabled, div.status-bar-archive, div.status-bar-cleaning, div.status-bar-read-only, div.status-bar-detail-append, div.status-bar-detail-full, div.status-bar-detail-used, div.status-bar-detail-error, div.status-bar-detail-purged, div.status-bar-detail-recycle, div.status-bar-detail-busy, div.status-bar-detail-disabled, div.status-bar-detail-archive, div.status-bar-detail-cleaning, div.status-bar-detail-read-only {
 	position: relative;
 	border: 1px solid black;