From 0e5a0648e15ed8c8de4b98ba0266d900986d59c6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 20 Apr 2018 12:57:46 +0200
Subject: [PATCH] Elastic: Improvements in attachment/file preview

---
 plugins/kolab_files/lib/kolab_files_engine.php            | 8 ++++----
 .../kolab_files/skins/elastic/templates/filepreview.html  | 8 ++++----
 plugins/kolab_files/skins/larry/style.css                 | 2 +-
 plugins/libkolab/skins/elastic/templates/attachment.html  | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 6a75566e..950d9fd5 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -702,20 +702,20 @@ class kolab_files_engine
         $table = new html_table(array('cols' => 2, 'class' => $attrib['class']));
 
         // file name
-        $table->add('label', $this->plugin->gettext('name').':');
+        $table->add('title', $this->plugin->gettext('name').':');
         $table->add('data filename', $this->file_data['name']);
 
         // file type
         // @TODO: human-readable type name
-        $table->add('label', $this->plugin->gettext('type').':');
+        $table->add('title', $this->plugin->gettext('type').':');
         $table->add('data filetype', $this->file_data['type']);
 
         // file size
-        $table->add('label', $this->plugin->gettext('size').':');
+        $table->add('title', $this->plugin->gettext('size').':');
         $table->add('data filesize', $this->rc->show_bytes($this->file_data['size']));
 
         // file modification time
-        $table->add('label', $this->plugin->gettext('mtime').':');
+        $table->add('title', $this->plugin->gettext('mtime').':');
         $table->add('data filemtime', $this->file_data['mtime']);
 
         // @TODO: for images: width, height, color depth, etc.
diff --git a/plugins/kolab_files/skins/elastic/templates/filepreview.html b/plugins/kolab_files/skins/elastic/templates/filepreview.html
index edd52d3b..2087b910 100644
--- a/plugins/kolab_files/skins/elastic/templates/filepreview.html
+++ b/plugins/kolab_files/skins/elastic/templates/filepreview.html
@@ -7,17 +7,17 @@
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
 	</div>
-	<roundcube:object name="fileinfobox" id="fileinfo" class="listing" />
+	<roundcube:object name="fileinfobox" id="fileinfo" class="listing props-table" />
 </div>
 
 <div class="content selected">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
+			<span class="inner"><roundcube:label name="properties"></span>
+		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
 		<div id="messagetoolbar" class="toolbar">
-			<a class="button properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
-				<span class="inner"><roundcube:label name="properties"></span>
-			</a>
 			<roundcube:button command="files-get" type="link"
 				class="button download disabled" classAct="button download"
 				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 3b4d4d3c..3b6d1308 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -377,7 +377,7 @@ ul.toolbarmenu li span.saveas {
   table-layout: fixed;
 }
 
-#fileinfobox table td.label {
+#fileinfobox table td.title {
   width: 60px;
   font-weight: bold;
   padding-right: 0;
diff --git a/plugins/libkolab/skins/elastic/templates/attachment.html b/plugins/libkolab/skins/elastic/templates/attachment.html
index e81fabe4..b6b3da08 100644
--- a/plugins/libkolab/skins/elastic/templates/attachment.html
+++ b/plugins/libkolab/skins/elastic/templates/attachment.html
@@ -7,18 +7,18 @@
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
 	</div>
-	<roundcube:object name="plugin.attachmentcontrols" class="listing" role="contentinfo"
+	<roundcube:object name="plugin.attachmentcontrols" class="listing props-table" role="contentinfo"
 		aria-labelledby="aria-label-contentinfo" />
 </div>
 
 <div class="content selected">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
+			<span class="inner"><roundcube:label name="properties"></span>
+		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
 		<div id="messagetoolbar" class="toolbar">
-			<a class="button properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
-				<span class="inner"><roundcube:label name="properties"></span>
-			</a>
 			<roundcube:button command="download-attachment" type="link" label="download" title="download"
 				class="button download disabled" classAct="button download" innerclass="inner" />
 			<roundcube:button command="print-attachment" type="link" label="print" title="print"