From c70ddc335d3d3514928d0a61bb23abf06eba8770 Mon Sep 17 00:00:00 2001 From: Ryan Wyllie Date: Fri, 3 May 2019 11:44:25 +0800 Subject: [PATCH] MDL-65474 forum: adjust forum post html structure Move around the HTML structure for the forum post to better match the previous structure for the author pictures, groups, and rating HTML --- .../templates/forum_discussion_post.mustache | 422 +++++++++--------- 1 file changed, 219 insertions(+), 203 deletions(-) diff --git a/mod/forum/templates/forum_discussion_post.mustache b/mod/forum/templates/forum_discussion_post.mustache index 0467ae10b1c..5a5e28fb64a 100644 --- a/mod/forum/templates/forum_discussion_post.mustache +++ b/mod/forum/templates/forum_discussion_post.mustache @@ -46,227 +46,243 @@ data-post-id="{{id}}" data-content="forum-post" > {{#isfirstunread}}{{/isfirstunread}} - {{^isdeleted}} - {{#author}} -
- {{#urls.profileimage}} - - {{/urls.profileimage}} - {{#groups}} - {{#urls.image}} - {{#str}} pictureof, core, {{name}} {{/str}} - {{/urls.image}} - {{/groups}} -
- {{/author}} - {{/isdeleted}} -
-
- {{#parentauthorname}} - {{#str}} inreplyto, mod_forum, {{.}} {{/str}} - {{/parentauthorname}} -

{{$subject}}{{{subject}}}{{/subject}}

+
+
{{^isdeleted}} -
- {{#html.authorsubheading}}{{{.}}}{{/html.authorsubheading}} - {{^html.authorsubheading}} - - {{/html.authorsubheading}} -
+ {{#author}} +
+ {{#urls.profileimage}} + + {{/urls.profileimage}} +
+ {{/author}} {{/isdeleted}} - {{#isprivatereply}} -
- {{#str}}postisprivatereply, forum{{/str}} -
- {{/isprivatereply}} - {{#hasreplycount}} - {{#str}} numberofreplies, mod_forum, {{replycount}} {{/str}} - {{/hasreplycount}} +
+ {{#parentauthorname}} + {{#str}} inreplyto, mod_forum, {{.}} {{/str}} + {{/parentauthorname}} +

{{$subject}}{{{subject}}}{{/subject}}

+ {{^isdeleted}} +
+ {{#html.authorsubheading}}{{{.}}}{{/html.authorsubheading}} + {{^html.authorsubheading}} + + {{/html.authorsubheading}} +
+ {{/isdeleted}} + {{#isprivatereply}} +
+ {{#str}}postisprivatereply, forum{{/str}} +
+ {{/isprivatereply}} + {{#hasreplycount}} + {{#str}} numberofreplies, mod_forum, {{replycount}} {{/str}} + {{/hasreplycount}} +
-
- {{{message}}} -
- {{^isdeleted}} - {{#haswordcount}} -

{{#str}} numwords, core, {{wordcount}} {{/str}}

- {{/haswordcount}} - - {{#attachments}} - {{#isimage}} -
- {{#str}} attachmentname, mod_forum, {{filename}} {{/str}} - {{#urls.export}} - - {{#pix}} t/portfolioadd, core {{/pix}} - - {{/urls.export}} - {{#html.plagiarism}} -
{{{.}}}
- {{/html.plagiarism}} +
+ {{^isdeleted}} + {{#author}} +
+ {{#groups}} + {{#urls.image}} + + {{/urls.image}} + {{/groups}}
- {{/isimage}} - {{/attachments}} - - {{{html.taglist}}} + {{/author}} + {{/isdeleted}} - {{#attachments}} - {{^isimage}} -
- - {{#pix}} {{icon}}, core {{/pix}} {{filename}} - - {{#urls.export}} - - {{#pix}} t/portfolioadd, core {{/pix}} - - {{/urls.export}} - {{#html.plagiarism}} -
{{{.}}}
- {{/html.plagiarism}} -
- {{/isimage}} - {{/attachments}} +
+
+ {{{message}}} +
- {{#html.rating}} -
{{{.}}}
- {{/html.rating}} + {{^isdeleted}} + {{#haswordcount}} +

{{#str}} numwords, core, {{wordcount}} {{/str}}

+ {{/haswordcount}} - {{$actions}} - {{^readonly}} - + {{/isimage}} + {{/attachments}} + + {{{html.taglist}}} + + {{#attachments}} + {{^isimage}} + + {{/html.plagiarism}} +
+ {{/isimage}} + {{/attachments}} + +
+ {{#html.rating}} +
{{{.}}}
+ {{/html.rating}} + {{$actions}} + {{^readonly}} + + {{/readonly}} + {{/actions}}
- {{/readonly}} - {{/actions}} - {{$footer}}{{/footer}} - {{/isdeleted}} + {{$footer}}{{/footer}} + {{/isdeleted}} +
+
-- 2.17.1