MDL-66481 mod_forum: Move "Mark as read" into the discussion menu

This commit is contained in:
Jun Pataleta 2019-08-28 16:06:58 +08:00
parent bc23cbaf54
commit dff565b32c
4 changed files with 48 additions and 4 deletions

View File

@ -353,6 +353,7 @@ $string['mailnow'] = 'Send forum post notifications with no editing-time delay';
$string['manydiscussions'] = 'Discussions per page';
$string['managesubscriptionsoff'] = 'Finish managing subscriptions';
$string['managesubscriptionson'] = 'Manage subscribers';
$string['markasread'] = 'Mark as read';
$string['markalldread'] = 'Mark all posts in this discussion read.';
$string['markallread'] = 'Mark all posts in this forum read.';
$string['markasreadonnotification'] = 'When sending forum post notifications';

View File

@ -254,10 +254,10 @@
{{#unread}}
{{! TODO Rewrite as AJAX}}
<span class="p-1">
<a href="{{{discussion.urls.viewfirstunread}}}" class="badge badge-primary rounded-circle" aria-label="{{#str}}unreadpostsnumber, mod_forum, {{unread}}{{/str}}">{{unread}}</a>
</span>
<span class="p-1">
<a href="{{{discussion.urls.markasread}}}">{{#pix}}t/markasread, core, {{#str}}markalldread, mod_forum{{/str}}{{/pix}}</a>
<a href="{{{discussion.urls.viewfirstunread}}}" class="badge badge-primary rounded-circle"
title="{{#str}}unreadpostsnumber, mod_forum, {{unread}}{{/str}}" aria-label="{{#str}}unreadpostsnumber, mod_forum, {{unread}}{{/str}}">
{{unread}}
</a>
</span>
{{/unread}}
{{/forum.userstate.tracked}}

View File

@ -84,5 +84,8 @@
{{/istimelocked}}
{{/capabilities.manage}}
{{> forum/discussion_subscription_toggle }}
{{#unread}}
{{> forum/mark_as_read }}
{{/unread}}
</div>
</div>

View File

@ -0,0 +1,40 @@
{{!
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 mod_forum/mark_as_read
Template to mark as read menu item.
Classes required for JS:
* none
Data attributes required for JS:
* none
Context variables required for this template:
* urls Object - Uses the 'markasread' attribute for the URL.
Example context (json):
{
"urls": {
"markasread": "#"
}
}
}}
<a class="dropdown-item menu-action" role="menuitem" href="{{{urls.markasread}}}">
<span class="menu-action-text">{{#str}}markasread, mod_forum{{/str}}</span>
</a>