From fa544b236d00229ee6c000758b794ad597d4933a Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Fri, 22 Jan 2016 09:49:33 +0800 Subject: [PATCH] MDL-52137 mod_forum: Move digest body to shared template --- .../forum_post_email_htmlemail.mustache | 56 +------- .../forum_post_email_htmlemail_body.mustache | 134 ++++++++++++++++++ ...um_post_emaildigestfull_htmlemail.mustache | 2 +- 3 files changed, 136 insertions(+), 56 deletions(-) create mode 100644 mod/forum/templates/forum_post_email_htmlemail_body.mustache diff --git a/mod/forum/templates/forum_post_email_htmlemail.mustache b/mod/forum/templates/forum_post_email_htmlemail.mustache index f354b2333a7..a30885df905 100644 --- a/mod/forum/templates/forum_post_email_htmlemail.mustache +++ b/mod/forum/templates/forum_post_email_htmlemail.mustache @@ -92,61 +92,7 @@ {{/ showdiscussionname }} - - - - - - - - - -
- {{{ authorpicture }}} - -
- {{{ subject }}} -
-
- {{# str }} bynameondate, forum, { "name": "{{ authorfullname }}", "date": "{{ postdate }}" } {{/ str }} -
-
- {{# grouppicture }} - {{{ grouppicture }}} - {{/ grouppicture }} - {{^ grouppicture }} -   - {{/ grouppicture }} - - {{# attachments }} -
- {{{ attachments }}} -
- {{/ attachments }} - {{{ message }}} - -
- {{^ firstpost }} - - {{# str }} parent, forum {{/ str }} - - {{# canreply }} - | - {{/ canreply }} - {{/ firstpost }} - {{# canreply }} - - {{# str }} reply, forum {{/ str }} - - {{/ canreply }} -
- -
- - {{# str }} postincontext, forum {{/ str }} - -
-
+{{> mod_forum/forum_post_email_htmlemail_body }}
diff --git a/mod/forum/templates/forum_post_email_htmlemail_body.mustache b/mod/forum/templates/forum_post_email_htmlemail_body.mustache new file mode 100644 index 00000000000..37989036079 --- /dev/null +++ b/mod/forum/templates/forum_post_email_htmlemail_body.mustache @@ -0,0 +1,134 @@ +{{! + 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 . +}} +{{! + @template mod_forum/forum_post_emaildigestfull_htmlemail_body + + Template which defines the body component of a forum post for sending in a single-post HTML email. + + Classes required for JS: + * none + + Data attributes required for JS: + * none + + Context variables required for this template: + * courselink + * coursename + * forumindexlink + * forumviewlink + * forumname + * discussionlink + * discussionname + * showdiscussionname + * firstpost + * subject + * authorlink + * authorpicture + * authorfullname + * postdate + * grouppicture + * attachments + * message + * parentpostlink + * canreply + * replylink + * permalink + * unsubscribeforumlink + * unsubscribediscussionlink + + Example context (json): + { + "courselink": "https://example.com/course/view.php?id=2", + "coursename": "Example course", + "forumindexlink": "https://example.com/mod/forum/index.php?id=2", + "forumviewlink": "https://example.com/mod/forum/view.php?f=2", + "forumname": "Lorem ipsum dolor", + "discussionlink": "https://example.com/mod/forum/discuss.php?d=70", + "discussionname": "Is Lorem ipsum Latin?", + "showdiscussionname": 1, + "firstpost": 1, + "subject": "Is Lorem ipsum Latin?", + "authorlink": "https://example.com/user/view.php?id=2&course=2", + "authorpicture": "\"Picture", + "authorfullname": "Lucius Caecilius lucundus", + "postdate": "Sunday, 13 September 2015, 2:22 pm", + "grouppicture": "", + "attachments": "", + "message": "

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum et auctor libero. Quisque porta egestas neque, et bibendum libero dignissim at. Nulla facilisi. Morbi eget accumsan felis. Nunc et vulputate odio, vel venenatis nisl. Nunc maximus ipsum sed tincidunt mollis. Integer nunc erat, luctus sit amet arcu tincidunt, volutpat dignissim mi. Sed ut magna quam. Mauris accumsan porta turpis sed aliquam. Etiam at justo tristique, imperdiet augue quis, consectetur sapien. Ut nec erat malesuada sem suscipit lobortis. Vivamus posuere nibh eu ipsum porta fringilla. Sed vitae dapibus ipsum, ac condimentum enim. Sed dignissim ante at elit mollis, ac tempor lacus iaculis. Etiam nec lectus vitae nibh vulputate volutpat. Nulla quis tellus aliquam, commodo nisi et, dictum est.


", + "parentpostlink": "", + "canreply": 1, + "replylink": "https://example.com/mod/forum/post.php?reply=2", + "permalink": "https://example.com/mod/forum/discuss.php?d=2#2", + "unsubscribeforumlink": "https://example.com/mod/forum/subscribe.php?id=2", + "unsubscribediscussionlink": "https://example.com/mod/discussion/subscribe.php?id=2&d=2" + } +}} + + + + + + + + + +
+ {{{ authorpicture }}} + +
+ {{{ subject }}} +
+
+ {{# str }} bynameondate, forum, { "name": "{{ authorfullname }}", "date": "{{ postdate }}" } {{/ str }} +
+
+ {{# grouppicture }} + {{{ grouppicture }}} + {{/ grouppicture }} + {{^ grouppicture }} +   + {{/ grouppicture }} + + {{# attachments }} +
+ {{{ attachments }}} +
+ {{/ attachments }} + {{{ message }}} + +
+ {{^ firstpost }} + + {{# str }} parent, forum {{/ str }} + + {{# canreply }} + | + {{/ canreply }} + {{/ firstpost }} + {{# canreply }} + + {{# str }} reply, forum {{/ str }} + + {{/ canreply }} +
+ +
+ + {{# str }} postincontext, forum {{/ str }} + +
+
diff --git a/mod/forum/templates/forum_post_emaildigestfull_htmlemail.mustache b/mod/forum/templates/forum_post_emaildigestfull_htmlemail.mustache index 5b2240f1ca6..74dc5894848 100644 --- a/mod/forum/templates/forum_post_emaildigestfull_htmlemail.mustache +++ b/mod/forum/templates/forum_post_emaildigestfull_htmlemail.mustache @@ -77,4 +77,4 @@ "unsubscribediscussionlink": "https://example.com/mod/discussion/subscribe.php?id=2&d=2" } }} -{{> mod_forum/forum_post_email_htmlemail }} +{{> mod_forum/forum_post_email_htmlemail_body }} -- 2.17.1