diff options
author | Byron Jones <glob@mozilla.com> | 2015-10-15 17:59:10 +0200 |
---|---|---|
committer | Byron Jones <glob@mozilla.com> | 2015-10-15 17:59:10 +0200 |
commit | 2e2981d25c185fde56f29c7aed4e3e6bba50039e (patch) | |
tree | 725b4a4b7de9d444ce2b84e9cedce3dc8d7f7896 /extensions/EditComments/template/en/default/hook | |
parent | 5265c09db899e148ceef6ba47aa199fa1e282e7b (diff) | |
download | bugzilla-2e2981d25c185fde56f29c7aed4e3e6bba50039e.tar.gz bugzilla-2e2981d25c185fde56f29c7aed4e3e6bba50039e.tar.xz |
Bug 1153101 - add hooks for edit-comments extension
Diffstat (limited to 'extensions/EditComments/template/en/default/hook')
-rw-r--r-- | extensions/EditComments/template/en/default/hook/bug/comments-a_comment-end.html.tmpl | 52 | ||||
-rw-r--r-- | extensions/EditComments/template/en/default/hook/bug_modal/activity_stream-comment_action.html.tmpl | 26 | ||||
-rw-r--r-- | extensions/EditComments/template/en/default/hook/bug_modal/header-end.html.tmpl (renamed from extensions/EditComments/template/en/default/hook/bug/show-header-end.html.tmpl) | 10 |
3 files changed, 32 insertions, 56 deletions
diff --git a/extensions/EditComments/template/en/default/hook/bug/comments-a_comment-end.html.tmpl b/extensions/EditComments/template/en/default/hook/bug/comments-a_comment-end.html.tmpl deleted file mode 100644 index cf54c71ed..000000000 --- a/extensions/EditComments/template/en/default/hook/bug/comments-a_comment-end.html.tmpl +++ /dev/null @@ -1,52 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% IF comment.body != '' - && Param('edit_comments_group') - && user.in_group(Param('edit_comments_group')) - && (comment.type == constants.CMT_NORMAL - || comment.type == constants.CMT_DUPE_OF - || comment.type == constants.CMT_ATTACHMENT_CREATED - || comment.type == constants.CMT_ATTACHMENT_UPDATED) -%] - <span id="edit_comment_link_[% comment.count FILTER html %]"> - [<a href="javascript:void(0);" id="edit_comment_edit_link_[% comment.count FILTER html %]" - onclick="editComment('[% comment.count FILTER js %]','[% comment.id FILTER js %]');">edit</a> - [% IF comment.edit_count %] - | <a href="page.cgi?id=editcomments.html&bug_id=[% bug.id FILTER uri %]&comment_id=[% comment.id FILTER uri %]">history</a> - ([% comment.edit_count FILTER html %]) - [% END %]] - </span> - <div id="edit_comment_[% comment.count FILTER html %]"> - <div class="bz_comment_text bz_default_hidden" id="edit_comment_loading_[% comment.count FILTER html %]">Loading...</div> - [% INCLUDE global/textarea.html.tmpl - name = "edit_comment_textarea_${comment.id}" - id = "edit_comment_textarea_${comment.count}" - minrows = 10 - maxrows = 25 - classes = "edit_comment_textarea bz_default_hidden" - cols = constants.COMMENT_COLS - disabled = 1 - %] - </div> - <script> - YAHOO.util.Event.onDOMReady(function() { - // Insert edit links near other comment actions such as reply - var comment_div = YAHOO.util.Dom.get('c[% comment.count FILTER js %]'); - var bz_comment_actions = YAHOO.util.Dom.getElementsByClassName('bz_comment_actions', 'span', comment_div)[0]; - var edit_comment_link = YAHOO.util.Dom.get('edit_comment_link_[% comment.count FILTER js %]'); - bz_comment_actions.insertBefore(edit_comment_link, bz_comment_actions.firstChild); - - // Insert blank textarea right below formatted comment - var comment_div = YAHOO.util.Dom.get('c[% comment.count FILTER js %]'); - var comment_pre = YAHOO.util.Dom.get('comment_text_[% comment.count FILTER js %]'); - var edit_comment_div = YAHOO.util.Dom.get('edit_comment_[% comment.count FILTER js %]'); - comment_div.insertBefore(edit_comment_div, comment_pre); - }); - </script> -[% END %] diff --git a/extensions/EditComments/template/en/default/hook/bug_modal/activity_stream-comment_action.html.tmpl b/extensions/EditComments/template/en/default/hook/bug_modal/activity_stream-comment_action.html.tmpl new file mode 100644 index 000000000..358359243 --- /dev/null +++ b/extensions/EditComments/template/en/default/hook/bug_modal/activity_stream-comment_action.html.tmpl @@ -0,0 +1,26 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[% + RETURN IF comment.body == ''; + RETURN UNLESS Param('edit_comments_group') && user.in_group(Param('edit_comments_group')); + RETURN UNLESS + comment.type == constants.CMT_NORMAL + || comment.type == constants.CMT_DUPE_OF + || comment.type == constants.CMT_ATTACHMENT_CREATED + || comment.type == constants.CMT_ATTACHMENT_UPDATED; +%] + +[% IF comment.edit_count %] + <a href="page.cgi?id=editcomments.html&bug_id=[% bug.id FILTER none %]&comment_id=[% comment.id FILTER none %]" + title="[% comment.edit_count FILTER none %] edit[% "s" UNLESS comment.edit_count == 1 %]">(Edited)</a> +[% END %] + +<button class="edit-comment-btn minor edit-show" type="button" style="display:none" + data-id="[% comment.id FILTER none %]" + data-no="[% comment.count FILTER none %]">Edit</button> diff --git a/extensions/EditComments/template/en/default/hook/bug/show-header-end.html.tmpl b/extensions/EditComments/template/en/default/hook/bug_modal/header-end.html.tmpl index 331d7e6df..68597bcb0 100644 --- a/extensions/EditComments/template/en/default/hook/bug/show-header-end.html.tmpl +++ b/extensions/EditComments/template/en/default/hook/bug_modal/header-end.html.tmpl @@ -6,7 +6,9 @@ # defined by the Mozilla Public License, v. 2.0. #%] -[% IF Param('edit_comments_group') && user.in_group(Param('edit_comments_group')) %] - [% style_urls.push('extensions/EditComments/web/styles/editcomments.css') %] - [% javascript_urls.push('extensions/EditComments/web/js/editcomments.js') %] -[% END %] +[% + IF Param('edit_comments_group') && user.in_group(Param('edit_comments_group')); + style_urls.push('extensions/EditComments/web/styles/editcomments.css'); + javascript_urls.push('extensions/EditComments/web/js/editcomments.js'); + END; +%] |