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 0596d5d710e945a2698720d4b5d683ce1604712f..76f61215d83d3f375820247838f6420d33f0928d 100644 (file)
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 60f08c7a21ebd17593d0d0929a33eec93b51f43e..3d956bc290c7e9ad2c3b7782300f794600753fd1 100644 (file)
--- 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 7a3eb6d539a4477989ec9be2a659a7a40d1bd462..8b5aa0da1072998851ad540a170459f7dd5b4b32 100644 (file)
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 0a1de26edfae0fd95d9a4ad73080ba21d7935fab..a6dd6c206be0871230a4d3ed154f6a567f9c0dd0 100644 (file)
--- 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 93b85b1c58eaa1b8542d3bbae021673374b4a9d9..c5df9f4035dbdd36704c4135f60d39e7dad2cbfc 100644 (file)
--- 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 700c67a0222a0193d547426617a31e9743db784e..0465e0399017a4515e99e15ceefdfeabaf86f7cc 100644 (file)
--- 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 d3c7a7e1ed0a46408890148db116e7ccc698f7ff..59570fed82674201a75066e7363ce1430c779f08 100644 (file)
--- 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 ]%>"