summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-27 08:35:19 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-27 08:35:19 +0000
commit29a474b641d50c627263d7aa0bfc681d12d94c8d (patch)
tree81933ea3de8c59c124359b23722e6e948345cec5
parent8a2786c91e528138ba91037791a02889b7ebdcb1 (diff)
downloadredmine-29a474b641d50c627263d7aa0bfc681d12d94c8d.tar.gz
redmine-29a474b641d50c627263d7aa0bfc681d12d94c8d.zip
Wrap issue description and its contextual menu in a div (#12211).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10728 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/issues/show.html.erb2
-rw-r--r--test/functional/issues_controller_test.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 308f93b61..c41b7b790 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -71,6 +71,7 @@ end %>
<% if @issue.description? || @issue.attachments.any? -%>
<hr />
<% if @issue.description? %>
+<div class="description">
<div class="contextual">
<%= link_to l(:button_quote),
{:controller => 'journals', :action => 'new', :id => @issue},
@@ -83,6 +84,7 @@ end %>
<div class="wiki">
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
</div>
+</div>
<% end %>
<%= link_to_attachments @issue, :thumbnails => true %>
<% end -%>
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 271791f44..a6917d2f9 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -827,6 +827,8 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'show'
assert_equal Issue.find(1), assigns(:issue)
+ assert_select 'div.issue div.description', :text => /Unable to print recipes/
+
# anonymous role is allowed to add a note
assert_select 'form#issue-form' do
assert_select 'fieldset' do