diff options
| author | Byron Jones <glob@mozilla.com> | 2014-08-06 09:05:03 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2014-08-06 09:06:11 +0200 |
| commit | c0dd51d4d3f83015d77db8a6cc2958aa6fccc09c (patch) | |
| tree | 92508d0615ed45d8206e8d84457146088dcc9d7e | |
| parent | ec10d05697c5e8b89d4a76374563bacaf4238d02 (diff) | |
| download | bugzilla-c0dd51d4d3f83015d77db8a6cc2958aa6fccc09c.tar.gz bugzilla-c0dd51d4d3f83015d77db8a6cc2958aa6fccc09c.tar.xz | |
Bug 1049329: fix width of user_story field, and hide label for anon access when no story is set
4 files changed, 7 insertions, 18 deletions
diff --git a/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl b/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl index c7c202d62..6a7770066 100644 --- a/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl +++ b/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl @@ -7,6 +7,7 @@ #%] [% RETURN UNLESS bug.user_story_visible.0 %] +[% RETURN IF user.id == 0 && bug.cf_user_story == "" %] [% can_edit_story = bug.check_can_change_field('cf_user_story', 0, 1) %] <div class="user_story"> @@ -29,7 +30,9 @@ (<a href="javascript:void(0)" id="user_story_edit_action" >edit</a>) </span> [% END %] - [% IF bug.cf_user_story != "" %] + [% IF user.id + && bug.cf_user_story != "" + && bug.check_can_change_field('longdesc', 0, 1) %] <span id="user_story_comment"> [<a class="bz_reply_link" href="#user_story_comment" onclick="userStoryComment(); return false;" diff --git a/skins/contrib/Mozilla-OpenSans/global.css b/skins/contrib/Mozilla-OpenSans/global.css index 37c485e82..f9b24970d 100644 --- a/skins/contrib/Mozilla-OpenSans/global.css +++ b/skins/contrib/Mozilla-OpenSans/global.css @@ -452,16 +452,9 @@ table.edit_form hr { background: #ffffff; } -.bz_comment_table { -} - .bz_comment { - width: 65em; - margin: 0 0 20px; -} - -.bz_comment_table .bz_comment { width: 65em !important; + margin: 0 0 20px; } .bz_comment pre, #comment { diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css index b43488e9f..2a3396a6e 100644 --- a/skins/contrib/Mozilla/global.css +++ b/skins/contrib/Mozilla/global.css @@ -495,16 +495,9 @@ table.edit_form hr { background: #ffffff; } -.bz_comment_table { -} - .bz_comment { - width: 65em; - margin: 0 0 20px; -} - -.bz_comment_table .bz_comment { width: 65em !important; + margin: 0 0 20px; } .bz_comment pre, #comment { diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 496a98b1b..da4c675c7 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -195,7 +195,7 @@ [% IF user.settings.comment_box_position.value == 'before_comments' %] [% PROCESS comment_box %] - [% ELSE %] + [% ELSIF user.id %] [% PROCESS summon_comment_box %] [% END %] </td> |