mirror of
https://github.com/moodle/moodle.git
synced 2025-03-18 22:50:19 +01:00
MDL-54700 message: added toggle contact button to user profile
This commit is contained in:
parent
dec0cd9998
commit
12d8c7b222
@ -25,6 +25,7 @@
|
||||
$string['addcontact'] = 'Add contact';
|
||||
$string['addsomecontacts'] = 'To send a message to someone, or to add a shortcut for them on this page, use the <a href="{$a}">search tab</a> above.';
|
||||
$string['addsomecontactsincoming'] = 'These messages are from people who are not in your contact list. To add them to your contacts, click the "Add contact" icon next to their name.';
|
||||
$string['addtoyourcontacts'] = 'Add to your contacts';
|
||||
$string['ago'] = '{$a} ago';
|
||||
$string['ajax_gui'] = 'Ajax chat room';
|
||||
$string['allmine'] = 'All messages to me or from me';
|
||||
@ -126,6 +127,7 @@ $string['providerstag'] = 'Source';
|
||||
$string['recent'] = 'Recent';
|
||||
$string['readmessages'] = '{$a} read messages';
|
||||
$string['removecontact'] = 'Remove contact';
|
||||
$string['removefromyourcontacts'] = 'Remove from your contacts';
|
||||
$string['savemysettings'] = 'Save my settings';
|
||||
$string['search'] = 'Search';
|
||||
$string['searchforperson'] = 'Search for a person';
|
||||
|
@ -1052,6 +1052,7 @@ $string['list'] = 'List';
|
||||
$string['listfiles'] = 'List of files in {$a}';
|
||||
$string['listofallpeople'] = 'List of all people';
|
||||
$string['listofcourses'] = 'List of courses';
|
||||
$string['loading'] = 'Loading';
|
||||
$string['loadinghelp'] = 'Loading...';
|
||||
$string['local'] = 'Local';
|
||||
$string['localplugins'] = 'Local plugins';
|
||||
|
@ -612,6 +612,7 @@ $functions = array(
|
||||
'type' => 'write',
|
||||
'ajax' => true,
|
||||
'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
|
||||
'ajax' => true,
|
||||
),
|
||||
'core_message_delete_contacts' => array(
|
||||
'classname' => 'core_message_external',
|
||||
@ -621,6 +622,7 @@ $functions = array(
|
||||
'type' => 'write',
|
||||
'ajax' => true,
|
||||
'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
|
||||
'ajax' => true,
|
||||
),
|
||||
'core_message_delete_conversation' => array(
|
||||
'classname' => 'core_message_external',
|
||||
|
@ -3684,9 +3684,15 @@ class context_header implements renderable {
|
||||
$this->additionalbuttons[$buttontype]['formattedimage'] = $button['image'];
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($button['linkattributes']['class'])) {
|
||||
$class = $button['linkattributes']['class'] . ' btn';
|
||||
} else {
|
||||
$class = 'btn';
|
||||
}
|
||||
// Add the bootstrap 'btn' class for formatting.
|
||||
$this->additionalbuttons[$buttontype]['linkattributes'] = array_merge($button['linkattributes'],
|
||||
array('class' => 'btn'));
|
||||
array('class' => $class));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -4092,6 +4092,10 @@ EOD;
|
||||
$imagedata = $this->user_picture($user, array('size' => 100));
|
||||
// Check to see if we should be displaying a message button.
|
||||
if (!empty($CFG->messaging) && $USER->id != $user->id && has_capability('moodle/site:sendmessage', $context)) {
|
||||
$iscontact = !empty(message_get_contact($user->id));
|
||||
$contacttitle = $iscontact ? 'removefromyourcontacts' : 'addtoyourcontacts';
|
||||
$contacturlaction = $iscontact ? 'removecontact' : 'addcontact';
|
||||
$contactimage = $iscontact ? 'removecontact' : 'addcontact';
|
||||
$userbuttons = array(
|
||||
'messages' => array(
|
||||
'buttontype' => 'message',
|
||||
@ -4100,8 +4104,22 @@ EOD;
|
||||
'image' => 'message',
|
||||
'linkattributes' => message_messenger_sendmessage_link_params($user),
|
||||
'page' => $this->page
|
||||
)
|
||||
),
|
||||
'togglecontact' => array(
|
||||
'buttontype' => 'togglecontact',
|
||||
'title' => get_string($contacttitle, 'message'),
|
||||
'url' => new moodle_url('/message/index.php', array(
|
||||
'user1' => $USER->id,
|
||||
'user2' => $user->id,
|
||||
$contacturlaction => $user->id,
|
||||
'sesskey' => sesskey())
|
||||
),
|
||||
'image' => $contactimage,
|
||||
'linkattributes' => message_togglecontact_link_params($user, $iscontact),
|
||||
'page' => $this->page
|
||||
),
|
||||
);
|
||||
|
||||
$this->page->requires->string_for_js('changesmadereallygoaway', 'moodle');
|
||||
}
|
||||
}
|
||||
@ -4160,6 +4178,8 @@ EOD;
|
||||
// Include js for messaging.
|
||||
if ($button['buttontype'] === 'message') {
|
||||
message_messenger_requirejs();
|
||||
} else if ($button['buttontype'] === 'togglecontact') {
|
||||
message_togglecontact_requirejs();
|
||||
}
|
||||
$image = $this->pix_icon($button['formattedimage'], $button['title'], 'moodle', array(
|
||||
'class' => 'iconsmall',
|
||||
|
195
message/amd/src/toggle_contact_button.js
Normal file
195
message/amd/src/toggle_contact_button.js
Normal file
@ -0,0 +1,195 @@
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
//
|
||||
// Moodle is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Moodle is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* Module to add/remove contact using ajax.
|
||||
*
|
||||
* @module message/toggle_contact_button
|
||||
* @class toggle_contact_button
|
||||
* @package message
|
||||
* @copyright 2016 Ryan Wyllie <ryan@moodle.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
* @since 3.2
|
||||
*/
|
||||
define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/custom_interaction_events'],
|
||||
function($, ajax, templates, notification, customEvents) {
|
||||
|
||||
/**
|
||||
* Check the state of the element, if the current user is a contact or not.
|
||||
*
|
||||
* @method isContact
|
||||
* @param element jQuery object for the button
|
||||
* @return bool
|
||||
*/
|
||||
var isContact = function(element) {
|
||||
return element.attr('data-is-contact') == '1';
|
||||
};
|
||||
|
||||
/**
|
||||
* Record that the user is a contact.
|
||||
*
|
||||
* @method setContact
|
||||
* @param element jQuery object for the button
|
||||
*/
|
||||
var setContact = function(element) {
|
||||
element.attr('data-is-contact', '1');
|
||||
};
|
||||
|
||||
/**
|
||||
* Record that the user is not a contact.
|
||||
*
|
||||
* @method setNotContact
|
||||
* @param element jQuery object for the button
|
||||
*/
|
||||
var setNotContact = function(element) {
|
||||
element.attr('data-is-contact', '0');
|
||||
};
|
||||
|
||||
/**
|
||||
* Get the id for the user being viewed.
|
||||
*
|
||||
* @method getUserId
|
||||
* @param element jQuery object for the button
|
||||
* @return int
|
||||
*/
|
||||
var getUserId = function(element) {
|
||||
return element.attr('data-userid');
|
||||
};
|
||||
|
||||
/**
|
||||
* Check if this element is currently loading.
|
||||
*
|
||||
* @method isLoading
|
||||
* @param element jQuery object for the button
|
||||
* @return bool
|
||||
*/
|
||||
var isLoading = function(element) {
|
||||
return element.hasClass('loading') || element.attr('disabled');
|
||||
};
|
||||
|
||||
/**
|
||||
* Sends an ajax request to the server and handles the element state
|
||||
* while the request is being performed.
|
||||
*
|
||||
* @method sendRequest
|
||||
* @param element jQuery object for the button
|
||||
* @param request request hash to send
|
||||
* @return jQuery promise
|
||||
*/
|
||||
var sendRequest = function(element, request) {
|
||||
if (isLoading(element)) {
|
||||
return $.Deferred();
|
||||
}
|
||||
|
||||
element.addClass('loading');
|
||||
element.attr('disabled', 'disabled');
|
||||
|
||||
return ajax.call([request])[0]
|
||||
.fail(notification.exception)
|
||||
.always(function() {
|
||||
element.removeClass('loading');
|
||||
element.removeAttr('disabled');
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Send a request to the server to add the current user as
|
||||
* a contact. The contents of the button are changed to the
|
||||
* remove contact button upon success.
|
||||
*
|
||||
* @method addContact
|
||||
* @param element jQuery object for the button
|
||||
*/
|
||||
var addContact = function(element) {
|
||||
if (isLoading(element)) {
|
||||
return;
|
||||
}
|
||||
|
||||
var request = {
|
||||
methodname: 'core_message_create_contacts',
|
||||
args: {
|
||||
userids: [getUserId(element)],
|
||||
}
|
||||
};
|
||||
sendRequest(element, request).done(function() {
|
||||
setContact(element);
|
||||
templates.render('message/remove_contact_button', {}).done(function(html, js) {
|
||||
templates.replaceNodeContents(element, html, js);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Send a request to the server to remove the current user as
|
||||
* a contact. The contents of the button are changed to the
|
||||
* add contact button upon success.
|
||||
*
|
||||
* @method removeContact
|
||||
* @param element jQuery object for the button
|
||||
*/
|
||||
var removeContact = function(element) {
|
||||
if (isLoading(element)) {
|
||||
return;
|
||||
}
|
||||
|
||||
var request = {
|
||||
methodname: 'core_message_delete_contacts',
|
||||
args: {
|
||||
userids: [getUserId(element)],
|
||||
}
|
||||
};
|
||||
|
||||
sendRequest(element, request).done(function() {
|
||||
setNotContact(element);
|
||||
templates.render('message/add_contact_button', {}).done(function(html, js) {
|
||||
templates.replaceNodeContents(element, html, js);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Enhances the given element with a loading gif and event handles to make
|
||||
* ajax requests to add or remove a contact where appropriate.
|
||||
*
|
||||
* @method enhance
|
||||
* @param element jQuery object for the button
|
||||
*/
|
||||
var enhance = function(element) {
|
||||
element = $(element);
|
||||
|
||||
if (!element.children('.loading-icon').length) {
|
||||
// Add the loading gif if it isn't already there.
|
||||
templates.render('core/loading', {}).done(function(html, js) {
|
||||
element.append(html, js);
|
||||
});
|
||||
}
|
||||
|
||||
customEvents.define(element, [customEvents.events.activate]);
|
||||
|
||||
element.on(customEvents.events.activate, function(e, data) {
|
||||
if (isContact(element)) {
|
||||
removeContact(element);
|
||||
} else {
|
||||
addContact(element);
|
||||
}
|
||||
e.preventDefault();
|
||||
data.originalEvent.preventDefault();
|
||||
});
|
||||
};
|
||||
|
||||
return /** @alias module:message/toggle_contact_button */ {
|
||||
enhance: enhance
|
||||
};
|
||||
});
|
@ -1805,6 +1805,23 @@ function message_messenger_requirejs() {
|
||||
$done = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Requires the JS libraries for the toggle contact button.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function message_togglecontact_requirejs() {
|
||||
global $PAGE;
|
||||
|
||||
static $done = false;
|
||||
if ($done) {
|
||||
return;
|
||||
}
|
||||
|
||||
$PAGE->requires->js_call_amd('message/toggle_contact_button', 'enhance', array('#toggle-contact-button'));
|
||||
$done = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the attributes to place on a link to open the 'Send message' dialog.
|
||||
*
|
||||
@ -1828,6 +1845,25 @@ function message_messenger_sendmessage_link_params($user) {
|
||||
return $params;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the attributes to place on a contact button.
|
||||
*
|
||||
* @param object $user User object.
|
||||
* @param bool $iscontact
|
||||
* @return void
|
||||
*/
|
||||
function message_togglecontact_link_params($user, $iscontact = false) {
|
||||
$params = array(
|
||||
'data-userid' => $user->id,
|
||||
'data-is-contact' => $iscontact,
|
||||
'id' => 'toggle-contact-button',
|
||||
'role' => 'button',
|
||||
'class' => 'ajax-contact-button',
|
||||
);
|
||||
|
||||
return $params;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines if a user is permitted to send another user a private message.
|
||||
* If no sender is provided then it defaults to the logged in user.
|
||||
|
29
message/templates/add_contact_button.mustache
Normal file
29
message/templates/add_contact_button.mustache
Normal file
@ -0,0 +1,29 @@
|
||||
{{!
|
||||
This file is part of Moodle - http://moodle.org/
|
||||
|
||||
Moodle is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Moodle is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
}}
|
||||
{{!
|
||||
@template core/add_contact_button
|
||||
|
||||
Template for the contents of the add contact button on the user's profile page.
|
||||
|
||||
Context variables required for this template:
|
||||
*
|
||||
}}
|
||||
<span>
|
||||
{{#pix}} t/addcontact, core {{/pix}}
|
||||
<span class="header-button-title">{{#str}} addtoyourcontacts, message {{/str}}</span>
|
||||
</span>
|
||||
{{> core/loading }}
|
29
message/templates/remove_contact_button.mustache
Normal file
29
message/templates/remove_contact_button.mustache
Normal file
@ -0,0 +1,29 @@
|
||||
{{!
|
||||
This file is part of Moodle - http://moodle.org/
|
||||
|
||||
Moodle is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Moodle is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
}}
|
||||
{{!
|
||||
@template core/add_contact_button
|
||||
|
||||
Template for the contents of the add contact button on the user's profile page.
|
||||
|
||||
Context variables required for this template:
|
||||
*
|
||||
}}
|
||||
<span>
|
||||
{{#pix}} t/removecontact, core {{/pix}}
|
||||
<span class="header-button-title">{{#str}} removefromyourcontacts, message {{/str}}</span>
|
||||
</span>
|
||||
{{> core/loading }}
|
@ -52,6 +52,22 @@
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
.ajax-contact-button {
|
||||
height: 31px;
|
||||
box-sizing: border-box;
|
||||
|
||||
&.loading {
|
||||
> *:not(.loading-icon) {
|
||||
display: none;
|
||||
}
|
||||
.loading-icon {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
.loading-icon {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 480px) {
|
||||
.userprofile .profile_tree {
|
||||
|
@ -6691,6 +6691,19 @@ body.path-question-type .mform fieldset.hidden {
|
||||
.path-user .node_category .viewmore {
|
||||
text-align: right;
|
||||
}
|
||||
.ajax-contact-button {
|
||||
height: 31px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.ajax-contact-button.loading > *:not(.loading-icon) {
|
||||
display: none;
|
||||
}
|
||||
.ajax-contact-button.loading .loading-icon {
|
||||
display: block;
|
||||
}
|
||||
.ajax-contact-button .loading-icon {
|
||||
display: none;
|
||||
}
|
||||
@media (max-width: 480px) {
|
||||
.userprofile .profile_tree {
|
||||
/** Display the profile on one column on phones. */
|
||||
|
Loading…
x
Reference in New Issue
Block a user