Elastic: Initial fixes to audittrail features

This commit is contained in:
Aleksander Machniak 2017-12-19 11:10:55 +01:00
parent 17b5e80a1b
commit 84609b872e
4 changed files with 15 additions and 3 deletions

View file

@ -89,7 +89,8 @@ if (window.rcmail) {
// append button to show contact audit trail // append button to show contact audit trail
if (rcmail.env.action == 'show' && rcmail.env.kolab_audit_trail && rcmail.env.cid) { 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) { .click(function(e) {
var rc = rcmail.is_framed() && parent.rcmail.contact_history_dialog ? parent.rcmail : rcmail; var rc = rcmail.is_framed() && parent.rcmail.contact_history_dialog ? parent.rcmail : rcmail;
rc.contact_history_dialog(); rc.contact_history_dialog();

View file

@ -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" /> <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 class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
</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">Contact Name</h2>
<h2 class="contact-names-new diff-text-new"></h2> <h2 class="contact-names-new diff-text-new"></h2>

View file

@ -64,6 +64,7 @@ libkolab_audittrail.object_history_dialog = function(p)
{ {
text: rcmail.gettext('close'), text: rcmail.gettext('close'),
click: function() { $dialog.dialog('close'); }, click: function() { $dialog.dialog('close'); },
'class': 'cancel',
autofocus: true autofocus: true
} }
], ],

View file

@ -329,3 +329,13 @@ fieldset.categories .input-group a.button.create {
// TODO .quickview-active in Calendar and Tasklist // 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;
}