From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 19 Dec 2015 13:05:06 +0000 (+0100)
Subject: baculum: Add jobbytes and media type to volumes list
X-Git-Tag: Release-7.4.0~107
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d56682af09623f36d05a1a799f6d95b09dbc06d4;p=bacula%2Fbacula

baculum: Add jobbytes and media type to volumes list
---

diff --git a/gui/baculum/protected/Lang/en/messages.mo b/gui/baculum/protected/Lang/en/messages.mo
index 0596d5d710..76f61215d8 100644
Binary files a/gui/baculum/protected/Lang/en/messages.mo and b/gui/baculum/protected/Lang/en/messages.mo differ
diff --git a/gui/baculum/protected/Lang/en/messages.po b/gui/baculum/protected/Lang/en/messages.po
index 60f08c7a21..3d956bc290 100644
--- a/gui/baculum/protected/Lang/en/messages.po
+++ b/gui/baculum/protected/Lang/en/messages.po
@@ -1019,3 +1019,6 @@ msgstr "Size"
 msgid "Job:"
 msgstr "Job:"
 
+msgid "Media Type"
+msgstr "Media Type"
+
diff --git a/gui/baculum/protected/Lang/pl/messages.mo b/gui/baculum/protected/Lang/pl/messages.mo
index 7a3eb6d539..8b5aa0da10 100644
Binary files a/gui/baculum/protected/Lang/pl/messages.mo and b/gui/baculum/protected/Lang/pl/messages.mo differ
diff --git a/gui/baculum/protected/Lang/pl/messages.po b/gui/baculum/protected/Lang/pl/messages.po
index 0a1de26edf..a6dd6c206b 100644
--- a/gui/baculum/protected/Lang/pl/messages.po
+++ b/gui/baculum/protected/Lang/pl/messages.po
@@ -1020,3 +1020,6 @@ msgstr "Rozmiar"
 msgid "Job:"
 msgstr "Zadanie:"
 
+msgid "Media Type"
+msgstr "Media Type"
+
diff --git a/gui/baculum/protected/Portlets/JobList.php b/gui/baculum/protected/Portlets/JobList.php
index 93b85b1c58..c5df9f4035 100644
--- a/gui/baculum/protected/Portlets/JobList.php
+++ b/gui/baculum/protected/Portlets/JobList.php
@@ -139,8 +139,8 @@ class JobList extends Portlets implements ISlideWindow {
 	}
 
 	public function formatJobName($name) {
-		if (strlen($name) > 25) {
-			$name = substr($name, 0, 10) . '...' . substr($name, -13);
+		if (strlen($name) > 24) {
+			$name = substr($name, 0, 10) . '...' . substr($name, -11);
 		}
 		return $name;
 	}
diff --git a/gui/baculum/protected/Portlets/VolumeList.php b/gui/baculum/protected/Portlets/VolumeList.php
index 700c67a022..0465e03990 100644
--- a/gui/baculum/protected/Portlets/VolumeList.php
+++ b/gui/baculum/protected/Portlets/VolumeList.php
@@ -169,5 +169,12 @@ class VolumeList extends Portlets implements ISlideWindow {
 		}
 		$this->CheckedValues->Value = "";
 	}
+
+	public function formatVolumeField($name) {
+		if (strlen($name) > 20) {
+			$name = substr($name, 0, 7) . '...' . substr($name, -10);
+		}
+		return $name;
+	}
 }
 ?>
diff --git a/gui/baculum/protected/Portlets/VolumeList.tpl b/gui/baculum/protected/Portlets/VolumeList.tpl
index d3c7a7e1ed..59570fed82 100644
--- a/gui/baculum/protected/Portlets/VolumeList.tpl
+++ b/gui/baculum/protected/Portlets/VolumeList.tpl
@@ -31,7 +31,7 @@
                 </com:TActiveTemplateColumn>
 		<com:TActiveTemplateColumn HeaderText="<%[ Volume name ]%>" SortExpression="volumename">
 			<prop:ItemTemplate>
-				<div><%=$this->getParent()->Data['volumename']%></div>
+				<div title="<%=$this->getParent()->Data['volumename']%>"><%=$this->getPage()->VolumeWindow->formatVolumeField($this->getParent()->Data['volumename'])%></div>
 				<input type="hidden" name="<%=$this->getParent()->ClientID%>" value="<%=$this->getParent()->Data['mediaid']%>" />
 			</prop:ItemTemplate>
 		</com:TActiveTemplateColumn>
@@ -43,7 +43,7 @@
 		/>
 		<com:TActiveTemplateColumn HeaderText="<%[ Pool ]%>" SortExpression="pool">
 			<prop:ItemTemplate>
-				<%=$this->getParent()->Data['pool']['name']%>
+				<div title="<%=$this->getParent()->Data['pool']['name']%>"><%=$this->getPage()->VolumeWindow->formatVolumeField($this->getParent()->Data['pool']['name'])%></div>
 			</prop:ItemTemplate>
 		</com:TActiveTemplateColumn>
 		<com:TActiveTemplateColumn HeaderText="<%[ Status ]%>" SortExpression="volstatus">
@@ -51,6 +51,16 @@
 				<div id="<%=$this->getParent()->Data['volumename']%>_sizebar" class="status-bar-detail-<%=strtolower($this->getParent()->Data['volstatus'])%>"><%=$this->getParent()->Data['volstatus']%></div>
 			</prop:ItemTemplate>
 		</com:TActiveTemplateColumn>
+		<com:TActiveTemplateColumn HeaderText="<%[ Size ]%>" SortExpression="volbytes">
+			<prop:ItemTemplate>
+				<div class="size" rel="<%=$this->getParent()->Data['volbytes']%>"><%=$this->getParent()->Data['volbytes']%></div>
+			</prop:ItemTemplate>
+		</com:TActiveTemplateColumn>
+		<com:TActiveTemplateColumn HeaderText="<%[ Media Type ]%>" SortExpression="mediatype">
+			<prop:ItemTemplate>
+				<div title="<%=$this->getParent()->Data['mediatype']%>"><%=$this->getPage()->VolumeWindow->formatVolumeField($this->getParent()->Data['mediatype'])%></div>
+			</prop:ItemTemplate>
+		</com:TActiveTemplateColumn>
 		<com:TActiveBoundColumn
 			SortExpression="whenexpire"
 			HeaderText="<%[ When expire ]%>"