Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add button to join the session immediately on invitation level, add option

Browse source 
to accept/decline invitations in document editors dialog
This commit is contained in:
Aleksander Machniak 2015-11-25 13:02:41 +01:00
parent eb0fdf3765
commit 5b796290d6
3 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
plugins/kolab_files/kolab_files.js
View file

@ -1312,10 +1312,27 @@ function kolab_files_add_attendees(names)
function kolab_files_attendee_record(user, status) function kolab_files_attendee_record(user, status)
{ {
var buttons = $('<td class="options">'), var options = [], select,
type = status ? status.replace(/-.*$/, '') : ''; type = status ? status.replace(/-.*$/, '') : '',
buttons = $('<td class="options">'),
state = $('<td class="status">').text(rcmail.gettext('kolab_files.status' + type));
// @todo: accept/decline invitation request // @todo: accept/decline invitation request
if (type == 'requested' || status == 'accepted-owner' || status == 'declined-owner') {
select = $('<select>').change(function() {
var val = $(this).val(), map = {accepted: 'invitation_accept', declined: 'invitation_decline'};
if (map[val])
manticore[map[val]]({user: user, session_id: rcmail.env.file_data.session.id});
});
if (type == 'requested')
options.push($('<option>').text(rcmail.gettext('kolab_files.statusrequested')).attr('value', 'requested'));
options.push($('<option>').text(rcmail.gettext('kolab_files.statusaccepted')).attr('value', 'accepted'));
options.push($('<option>').text(rcmail.gettext('kolab_files.statusdeclined')).attr('value', 'declined'));
state.html(select.html(options).val(type));
}
// delete button // delete button
if (status != 'organizer') { if (status != 'organizer') {
@ -1328,7 +1345,7 @@ function kolab_files_attendee_record(user, status)
return $('<tr>').attr('class', 'invitation' + (type ? ' ' + type : '')) return $('<tr>').attr('class', 'invitation' + (type ? ' ' + type : ''))
.append($('<td class="name">').text(user)) .append($('<td class="name">').text(user))
.append($('<td class="status">').text(rcmail.gettext('kolab_files.status' + type))) .append(state)
.append(buttons); .append(buttons);
}; };
@ -1356,14 +1373,13 @@ function kolab_files_invitation_dialog(invitation)
.append($('<td>').text(value)) .append($('<td>').text(value))
); );
}; };
/*
join_session = function() { join_session = function() {
var viewer = file_api.file_type_supported('application//vnd.oasis.opendocument.text', rcmail.env.files_caps); var viewer = file_api.file_type_supported('application/vnd.oasis.opendocument.text', rcmail.env.files_caps);
params = {action: 'edit', session: invitation.session_id}; params = {action: 'edit', session: invitation.session_id};
file_api.file_open(invitation.file, viewer, params); file_api.file_open('', viewer, params);
}; };
*/
if (!dialog.length) if (!dialog.length)
dialog = $('<div>').attr({id: 'document-invitation-dialog', role: 'dialog', 'aria-hidden': 'true'}) dialog = $('<div>').attr({id: 'document-invitation-dialog', role: 'dialog', 'aria-hidden': 'true'})
.append($('<div>')) .append($('<div>'))
@ -1372,12 +1388,11 @@ function kolab_files_invitation_dialog(invitation)
if (!invitation.is_session_owner) { if (!invitation.is_session_owner) {
if (invitation.status == 'invited') { if (invitation.status == 'invited') {
text = manticore.invitation_msg(invitation); text = manticore.invitation_msg(invitation);
/*
buttons[rcmail.gettext('kolab_files.join')] = function() { buttons[rcmail.gettext('kolab_files.join')] = function() {
join_session(); join_session();
kolab_dialog_close(this); kolab_dialog_close(this);
}; };
*/
buttons[rcmail.gettext('kolab_files.accept')] = function() { buttons[rcmail.gettext('kolab_files.accept')] = function() {
manticore.invitation_accept(invitation); manticore.invitation_accept(invitation);
kolab_dialog_close(this); kolab_dialog_close(this);
@ -1393,12 +1408,11 @@ function kolab_files_invitation_dialog(invitation)
} }
else if (invitation.status == 'accepted-owner') { else if (invitation.status == 'accepted-owner') {
text = manticore.invitation_msg(invitation); text = manticore.invitation_msg(invitation);
/*
buttons[rcmail.gettext('kolab_files.join')] = function() { buttons[rcmail.gettext('kolab_files.join')] = function() {
join_session(); join_session();
kolab_dialog_close(this); kolab_dialog_close(this);
}; };
*/
} }
} }
else { else {
@ -1411,6 +1425,7 @@ function kolab_files_invitation_dialog(invitation)
} }
else if (invitation.status == 'requested') { else if (invitation.status == 'requested') {
text = manticore.invitation_msg(invitation); text = manticore.invitation_msg(invitation);
buttons[rcmail.gettext('kolab_files.accept')] = function() { buttons[rcmail.gettext('kolab_files.accept')] = function() {
manticore.invitation_accept(invitation); manticore.invitation_accept(invitation);
kolab_dialog_close(this); kolab_dialog_close(this);

4
plugins/kolab_files/lib/kolab_files_engine.php
View file

@ -1284,6 +1284,10 @@ class kolab_files_engine
true, true); true, true);
} }
if ($file === null || $file === '') {
$file = $this->file_data['file'];
}
$this->file_data['filename'] = $file; $this->file_data['filename'] = $file;
$this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice'); $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');

4
plugins/kolab_files/skins/larry/style.css
View file

@ -579,6 +579,10 @@ table.propform td.source table.propform td {
width: 16px width: 16px
} }
#document-editors-dialog table td.status select {
width: 100%;
}
#document-editors-dialog table td { #document-editors-dialog table td {
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;