ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove calendar link and icon from Coming Up list on Dashboard 

Fixes: UIDEV-163

test plan:
- navigate to the dashboard
- within the right side bar ... next to the "Coming Up" text
  the calendar link has been removed (compare to screenshots
  on the ticket for comparison)

Change-Id: Ica6f50a956bb0a4a763129859f5bec685343235f
Reviewed-on: https://gerrit.instructure.com/140970
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Mary Jane Anderson <manderson@instructure.com>
This commit is contained in:
Pam Hiett 2018-02-14 13:59:39 -07:00 committed by Pam Hiett
parent 152114e1e0
commit c10ebe0a1c
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/stylesheets/components/_g_instructure.scss
View File

@ -329,15 +329,6 @@
}
.events_list {
margin-bottom: $ic-sp * 1.5;
.event-list-view-calendar {
float: right;
@include fontSize(12px);
font-weight: normal;
&[class*=icon-]:before, &[class^=icon-]:before {
@include fontSize(16px);
vertical-align: middle;
}
}
}
* + .events_list { margin-top: $ic-sp * 1.5; }
.details {

5
app/views/shared/_event_list.html.erb
View File

@ -29,8 +29,9 @@
partial = is_recent_feedback ? 'courses/recent_feedback' : 'courses/recent_event'
contexts_to_link_to ||= nil
%>
<div class="events_list <%= is_recent_feedback ? 'recent_feedback' : 'coming_up' %>">
<h2><% unless is_recent_feedback %><a class='event-list-view-calendar icon-calendar-day standalone-icon' href='<%= calendar_url_for(contexts_to_link_to) %>'><%= t 'links.view_calendar', "View Calendar" %></a><% end %> <%= title %></h2>
<div class="events_list
<%= is_recent_feedback ? 'recent_feedback' : 'coming_up' %>">
<h2><%= title %></h2>
<ul class="right-side-list events">
<% if !event_list || event_list.empty? %>
<li>

4
spec/selenium/calendar/calendar2_event_create_spec.rb
View File

@ -91,8 +91,8 @@ describe "calendar2" do
group(:context => @course)
get "/groups/#{@group.id}"
expect_new_page_load { f('.event-list-view-calendar').click }
event_name = 'some name'
get "/calendar?include_contexts=group_#{@group.id}"
event_name = 'Test Event'
create_calendar_event(event_name, false, false, false)
event = @group.calendar_events.last

5
spec/selenium/helpers/groups_shared_examples.rb
View File

@ -37,11 +37,6 @@ shared_examples 'home_page' do |context|
expect(f('.coming_up .event a b')).to include_text("#{event.title}")
end
it "should display a view calendar link on the group home page", priority: pick_priority(context, student: "1", teacher: "2"), test_id: pick_test_id(context, student: 273603, teacher: 319910) do
get url
expect(f('.event-list-view-calendar')).to be_displayed
end
it "should have a working link to add an announcement from the group home page", priority: pick_priority(context, student: "1", teacher: "2"), test_id: pick_test_id(context, student: 273604, teacher: 319911) do
get url
expect_new_page_load { fln('Announcement').click }