diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-12 00:09:34 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-12 00:09:34 +0100 |
| commit | c39392747857dae64e90e174af7393e002dafad1 (patch) | |
| tree | 9d1336ae72f3cc0aad2d31923e71708011c37c39 /extensions/FlagTypeComment/template | |
| parent | e75d8cf78f93434f9f3394ab215e6eb5a28248ba (diff) | |
| download | bugzilla-c39392747857dae64e90e174af7393e002dafad1.tar.gz bugzilla-c39392747857dae64e90e174af7393e002dafad1.tar.xz | |
Bug 714786: The FlagTypeComment extension should allow more than one flag to
have have comment text associated with it
r=glob
Diffstat (limited to 'extensions/FlagTypeComment/template')
| -rw-r--r-- | extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl | 10 | ||||
| -rw-r--r-- | extensions/FlagTypeComment/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl b/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl index 81484f17c..95c0cb283 100644 --- a/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl +++ b/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl @@ -20,7 +20,7 @@ # byron jones <glob@mozilla.com> #%] -[% IF ftc_states.size %] +[% IF ftc_flags.keys.size %] <script type="text/javascript"> YAHOO.util.Event.onDOMReady(function() { var selects = YAHOO.util.Dom.getElementsByClassName('flag_select'); @@ -34,10 +34,10 @@ var state = ev.target.value; var commentEl = document.getElementById('comment'); if (!commentEl) return; - [% FOREACH state = ftc_states %] - [% IF state.flagtype %] - if ([% state.flagtype FILTER none %] == id && '[% state.state FILTER js %]' == state) { - var text = '[% state.text FILTER js %]'; + [% FOREACH type_id = ftc_flags.keys %] + [% FOREACH state = ftc_states %] + if ([% type_id FILTER none %] == id && '[% state FILTER js %]' == state) { + var text = '[% ftc_flags.$type_id.$state FILTER js %]'; var value = commentEl.value; if (value == text) { return; diff --git a/extensions/FlagTypeComment/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl b/extensions/FlagTypeComment/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl index 7f2c328af..71aaad424 100644 --- a/extensions/FlagTypeComment/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl +++ b/extensions/FlagTypeComment/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl @@ -27,15 +27,15 @@ </tr> [% FOREACH state = ftc_states %] - <tr> - <td> </td> - <td> - for [% state.state FILTER html %]<br> - <textarea - id="ftc_text_[% loop.index FILTER none %]" - name="ftc_text_[% loop.index FILTER none %]" - cols="50" rows="2">[% state.text FILTER html %]</textarea> - </td> - </tr> + <tr> + <td> </td> + <td> + for [% state FILTER html %]<br> + <textarea + id="ftc_[% type.id FILTER html %]_[% state FILTER html %]" + name="ftc_[% type.id FILTER html %]_[% state FILTER html %]" + cols="50" rows="2">[% ftc_flags.${type.id}.$state FILTER html %]</textarea> + </td> + </tr> [% END %] [% END %] |