From 84609b872e3632cdc2a2da8f11214c1461eaaefc Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 19 Dec 2017 11:10:55 +0100
Subject: [PATCH] Elastic: Initial fixes to audittrail features

---
 plugins/kolab_addressbook/kolab_addressbook.js         |  3 ++-
 .../skins/elastic/templates/audittrail.html            |  4 ++--
 plugins/libkolab/js/audittrail.js                      |  1 +
 plugins/libkolab/skins/elastic/libkolab.less           | 10 ++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/kolab_addressbook/kolab_addressbook.js b/plugins/kolab_addressbook/kolab_addressbook.js
index 4b0394b7..f19dd268 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.js
+++ b/plugins/kolab_addressbook/kolab_addressbook.js
@@ -89,7 +89,8 @@ if (window.rcmail) {
 
         // append button to show contact audit trail
         if (rcmail.env.action == 'show' && rcmail.env.kolab_audit_trail && rcmail.env.cid) {
-            $('<a href="#history" class="btn-contact-history active" role="button" tabindex="0">' + rcmail.get_label('kolab_addressbook.showhistory') + '</a>')
+            $('<a>').attr({href: '#history', 'class': 'btn btn-secondary btn-contact-history', role: 'button', tabindex: 0})
+                .append($('<span class="inner">').text(rcmail.get_label('kolab_addressbook.showhistory')))
                 .click(function(e) {
                     var rc = rcmail.is_framed() && parent.rcmail.contact_history_dialog ? parent.rcmail : rcmail;
                     rc.contact_history_dialog();
diff --git a/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html b/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html
index 2c051c6f..5f97db4b 100644
--- a/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html
+++ b/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html
@@ -1,9 +1,9 @@
-<div id="contacthistory" class="uidialog" aria-hidden="true">
+<div id="contacthistory" class="popupmenu" aria-hidden="true">
     <roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
     <div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
 </div>
 
-<div id="contactdiff" class="uidialog contentbox" aria-hidden="true">
+<div id="contactdiff" class="popupmenu" aria-hidden="true">
 	<h2 class="contact-names">Contact Name</h2>
 	<h2 class="contact-names-new diff-text-new"></h2>
 
diff --git a/plugins/libkolab/js/audittrail.js b/plugins/libkolab/js/audittrail.js
index 5ec6d091..24635b09 100644
--- a/plugins/libkolab/js/audittrail.js
+++ b/plugins/libkolab/js/audittrail.js
@@ -64,6 +64,7 @@ libkolab_audittrail.object_history_dialog = function(p)
             {
                 text: rcmail.gettext('close'),
                 click: function() { $dialog.dialog('close'); },
+                'class': 'cancel',
                 autofocus: true
             }
         ],
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 9a25b8a5..e8468993 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -329,3 +329,13 @@ fieldset.categories .input-group a.button.create {
 
 // TODO .quickview-active in Calendar and Tasklist
 
+.formbuttons-secondary-kolab {
+    display: inline;
+}
+
+a.btn-contact-history:before {
+    &:extend(.font-icon-class);
+    content: @fa-var-history;
+    display: inline;
+    float: none;
+}