diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index eb830b641..852ab5235 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -1,3 +1,4 @@
+<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
| <% 7.times do |i| %><%= day_name( (calendar.first_wday+i)%7 ) %> | <% end %>
@@ -11,10 +12,11 @@ while day <= calendar.enddt %>
<%= day.day %>
<% calendar.events_on(day).each do |i| %>
<% if i.is_a? Issue %>
-
+
<% else %>
@@ -30,3 +32,5 @@ end %>
+<% end %>
+<%= context_menu %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f70358b43..48bcbf9bc 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -928,6 +928,7 @@ p.cal.legend span {display:block;}
.tooltip{position:relative;z-index:24;}
.tooltip:hover{z-index:25;color:#000;}
.tooltip span.tip{display: none; text-align:left;}
+.tooltip span.tip a { color: #169 !important; }
div.tooltip:hover span.tip{
display:block;
@@ -940,6 +941,10 @@ font-size: 0.8em;
color:#505050;
}
+table.cal div.tooltip:hover span.tip {
+ top: 25px;
+}
+
img.ui-datepicker-trigger {
cursor: pointer;
vertical-align: middle;
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 8a45bb364..b0fbcfc6f 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -124,4 +124,12 @@ class CalendarsControllerTest < Redmine::ControllerTest
assert_response :success
assert_select 'h2', :text => 'Open issues grouped by tracker'
end
+
+ def test_show_should_have_a_context_menu_for_each_issue
+ get :show
+ assert_select 'form[data-cm-url=?]', '/issues/context_menu'
+ assert_select 'div.issue.hascontextmenu' do
+ assert_select 'input[name=?][type=?]', 'ids[]', 'checkbox'
+ end
+ end
end