diff options
| -rw-r--r-- | app/views/common/_calendar.html.erb | 6 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 5 | ||||
| -rw-r--r-- | test/functional/calendars_controller_test.rb | 6 |
3 files changed, 16 insertions, 1 deletions
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 -%> <table class="cal"> <thead> <tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr> @@ -11,10 +12,11 @@ while day <= calendar.enddt %> <p class="day-num"><%= day.day %></p> <% calendar.events_on(day).each do |i| %> <% if i.is_a? Issue %> - <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip"> + <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip hascontextmenu"> <%= "#{i.project} -" unless @project && @project == i.project %> <%= link_to_issue i, :truncate => 30 %> <span class="tip"><%= render_issue_tooltip i %></span> + <%= check_box_tag 'ids[]', i.id, false, :style => 'display:none;', :id => nil %> </div> <% else %> <span class="icon icon-package"> @@ -30,3 +32,5 @@ end %> </tr> </tbody> </table> +<% 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..9f9b2a2ef 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -48,6 +48,12 @@ class CalendarsControllerTest < Redmine::ControllerTest assert_select 'p.buttons' end end + + # Assert context menu on issues + assert_select 'form[data-cm-url=?]', '/issues/context_menu' + assert_select 'div.issue.hascontextmenu' do + assert_select 'input[name=?][type=?]', 'ids[]', 'checkbox' + end end def test_show_should_run_custom_queries |