mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-65087-master' of git://github.com/sarjona/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2019-04-03 14:12:24 +08:00
commit 143122bfcc
25 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
message/templates/message_drawer_contacts_list.mustache
View File

@ -49,6 +49,7 @@
{{/conversationid}}
data-contact-user-id="{{id}}"
data-region="contact"
role="button"
>
<img
class="rounded-circle"

1
message/templates/message_drawer_conversations_list.mustache
View File

@ -42,6 +42,7 @@
{{#userid}}
data-user-id="{{.}}"
{{/userid}}
role="button"
>
{{#imageurl}}
<img

1
message/templates/message_drawer_messages_list.mustache
View File

@ -48,6 +48,7 @@
data-route-param-3="{{userid}}"
{{/conversationid}}
data-conversation-id="{{conversationid}}"
role="button"
>
<img
class="rounded-circle"

1
message/templates/message_drawer_non_contacts_list.mustache
View File

@ -47,6 +47,7 @@
data-route-param-2="create"
data-route-param-3="{{id}}"
{{/conversationid}}
role="button"
>
<img
class="rounded-circle"

2
message/templates/message_drawer_view_contact_body_content.mustache
View File

@ -35,7 +35,7 @@
}}
<a class="align-self-center" href="#" data-route-back>
<a class="align-self-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
<div class="px-3 pb-3">

1
message/templates/message_drawer_view_contacts_body_section_requests_list.mustache
View File

@ -49,6 +49,7 @@
{{/conversationid}}
data-request-id="{{id}}"
data-region="contact-request"
role="button"
>
<img
class="rounded-circle"

4
message/templates/message_drawer_view_contacts_header.mustache
View File

@ -37,7 +37,7 @@
<div class="hidden border-bottom px-2 py-3" aria-hidden="true" data-region="view-contacts">
<div class="d-flex align-items-center">
<div class="align-self-stretch">
<a class="h-100 d-flex align-items-center mr-2" href="#" data-route-back>
<a class="h-100 d-flex align-items-center mr-2" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>
@ -45,7 +45,7 @@
{{#str}} contacts, core_message {{/str}}
</div>
<div class="ml-auto">
<a href="#" data-route="view-search">
<a href="#" data-route="view-search" role="button" aria-label="{{#str}} search, core_search {{/str}}">
{{#pix}} a/search, core {{/pix}}
</a>
</div>

7
message/templates/message_drawer_view_conversation_header_content_type_private.mustache
View File

@ -37,12 +37,12 @@
<div class="d-flex align-items-center">
<div class="align-self-stretch" >
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>
<div class="d-flex text-truncate">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact" role="button">
{{#imageurl}}
<div class="d-flex align-items-center">
<img
@ -57,7 +57,8 @@
<div class="w-100 text-truncate ml-2">
<div class="d-flex">
<strong class="m-0 text-truncate">{{name}}</strong>
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
aria-label="{{#str}} favourites, core {{/str}}">
{{#pix}} i/star-rating, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">

5
message/templates/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
View File

@ -37,7 +37,7 @@
<div class="d-flex align-items-center">
<div class="align-self-stretch" >
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>
@ -56,7 +56,8 @@
<div class="w-100 text-truncate ml-2">
<div class="d-flex">
<strong class="m-0 text-truncate">{{name}}</strong>
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
aria-label="{{#str}} favourites, core {{/str}}">
{{#pix}} i/star-rating, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">

9
message/templates/message_drawer_view_conversation_header_content_type_public.mustache
View File

@ -38,12 +38,12 @@
<div class="d-flex flex-column">
<div class="d-flex align-items-center">
<div class="align-self-stretch" >
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>
<div class="d-flex text-truncate">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info" role="button">
{{#imageurl}}
<img
class="rounded-circle"
@ -56,7 +56,8 @@
<div class="w-100 text-truncate ml-2">
<div class="d-flex">
<strong class="m-0 text-truncate">{{name}}</strong>
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary"
data-region="favourite-icon-container" aria-label="{{#str}} favourites, core {{/str}}">
{{#pix}} i/star-rating, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
@ -95,7 +96,7 @@
<div class="mr-2 icon" aria-hidden="true"></div>
{{#imageurl}}<div style="width: 38px" aria-hidden="true"></div>{{/imageurl}}
<!-- End placeholders -->
<a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info">
<a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info" role="button">
<small class="m-0 text-muted text-truncate">
{{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
</small>

2
message/templates/message_drawer_view_conversation_header_placeholder.mustache
View File

@ -36,7 +36,7 @@
}}
<div class="d-flex">
<div class="align-self-stretch" >
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>

2
message/templates/message_drawer_view_group_info_body_content.mustache
View File

@ -35,7 +35,7 @@
}}
<a class="px-2 align-self-start" href="#" data-route-back>
<a class="px-2 align-self-start" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
<div class="px-2">

1
message/templates/message_drawer_view_group_info_participants_list.mustache
View File

@ -49,6 +49,7 @@
{{/conversationid}}
data-contact-user-id="{{id}}"
data-region="contact"
role="button"
>
<img
class="rounded-circle"

4
message/templates/message_drawer_view_overview_header.mustache
View File

@ -54,13 +54,15 @@
href="#"
data-route="view-settings"
data-route-param="{{loggedinuser.id}}"
aria-label="{{#str}} settings, core_message {{/str}}"
role="button"
>
{{#pix}} t/edit, core {{/pix}}
</a>
</div>
</div>
<div class="text-right mt-3">
<a href="#" data-route="view-contacts">
<a href="#" data-route="view-contacts" role="button">
{{#pix}} i/user, core {{/pix}}
{{#str}} contacts, core_message {{/str}}
<span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}" data-region="contact-request-count">

2
message/templates/message_drawer_view_search_header.mustache
View File

@ -41,6 +41,7 @@
href="#"
data-route-back
data-action="cancel-search"
role="button"
>
{{> core_message/message_drawer_icon_back }}
</a>
@ -57,6 +58,7 @@
class="btn btn-outline-secondary"
type="button"
data-action="search"
aria-label="{{#str}} search, core_search {{/str}}"
>
<span data-region="search-icon-container">
{{#pix}} a/search, core {{/pix}}

2
message/templates/message_drawer_view_settings_header.mustache
View File

@ -37,7 +37,7 @@
<div class="hidden border-bottom px-2 py-3" aria-hidden="true" data-region="view-settings">
<div class="d-flex align-items-center">
<div class="align-self-stretch" >
<a class="h-100 d-flex mr-2 align-items-center" href="#" data-route-back>
<a class="h-100 d-flex mr-2 align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>

3
message/templates/message_popover.mustache
View File

@ -36,7 +36,8 @@
}}
<div class="pull-right popover-region collapsed">
<a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#">
<a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#"
role="button">
{{#pix}} t/message, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}
<div class="count-container {{^unreadcount}}hidden{{/unreadcount}}" data-region="count-container">{{unreadcount}}</div>
</a>

3
message/templates/notification_preferences_processor.mustache
View File

@ -47,7 +47,8 @@
data-processor-setting
data-user-id="{{userid}}"
data-context-id="{{contextid}}"
data-name="{{name}}">
data-name="{{name}}"
role="button">
{{< core/hover_tooltip }}
{{$anchor}}

2
theme/bootstrapbase/templates/core_message/message_drawer.mustache
View File

@ -46,7 +46,7 @@
role="region"
>
<div class="drawer-top p-2 border-bottom bg-secondary text-right">
<a id="message-drawer-close-{{uniqid}}" class="" href="#">
<a id="message-drawer-close-{{uniqid}}" class="" href="#" role="button">
{{#pix}} i/window_close, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}
</a>
</div>

11
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
View File

@ -42,12 +42,12 @@
<div class="d-flex align-items-center">
<div class="align-self-stretch" >
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>
<div class="d-flex text-truncate">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact" role="button">
{{#imageurl}}
<div class="d-flex align-items-center">
<img
@ -62,7 +62,8 @@
<div class="w-100 text-truncate ml-2">
<div class="d-flex">
<strong class="m-0 text-truncate">{{name}}</strong>
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
aria-label="{{#str}} favourites, core {{/str}}">
{{#pix}} i/star, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
@ -84,12 +85,12 @@
</button>
<ul class="dropdown-menu pull-right">
<li data-action="view-contact">
<a class="dropdown-item" href="#" >
<a class="dropdown-item" href="#">
{{#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="#">
{{#str}} addtofavourites, core_message {{/str}}
</a>
</li>

5
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
View File

@ -42,7 +42,7 @@
<div class="d-flex align-items-center">
<div class="align-self-stretch" >
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>
@ -61,7 +61,8 @@
<div class="w-100 text-truncate ml-2">
<div class="d-flex">
<strong class="m-0 text-truncate">{{name}}</strong>
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
aria-label="{{#str}} favourites, core {{/str}}">
{{#pix}} i/star, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">

9
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
View File

@ -42,12 +42,12 @@
<div class="d-flex flex-column">
<div class="d-flex align-items-center">
<div class="align-self-stretch" >
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
<a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
</div>
<div class="d-flex text-truncate">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
<a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info" role="button">
{{#imageurl}}
<img
class="rounded-circle"
@ -60,7 +60,8 @@
<div class="w-100 text-truncate ml-2">
<div class="d-flex">
<strong class="m-0 text-truncate">{{name}}</strong>
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary"
data-region="favourite-icon-container" aria-label="{{#str}} favourites, core {{/str}}">
{{#pix}} i/star, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
@ -109,7 +110,7 @@
<div class="mr-2" style="opacity: 0; visibility: hidden" aria-hidden="true">{{> core_message/message_drawer_icon_back }}</div>
{{#imageurl}}<div aria-hidden="true" style="width: 38px"></div>{{/imageurl}}
<!-- End placeholders -->
<a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info">
<a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info" role="button">
<small class="m-0 muted text-truncate">
{{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
</small>

2
theme/bootstrapbase/templates/core_message/message_drawer_view_group_info_body_content.mustache
View File

@ -35,7 +35,7 @@
}}
<a class="px-2 align-self-start" href="#" data-route-back>
<a class="px-2 align-self-start" href="#" data-route-back role="button">
{{> core_message/message_drawer_icon_back }}
</a>
<div class="px-2">

4
theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache
View File

@ -57,13 +57,15 @@
href="#"
data-route="view-settings"
data-route-param="{{loggedinuser.id}}"
aria-label="{{#str}} settings, core_message {{/str}}"
role="button"
>
{{#pix}} t/edit, core {{/pix}}
</a>
</div>
</div>
<div class="text-right mt-3">
<a href="#" data-route="view-contacts">
<a href="#" data-route="view-contacts" role="button">
{{#pix}} i/user, core {{/pix}}
{{#str}} contacts, core_message {{/str}}
<span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}" data-region="contact-request-count">

2
theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache
View File

@ -46,6 +46,7 @@
href="#"
data-route-back
data-action="cancel-search"
role="button"
>
{{> core_message/message_drawer_icon_back }}
</a>
@ -61,6 +62,7 @@
class="btn m-0"
type="button"
data-action="search"
aria-label="{{#str}} search, core_search {{/str}}"
>
<span data-region="search-icon-container">
{{#pix}} a/search, core {{/pix}}