diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2014-02-28 06:45:42 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2014-02-28 06:45:42 +0100 |
| commit | 3acffd9d93b3c5f00f273ac695e759cc2fc5972c (patch) | |
| tree | 13d500e8a6ae138e1e67b154c7d423f7fc69684d | |
| parent | 02bb1602d26f4712a1dfe57e86ecdb728c607241 (diff) | |
| download | bugzilla-3acffd9d93b3c5f00f273ac695e759cc2fc5972c.tar.gz bugzilla-3acffd9d93b3c5f00f273ac695e759cc2fc5972c.tar.xz | |
Bug 977981 - backport upstream bug 975112 to bmo/4.2 to add the "Preview" mode for attachment comments
| -rw-r--r-- | template/en/default/attachment/create.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/attachment/edit.html.tmpl | 16 |
2 files changed, 12 insertions, 16 deletions
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 863d83ad0..45c61d5a1 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -105,13 +105,11 @@ TUI_hide_default('attachment_text_field'); <th><label for="comment">Comment:</label></th> <td> <em>(optional) Add a comment about this attachment to the [% terms.bug %].</em><br> - [% INCLUDE global/textarea.html.tmpl - name = 'comment' - id = 'comment' - minrows = 6 - maxrows = 15 - cols = constants.COMMENT_COLS - wrap = 'soft' + [% INCLUDE bug/comment.html.tmpl + minrows = 6 + maxrows = 15 + cols = constants.COMMENT_COLS + wrap = 'soft' %] </td> </tr> diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index 740a9da45..8c954a02b 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -259,23 +259,21 @@ <label for="comment">Comment (on the [% terms.bug %]):</label> [% classNames = 'block' %] [% classNames = "$classes bz_private" IF attachment.isprivate %] - [% INCLUDE global/textarea.html.tmpl - id = 'comment' - name = 'comment' - minrows = 10 - cols = 80 - wrap = 'soft' - classes = classNames + [% INCLUDE bug/comment.html.tmpl + minrows = 10 + cols = 80 + wrap = 'soft' + classes = classNames %] [% Hook.process('after_comment_textarea') %] </div> - [% END %] + [% END %] <div id="attachment_flags"> [% IF attachment.flag_types.size > 0 %] [% PROCESS "flag/list.html.tmpl" flag_types = attachment.flag_types read_only_flags = !can_edit %] - + [% END %] </div> |