L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-64985-36' of git://github.com/sarjona/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
David Monllaó
2019-04-24 18:13:56 +02:00
parent 6ffae61d70 ab20b56894
commit 5413077874
7 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/message.php
+5 -3
View File
@@ -27,7 +27,7 @@ $string['addcontact'] = 'Add contact';
$string['addcontactconfirm'] = 'Are you sure you want to add {$a} to your contacts?';
$string['addtoyourcontacts'] = 'Add to contacts';
$string['addtoyourcontactsandmessage'] = 'Add to contacts and message';
$string['addtofavourites'] = 'Star';
$string['addtofavourites'] = 'Star conversation';
$string['ago'] = '{$a} ago';
$string['allusers'] = 'All messages from all users';
$string['backto'] = 'Back to {$a}';
@@ -39,6 +39,7 @@ $string['blockuserconfirm'] = 'Are you sure you want to block {$a}?';
$string['blockuserconfirmbutton'] = 'Block';
$string['blocknoncontacts'] = 'Prevent non-contacts from messaging me';
$string['canceledit'] = 'Cancel editing messages';
$string['cancelselection'] = 'Cancel message selection';
$string['contactableprivacy'] = 'Accept messages from:';
$string['contactableprivacy_onlycontacts'] = 'My contacts only';
$string['contactableprivacy_coursemember'] = 'My contacts and anyone in my courses';
@@ -47,6 +48,7 @@ $string['contactblocked'] = 'Contact blocked';
$string['contactrequests'] = 'Contact requests';
$string['contactrequestsent'] = 'Contact request sent';
$string['contacts'] = 'Contacts';
$string['conversationactions'] = 'Conversation actions menu';
$string['decline'] = 'Decline';
$string['defaultmessageoutputs'] = 'Default message outputs';
$string['defaults'] = 'Defaults';
@@ -83,7 +85,7 @@ $string['groupmessages'] = 'Group';
$string['hidemessagewindow'] = 'Hide message window';
$string['hidenotificationwindow'] = 'Hide notification window';
$string['individualconversations'] = 'Private';
$string['info'] = 'Info';
$string['info'] = 'User info';
$string['isnotinyourcontacts'] = '{$a} is not in your contacts';
$string['loadmore'] = 'Load more';
$string['loggedin'] = 'Online';
@@ -202,7 +204,7 @@ $string['removecontact'] = 'Remove contact';
$string['removecontactconfirm'] = 'Are you sure you want to remove {$a} from your contacts?';
$string['removecoursefilter'] = 'Remove filter for course {$a}';
$string['removefromyourcontacts'] = 'Remove from contacts';
$string['removefromfavourites'] = 'Unstar';
$string['removefromfavourites'] = 'Unstar conversation';
$string['requirecontacttomessage'] = 'You need to request {$a} to add you as a contact to be able to message them.';
$string['requiresconfiguration'] = 'Requires configuration';
$string['searchforuser'] = 'Search for a user';
message/templates/message_drawer_view_contact_body_content.mustache
-1
View File
@@ -44,7 +44,6 @@
<img
class="rounded-circle"
src="{{profileimageurl}}"
aria-hidden="true"
alt="{{#str}} pictureof, moodle, {{fullname}} {{/str}}"
title="{{#str}} pictureof, moodle, {{fullname}} {{/str}}"
style="height: 100px; width: 100px"
message/templates/message_drawer_view_conversation_header_content_type_private.mustache
+22 -16
View File
@@ -72,33 +72,39 @@
</a>
</div>
<div class="ml-auto dropdown">
<button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{#pix}} i/moremenu, core {{/pix}}
<button id="conversation-actions-menu-button" class="btn btn-link btn-icon icon-size-3" type="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
{{#pix}} i/moremenu, core {{/pix}}
</button>
<div class="dropdown-menu pull-right">
<a class="dropdown-item" href="#" data-action="view-contact">
<div id="conversation-actions-menu" class="dropdown-menu pull-right" role="menu"
aria-labelledby="conversation-actions-menu-button">
<a class="dropdown-item" href="#" data-action="view-contact" role="menuitem">
{{#str}} info, core_message {{/str}}
</a>
<a class="dropdown-item {{#isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" href="#" data-action="confirm-favourite">
{{#str}} addtofavourites, core_message {{/str}}
<a class="dropdown-item {{#isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" href="#"
data-action="confirm-favourite" role="menuitem">
{{#str}} addtofavourites, core_message {{/str}}
</a>
<a class="dropdown-item {{^isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" href="#" data-action="confirm-unfavourite">
{{#str}} removefromfavourites, core_message {{/str}}
<a class="dropdown-item {{^isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" href="#"
data-action="confirm-unfavourite" role="menuitem">
{{#str}} removefromfavourites, core_message {{/str}}
</a>
<a class="dropdown-item {{#isblocked}}hidden{{/isblocked}}" href="#" data-action="request-block">
<a class="dropdown-item {{#isblocked}}hidden{{/isblocked}}" href="#" data-action="request-block" role="menuitem">
{{#str}} blockuser, core_message {{/str}}
</a>
<a class="dropdown-item {{^isblocked}}hidden{{/isblocked}}" href="#" data-action="request-unblock">
<a class="dropdown-item {{^isblocked}}hidden{{/isblocked}}" href="#" data-action="request-unblock" role="menuitem">
{{#str}} unblockuser, core_message {{/str}}
</a>
<a class="dropdown-item" href="#" data-action="request-delete-conversation">
{{#str}} deleteconversation, core_message {{/str}}
</a>
<a class="dropdown-item {{#iscontact}}hidden{{/iscontact}}" href="#" data-action="request-add-contact">
<a class="dropdown-item {{#iscontact}}hidden{{/iscontact}}" href="#" data-action="request-add-contact" role="menuitem">
{{#str}} addtoyourcontacts, core_message {{/str}}
</a>
<a class="dropdown-item {{^iscontact}}hidden{{/iscontact}}" href="#" data-action="request-remove-contact">
{{#str}} removefromyourcontacts, core_message {{/str}}
<a class="dropdown-item {{^iscontact}}hidden{{/iscontact}}" href="#" data-action="request-remove-contact"
role="menuitem">
{{#str}} removefromyourcontacts, core_message {{/str}}
</a>
<a class="dropdown-item" href="#" data-action="request-delete-conversation" role="menuitem">
{{#str}} deleteconversation, core_message {{/str}}
</a>
</div>
</div>
message/templates/message_drawer_view_conversation_header_content_type_public.mustache
+13 -8
View File
@@ -66,18 +66,23 @@
</a>
</div>
<div class="ml-auto dropdown">
<button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{#pix}} i/moremenu, core {{/pix}}
<button id="conversation-actions-menu-button" class="btn btn-link btn-icon icon-size-3" type="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
{{#pix}} i/moremenu, core {{/pix}}
</button>
<div class="dropdown-menu pull-right">
<a class="dropdown-item" href="#" data-action="view-group-info">
<div id="conversation-actions-menu" class="dropdown-menu pull-right" role="menu"
aria-labelledby="conversation-actions-menu-button">
<a class="dropdown-item" href="#" data-action="view-group-info" role="menuitem">
{{#str}} groupinfo, core_message {{/str}}
</a>
<a class="dropdown-item {{#isfavourite}}hidden{{/isfavourite}}" href="#" data-action="confirm-favourite">
{{#str}} addtofavourites, core_message {{/str}}
<a class="dropdown-item {{#isfavourite}}hidden{{/isfavourite}}" href="#" data-action="confirm-favourite"
role="menuitem">
{{#str}} addtofavourites, core_message {{/str}}
</a>
<a class="dropdown-item {{^isfavourite}}hidden{{/isfavourite}}" href="#" data-action="confirm-unfavourite">
{{#str}} removefromfavourites, core_message {{/str}}
<a class="dropdown-item {{^isfavourite}}hidden{{/isfavourite}}" href="#" data-action="confirm-unfavourite"
role="menuitem">
{{#str}} removefromfavourites, core_message {{/str}}
</a>
</div>
</div>
message/templates/message_drawer_view_conversation_header_edit_mode.mustache
+3 -2
View File
@@ -38,7 +38,8 @@
<div class="d-flex p-2 align-items-center">
{{#str}} messagesselected:, core_message {{/str}}
<span class="ml-1" data-region="message-selected-court">1</span>
<button type="button" class="ml-auto close" aria-label="" data-action="cancel-edit-mode">
<span aria-hidden="true">&times;</span>
<button type="button" class="ml-auto close" aria-label="{{#str}} cancelselection, core_message {{/str}}"
data-action="cancel-edit-mode">
<span aria-hidden="true">&times;</span>
</button>
</div>
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
+13 -10
View File
@@ -77,47 +77,50 @@
</a>
</div>
<div class="ml-auto dropdown">
<button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button id="conversation-actions-menu-button" class="btn btn-link btn-icon icon-size-3" type="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
{{#pix}} i/moremenu, core {{/pix}}
</button>
<ul class="dropdown-menu pull-right">
<ul id="conversation-actions-menu" class="dropdown-menu pull-right" role="menu"
aria-labelledby="conversation-actions-menu-button">
<li data-action="view-contact">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} info, core_message {{/str}}
</a>
</li>
<li class="{{#isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" data-action="confirm-favourite">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} addtofavourites, core_message {{/str}}
</a>
</li>
<li class="{{^isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" data-action="confirm-unfavourite">
<a class="dropdown-item " href="#">
<a class="dropdown-item " href="#" role="menuitem">
{{#str}} removefromfavourites, core_message {{/str}}
</a>
</li>
<li class="{{#isblocked}}hidden{{/isblocked}}" data-action="request-block">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} blockuser, core_message {{/str}}
</a>
</li>
<li class="{{^isblocked}}hidden{{/isblocked}}" data-action="request-unblock">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} unblockuser, core_message {{/str}}
</a>
</li>
<li data-action="request-delete-conversation">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} deleteconversation, core_message {{/str}}
</a>
</li>
<li class="{{#iscontact}}hidden{{/iscontact}}" data-action="request-add-contact">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} addtoyourcontacts, core_message {{/str}}
</a>
</li>
<li class="{{^iscontact}}hidden{{/iscontact}}" data-action="request-remove-contact">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} removefromyourcontacts, core_message {{/str}}
</a>
</li>
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+8 -5
View File
@@ -70,22 +70,25 @@
</a>
</div>
<div class="ml-auto dropdown">
<button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button id="conversation-actions-menu-button" class="btn btn-link btn-icon icon-size-3" type="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
{{#pix}} i/moremenu, core {{/pix}}
</button>
<ul class="dropdown-menu pull-right">
<ul id="conversation-actions-menu" class="dropdown-menu pull-right" role="menu"
aria-labelledby="conversation-actions-menu-button">
<li data-action="view-group-info">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} groupinfo, core_message {{/str}}
</a>
</li>
<li class="{{#isfavourite}}hidden{{/isfavourite}}" data-action="confirm-favourite">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} addtofavourites, core_message {{/str}}
</a>
</li>
<li class="{{^isfavourite}}hidden{{/isfavourite}}" data-action="confirm-unfavourite">
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="#" role="menuitem">
{{#str}} removefromfavourites, core_message {{/str}}
</a>
</li>