Commit Graph

3631 Commits

Author SHA1 Message Date
Keith Garner 4d99c40afb assignment page indicates that all submission types have been excused
Assignment page now indicates for all submission types that the
assignment has been excused. Because of this, students will now
properly see that excused No Submission and On Paper assignments have been
excused.

fixes CNVS-22110

test plan:
- Create two assignments, one with No Submission and one On Paper
- Excuse the assignments and view the assignment pages as a student.
- Observe that the assignment says 'Excused!' in the submission details.

Change-Id: I31114e84566ea5a0121aed50760997d9284cc797
Reviewed-on: https://gerrit.instructure.com/60077
Reviewed-by: Cody Poll <cpoll@instructure.com>
Tested-by: Jenkins
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2015-08-07 16:37:28 +00:00
Andraia Allsop 59bf3714a7 Allows teacher to clone a group set.
Option 'Clone Group Set' added in the group set cog wheel.
When modifying group membership on a group that has submitted an
assignment, teacher is alerted and given option of cloning group set
or changing groups.

fixes CNVS-19746

test plan:
- as a teacher
  - navigate to a course
  - select 'People' and go to 'Groups'
  - create a new group set with groups and memberships
  - create a group assignment for that group set
- as a student who is a member of a group of that group set
  - submit the assignment for their group
- as a teacher
  - modify the memberships for that group set
    - for groups that have submissions
      - drag and drop a student
        - out of group into another group
        - out of group into 'Unassigned Students'
        - into group from another group
        - into group from 'Unassigned Students'
      - remove student using 'Remove' option in cog wheel
      - move student using 'Move To...' option in cog wheel
      - add student from 'Unassigned Students' using '+' option
      - when 'Clone Group Set' modal is displayed
        - select 'New Group Set'
          - memberships in original group set should not change
          - within cloned group set
            - should contain all groups, group leader, memberships,
              and membership limits from original group set
            - group membership modification should function as normal
        - selecting 'Change Groups'
          - group membership changes
  - delete assignment created for group set
    - group membership modification should function as normal
  - select 'Clone Group Set' option from group set cog wheel
    - should follow same expectations when 'New Group Set' is
      selected from alert
- significant UI changes were made and should be tested
- accessibility has been considered and should be tested
- regression test on group

Change-Id: I59276eca93f86d370f8658f5bdd0e9464f3fa061
Reviewed-on: https://gerrit.instructure.com/58753
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Andraia Allsop <aallsop@instructure.com>
2015-08-07 16:31:52 +00:00
Brock Cooper 85f20bb121 Add Warning Icon to Modules with submissions
Fixes CNVS-22366

Test Plan:
1) Add a module with the "must complete all" requirements option.
2) For one of the requirements, have an assignment with a "score at least"
3) As a student, submit the assignment
4) Ensure that the yellow warning sign is now showing in the module header

Change-Id: Idf7067ae7ee9f9361abb44a1d91bb554d164b462
Reviewed-on: https://gerrit.instructure.com/60043
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Brock Cooper <bcooper@instructure.com>
2015-08-06 21:37:58 +00:00
August Thornton c542e7a522 make radio_button_tag id's unique per config
fixes CNVS-22165

test plan:
  * go to /accounts/self/authentication_providers
  * create at least two ldap configs
  * ensure the radio buttons work independently
    per ldap configuration
  * ensure radio button selections save properly
  * default ldap config should check
    "No TLS" by default

Change-Id: Ibb1702b0d732a91856191b054d33c389a5c0dbab
Reviewed-on: https://gerrit.instructure.com/60089
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: August Thornton <august@instructure.com>
2015-08-06 17:32:05 +00:00
Erin Hallmark 45f29292cd removed mention of Scribd from Google Docs Previews help dialog
Change-Id: Id5c69429b9c159c6f6617beb7e69b1a0be6ddffe
Reviewed-on: https://gerrit.instructure.com/59590
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2015-08-06 16:38:13 +00:00
Erin Hallmark 5cdb323d3d changed URL to point to new community
Change-Id: I626afed6c1db860cd28c891856188d3d73b39b5e
Reviewed-on: https://gerrit.instructure.com/59583
Tested-by: Jenkins
Reviewed-by: Strand McCutchen <smccutchen@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2015-08-06 16:30:52 +00:00
Strand McCutchen 5a2269ff8a GradebookImporter only allows editing current assignments
fixes CNVS-19924

When a teacher uploads a CSV with assignments in past
grading periods then they are not able to change grades.

Test plan

1. As an admin, create an account level grading period in
   the past.
2. Create assignments due during the past grading period.
3. Login as a teacher.
4. Navigate to the gradebook
5. Click export to download a CSV
6. Change the grade for the assignment in the past grading
   period.
7. Click the export button and use the wizard to upload
   your modified CSV.
8. You should receive a message telling you you are not
   allowed to edit the assignment in the past.

Change-Id: Ia8701c3504b03bd6ed35d0da1fe56cd8330ace79
Reviewed-on: https://gerrit.instructure.com/55297
Reviewed-by: Dylan Ross <dross@instructure.com>
Tested-by: Jenkins
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Strand McCutchen <smccutchen@instructure.com>
2015-08-05 23:30:54 +00:00
Brock Cooper c2fa9bc3e0 Add correct screenreader message for Locked Module in JAWS
Fixes CNVS-22351

Test Plan:
1. Create a module
2. Edit the module and lock until a date
3. login as student and hover over the lock
4. Ensure screenreader reads out the Unlock at certain date message

Change-Id: I684700f7ffe29a684fbdccf05483f31c525c2f45
Reviewed-on: https://gerrit.instructure.com/60019
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2015-08-05 23:03:01 +00:00
Matthew Berns 17bd58b9d4 replace labels we're using for formatting with standard div elements for
accessibility compliance

fixes CNVS-22042
fixes CNVS-22044
fixes CNVS-22045
fixes CNVS-22041

test plan:
- check the following pages for any visual or accessibility regressions:
Assignment show page (teacher view)
Discussion Topic edit page (for both discussions and announcements)
Quiz show page

Change-Id: I51a915994fb3a047e0b6a461870de9d24ba9fd33
Reviewed-on: https://gerrit.instructure.com/58973
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Dana Danger <dana@instructure.com>
2015-08-05 21:19:53 +00:00
Brock Cooper 4a2d2da18b Remove icons and pill message if module does not have requirements
Fixes CNVS-22295

Test Plan:
1) Login as teacher, create module
2) You should expect that there is no requirement message that
   says 'Complete All Items'
3) Publish module as a teacher then as a student ensure that
   there is no requirement message and that there is no completed
   check mark icon. There should be no icon.
4) As a teacher, add an assignment to the module and publish it
5) As a student, ensure that there still is no requirement message
   or check mark
6) As a teacher, make the assignment a requirement for the module.
7) You should expect that the requirement message that says 'Complete
   All Items' now appears on both student and teacher view.:

Change-Id: Ibb8a41a496d71d5f006ef3845f6ebca6af4b7fbf
Reviewed-on: https://gerrit.instructure.com/59878
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-08-04 23:19:11 +00:00
Stephen Jensen ddc363b7b3 NVDA - Global nav options have extraneous 'link' announced
Fixes: CNVS-21513

Test Plan:
- In Firefox with NVDA enabled, turn on the new UI

- Move through the global nav with NVDA

- Previously, Account and Inbox options had an extra
  link announced (http://screencast.com/t/mAp9jc5tMtjO)

- Now, the Account and Inbox options should be
  consistent with the ones before them (no extra
  'link' is announced)

Change-Id: Ie7267a4a93680c5ea8f066b505148c1b0e42fa31
Reviewed-on: https://gerrit.instructure.com/59669
Tested-by: Jenkins
Reviewed-by: Jennifer Stern <jstern@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2015-08-04 20:13:01 +00:00
Brock Cooper 74e7cd1f49 Fix Module Item Link navigation for NVDA
Fixes CNVS-21383

Test Plan:
1. In Firefox with NVDA enabled, navigate to
   the Modules page of a course
2. Using the up and down arrow keys, move NVDA
   focus to the name of a module item
3. Press Enter and you should expect the system
   to navigate to the assignment

Change-Id: Ic2e34b1030ccbc4bffca8bceaab5215a31732150
Reviewed-on: https://gerrit.instructure.com/58530
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Brock Cooper <bcooper@instructure.com>
2015-08-04 18:32:33 +00:00
Steven Burnett 3279c5055f fixed conference collapse/expanding reading
Fixed the way screen reader reads the collapsed
and expanding of the new conferences and concluded
conferences reading.

fixes CNVS-21775

test plan:
- Go to the conferences page
- with screen reader on navigate to the
  new conferences header
- collapse and expand it notice the correct reading
- repeat above for concluded conferences
- repeat above for all screenreaders

Change-Id: I72dd37aef3410435b8326c1c99736889c8bad268
Reviewed-on: https://gerrit.instructure.com/59530
Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Peyton Craighill <pcraighill@instructure.com>
2015-08-03 22:28:22 +00:00
Ryan Shaw ff923f08ec ThemeEditor: fix wording on notification message
fixes: CNVS-22211

test plan:
* make changes in theme editor, 
* the banner at the top of the page should say this
new message

Change-Id: Ib1b15540446b6df01fe7987f9f5e8bd955b208b0
Reviewed-on: https://gerrit.instructure.com/59451
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2015-08-03 19:28:11 +00:00
Brock Cooper 261511c9ff Changes <h4> tag to <h3> for a11y purposes
Fixes CNVS-21984

Test Plan:
1. Navigate to Courses show page as a teacher for unpublished course
2. Inspect Element and ensure that the #course_status div has an <h3>
   tag in the div instead of <h4>
3. Ensure styles for this specific header are same as previous version
   with <h4> tag

Change-Id: I5c3a86e76d46cd9655b55b317adfd29a113e41cf
Reviewed-on: https://gerrit.instructure.com/59173
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Brock Cooper <bcooper@instructure.com>
2015-08-03 14:44:33 +00:00
Stephen Jensen b79f99f1f2 "Switch to Individual View" should not be next to breadcrumbs
Fixes: CNVS-22090

This change involves the location of the
"Switch to Individual View" link on the
gradebook page in both the NUI and legacy
Canvas.

Test Plan:
	- Navigate to the gradebook page.

	- Previously "Switch to Individual View" was
	  part of the breadcrumb as can be seen here:
	  NUI:    http://screencast.com/t/OYLhED9MRo
	  Legacy: http://screencast.com/t/zhrnyd5HF

	- We have made the following changes

		* Instead of a link, it is now a button.

		* It is now located in the gradebook header
		  on the the right side
		  http://www.screencast.com/t/tby7EmuP7ldK

	- Clicking on the button should take you to
	  the corresponding 'Gradebook: Individual
	  View' page.

	- In both legacy Canvas and the NUI the
	  behavior should be the same.

	- NOTE: Because the 'Individual View' link was
	  previously in the breadcrumb, the corresponding
	  gradebook2_srgb_spec was failing because it was
	  still looking for the 'ellipsible' class (a
	  class associated with breadcrumb elements)
	  Because the link has now been removed from the
	  breadcrumb, the 'ellipsible' class was also
	  removed in order to update the spec.

Change-Id: Id53ca2b81904447aa57b8ce527598d08f458056b
Reviewed-on: https://gerrit.instructure.com/59292
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2015-08-01 18:27:47 +00:00
Chris Hart 887dc76468 Theme editor preview area
Fixes: CNVS-21906

Test plan:
- Make sure the Use New Styles feature flag is
  set to ON
- Open Theme Editor from your admin account
- Make sure Canvas iframe on right side now
  opens on this page ...
  http://cl.ly/image/2c3k1R3V3U0T
  ... instead of on the Dashboard
- Theme editor should work the same
  as before this change

Change-Id: Ifa38134ba186bc49c12062ae914a004b3664d189
Reviewed-on: https://gerrit.instructure.com/59007
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Myller de Araujo <myller@instructure.com>
2015-07-31 23:28:11 +00:00
Simon Williams 612ddb515e remove N+1 queries on term index page
This will make the page a little faster, but unfortunately the bulk of
the time comes from counting active users in each term, and whether we
do that as N queries or 1, the overall time is about the same.  To
really get this page to perform well, we need to look into storing these
counts somewhere that don't have to be calculated every time.

fixes CNVS-21524

test plan:
- set up several enrollment terms with different numbers of courses and
  users in each.
- to go the root account enrollment terms page, and make sure the counts
  of active courses and users is accurate.
- try deleting some of the courses and users and make sure counts update
  appropriately.
- basic regression test of functionality around saving/editing
  enrollment term start/end date overrides

Change-Id: I35fb637ddd91db64c4a5890d58a622f5affa3923
Reviewed-on: https://gerrit.instructure.com/56439
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-07-31 20:21:20 +00:00
James Williams 11f6037ae9 rails4: various spec fixes
refs #CNVS-21596

Change-Id: Ia4eac582175dee362d0b8bbb3006bc8d400f1b07
Reviewed-on: https://gerrit.instructure.com/59502
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-31 16:28:24 +00:00
Aaron Cannon 10c5e9ef99 A11y: Add headings to Course Navigation Settings page
Fixes CNVS-21998

Test plan:
- visit the course settings page, navigation tab.
- Verify that the appearance is unchanged.
- Using a screen reader, ensure that headings appear before each list with
  text which describes what that list is for.

Change-Id: Ib8d70e01ad4d5886d7652f74426aadc74f645718
Reviewed-on: https://gerrit.instructure.com/58841
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Reviewed-by: Sterling Cobb <sterling@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2015-07-30 20:32:35 +00:00
Alex Boyd b2a7a86eda Show dashboard as selected tab after login
Fixes CNVS-22039

Test plan:
 - Enable the new UI
 - Log in
 - Ensure that 'login_success=1' is in the URL
 - Ensure that the dashboard tab appears selected with a white
   background

Change-Id: I4744dd4064e00146de774b10e1b86a9147025db0
Reviewed-on: https://gerrit.instructure.com/58886
Tested-by: Jenkins
Product-Review: Colleen Palmer <colleen@instructure.com>
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Adrian Russell <arussell@instructure.com>
2015-07-30 16:27:39 +00:00
Brock Cooper f5c5f8de9d Student View for NC-Or Project
Addresses CNVS-20851

- Adds progress icons for each individual module item
- Adds progress icons for each module
- Ensures module progression works in accordance
  to the module requirement pills and prerequisites
  in the module header

Change-Id: I44811ce19db40e42fb35396070b679ba93609294
Reviewed-on: https://gerrit.instructure.com/58892
Tested-by: Jenkins
Reviewed-by: Sterling Cobb <sterling@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-07-29 20:10:59 +00:00
Brian Finney 01e6bfbaf7 Sanitize quiz answer comments html
Fixes CNVS-22170

Test plan:
 - Create a quiz
 - Set a answer comment to `">'><img src=x onerror=alert(3)>`
 - Take the test and view the resulting answer comment every where you
 can find it
 - Try lots of other forms of html to try and execute javascript

Change-Id: I209b266a648810763e03b602790001034815b44f
Reviewed-on: https://gerrit.instructure.com/59457
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
2015-07-29 16:10:10 +00:00
Brock Cooper 03c818abde Remove unnecessary broken link for unpublished course
Fixes CNVS-21785

Test Plan:
1. Navigate to Courses show page as a teacher for unpublished course
2. Ensure that the alert saying 'Only Teachers Can See This Course
   Until It Is Published' does not contain a link
3. Prior version only had a broken link leading nowhere. Removing to
   avoid confusion.

Change-Id: I7312a34e22d76b1035385887d141d138d944aada
Reviewed-on: https://gerrit.instructure.com/59185
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2015-07-28 23:46:57 +00:00
Jennifer Stern 84933275d7 Add Upload CSS/JS tab to Theme Editor
refs CNVS-21431, CNVS-21425

Test scenarios: https://gist.github.com/junyper/7481e6a2b65a1b799bad

Change-Id: I28b24bce592952acfd33cb1303496b8178f0d4b4
Reviewed-on: https://gerrit.instructure.com/58780
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2015-07-28 22:35:52 +00:00
Brian Finney dde4def97b Add maxlength attributes to matching and dropdown
Sets maxlength to 80 for matching and multiple dropdown questions input
fields

Fixes CNVS-19584

Test plan
 - Create a matching or multiple choice question
 - Try to enter more than 80 characters into input field
 - You shouldn't be able to

Change-Id: I510f38db133756b3633e90295974015130dc88f2
Reviewed-on: https://gerrit.instructure.com/57554
Reviewed-by: Matt Berns <mberns@instructure.com>
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Tested-by: Jenkins
Product-Review: Jason Sparks <jsparks@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
2015-07-28 16:56:59 +00:00
Dan Minkevitch afb0c33f50 Hide "Remove From Course" option for SIS users
fixes CNVS-21767

Test Plan:
* Go to a course with users that were
  imported via SIS
* Go to the "People" section as a teacher
* Press the ItemCog on one of the SIS users
* The option to "Remove From Course" should NOT be visible

Change-Id: Ie86f43be9a2fdf87373d54eb6bb736013e1a1bc2
Reviewed-on: https://gerrit.instructure.com/59340
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2015-07-28 16:51:50 +00:00
Matthew Berns bae5ce6d08 make the announcements index page a list for a11y purposes
fixes CNVS-20721

test plan:
- go to announcements index page with voiceover enabled
- the announcements index should behave as a list for VO technology
  (the assignments index page can be used as a basis for comparison)

Change-Id: Ife521819facac4d288fbc14be80022ff9ce7fd2c
Reviewed-on: https://gerrit.instructure.com/58464
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2015-07-24 22:03:40 +00:00
Stephen Jensen 84973a5691 (NUI) Move context menu beneath breadcrumbs
Closes CNVS-21176

Note: This affects the main canvas layout. Before,
the context menu was to the left side of the
breadcrumb as can be seen here:
http://www.screencast.com/t/Oj8s3Fnbu. Now, the
context menu and page content is below the
breadcrumb, as can be seen here:
http://www.screencast.com/t/0eQv3UBvBSix.

We need a full regression on this to make sure our
padding maintains integrity throughout Canvas (for
example, avoiding situations as can be seen here
http://www.screencast.com/t/4cF0mccTwCt where the
padding is ommitted and content is flush with other
elements on the page)

Test Plan:
-The scope of this commit is across all of Canvas.
 Essentially, every page in the NUI (especially
 those with a breadcrumb) will need to be examined
 for the following:

	-The context menu should be below the
	 breadcrumb on any page that has a breadcrumb
	 (http://www.screencast.com/t/0eQv3UBvBSix)
	 except for Courses->Files (this page should
	 be unaffected and behave as before)

	-All page content should have padding as can
	 be seen here:
	 http://www.screencast.com/t/NAo0jdtZvzr
	 (Note: LTI tools intentionally omit the top
	 padding, as can be seen here:
	 http://www.screencast.com/t/Vk202kWm2x6)

	-On resize, there should still be padding
	 between the global nav and the page content

	-On resize, there should still be padding
	 between the right side of the browser window
	 and the page content.

	-On resize, when the right side content
	 collapses and moves to the bottom of the page,
	 its margins should be consistent with the width
	 of the footer as can be seen here:
	 http://www.screencast.com/t/OjQGqA3nBi

-Legacy Canvas should be unaffected by the changes
 made here. Breadcrumb pages in the legacy ui would
 be especially important to review.

Change-Id: I05ef5fbdb3e2bd7f9106e57a7a5ab651ccc51aaa
Reviewed-on: https://gerrit.instructure.com/58516
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2015-07-22 21:04:45 +00:00
Stephen Jensen 2874020670 Add Student Interaction Report in Courses > People
Closes CNVS-21637

Teachers accessing the Courses > People page now
have a corresponding button to the Student
Interaction Report.

Test Plan:
- As a teacher, navigate to Courses, and then
  select a course. Select 'People'

- There should now be a button for Student
  Interactions Report.

- Selecting the button should take you to
  the corresponding student interaction report.

- As a student, navigate to the Courses >
  People page. The button for Student Interaction
  Report should not be visible.

Change-Id: I13bf86324f679ac1a9f54e5b0082da54717c17f1
Reviewed-on: https://gerrit.instructure.com/58724
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
2015-07-22 21:04:30 +00:00
Cody Cutrer 9758115997 rename account authorization configs to authentication providers in routes
fixes CNVS-21924

also completely removes the long-deprecated update_all form

test plan:
 * create, update, delete an authentication provider via the UI
 * delete all providers via the UI
 * create, update, delete an auth provider via the API using both
   old and new routes

Change-Id: Id75351b937baf7369928edca1f8e08729214ad99
Reviewed-on: https://gerrit.instructure.com/58652
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2015-07-21 23:58:23 +00:00
Cody Cutrer ab2f304a7e allow sso settings to be configured without constraint
canvas auth counts as a provider, and even with just canvas auth a
school may want to send to their website first

Change-Id: Icfd833b0c0786334d98e21011a66af8146280c0b
Reviewed-on: https://gerrit.instructure.com/57543
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2015-07-21 16:46:05 +00:00
Colleen Palmer 2277e63544 Update new ui navigation logo to work with theme editor
fixes: CNVS-21376

This adds the styles and markup we need to customize the
new ui navigation logo.

Test Plan:
- Turn on new UI
- Go to Theme Editor
- Find the navigation logo and upload a new one
- Preview new logo
- Apply new logo, navigate to canvas and make sure it's still there
- Repeat a couple of times

Change-Id: Idd221a61c7806c71ca15a5d1e82cce0e39101ba8
Reviewed-on: https://gerrit.instructure.com/56393
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
Tested-by: Jenkins
QA-Review: Pedro Fajardo <pfajardo@instructure.com>
2015-07-20 17:34:14 +00:00
Clay Diffrient a96b40c5bd Converts accepting terms from using JS to Rails
Essentially there were some issues with JS failing for some reason
and that caused the redirect to not work appropriately.  This was
happening somewhat frequently especially for OSS users.

This change converts the terms_required view to use rails helper
methods and moves the redirect on success logic to the users
controller.

fixes CNVS-21496
fixes CNVS-21658
fixes gh-654

Test Plan:
  - Ensure that terms of service are required for the account
    This can be done with `Setting.set('terms_required', 'false')`
  - Login with a new user that hasn't already accepted terms
  - The agree to terms box should show up.
  - Checking the checkbox to accept terms and submitting should
    save that acknowledgement and move you along to the dashboard
    or whatever particular page you were needing to go to.

Change-Id: I016e7e21acda67ce26b5d782d37d1477f134a065
Reviewed-on: https://gerrit.instructure.com/58475
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2015-07-20 15:23:37 +00:00
Colleen Palmer 6d8251f624 Take out k12 styles (return to legacy look/feel)
fixes: CNVS-21745

This removes all the logic we had around html and styles specifically for k12
so we can return it to the legacy look/feel.

Primarily this is for legacy UI. See note below on new UI.

Test Plan:
- In legacy UI, turn on the k12 flag
- Nothing should change

Note: In k12 theme we primarily touched the navigation and account nav
(aka, course nav) area. So long as those look the same as
Canvas Legacy UI, it's good.

New UI: We will be making another commit that will allow new ui styles to
compile with k12 flag on. Right now turning new UI on will break it (since we
are not including these assets).

Change-Id: I71699ca3f77c508dc704e232c1e06ddf737f7e42
Reviewed-on: https://gerrit.instructure.com/57975
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
2015-07-18 19:22:02 +00:00
Colleen Palmer 6678e147c2 Adds new icons for global nav when k12 flag is on
refs: CNVS-21746

This makes it so when the k12 flag is on, we show a few different icons
in the global navigation for:

- Dashboard
- Courses
- Grades
- Inbox
- Calendar

Note: focus is on icons - background color may change based on your settings

Test Plan:
- Turn on New UI and you should see these icons:
http://cl.ly/image/0K1D031M0Y43

- Turn on k12 flag and you should see these:
http://cl.ly/image/1l232g0K2O1I

Change-Id: Ic79cdecb3b8dc83066e58fcd1c45f12422c56f17
Reviewed-on: https://gerrit.instructure.com/58135
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
2015-07-18 01:08:44 +00:00
James Williams daef59589d rails4: fix view specs
rails4 removed the automatic initialization of a local variable
matching the name of a partial view
 (e.g. setting `course` to nil in _course.html.erb)

also helper methods are protected so they cannot simply be
delegated to the spec controller anymore

refs #CNVS-21596

Change-Id: I7ce8b8a0084602a93f8ac571ee5c98740cb861d1
Reviewed-on: https://gerrit.instructure.com/58718
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-17 20:41:55 +00:00
Jonathan Featherstone 242f15c55d Cleaned up branching for LTI launch gradebook
Test Plan
  * configure powerschool grade posting by enabling sis feature flag
    * /accounts/:id/settings
      * "post grades to sis" -> on
    * /courses/:id/settings
      * SIS ID -> random number
  * add an assignment, make sure that "post grades to sis" is checked
  * navigate to gradebook, verify that "post grades" button is visible
  * verify that "post grades" button is not visible when no
    assignments are present
  * click on button and verify that current powerschool modal launches
  * add sisapp lti launch
    * get local sisapp running
    * /accounts/1/settings/configurations
    * add app, by url http://<local sisapp>/post_grades/config.xml
  * navigate to gradebook, verify that both powerschool post and new lti
    post are available in drop down menu

closes CNVS-21470

Change-Id: Ifa3fbd301767bfbd5cd3f7082b7a4c75c0e301db
Reviewed-on: https://gerrit.instructure.com/57514
Reviewed-by: Mark Severson <markse@instructure.com>
Tested-by: Jenkins
QA-Review: Ben Bolton <bbolton@instructure.com>
Product-Review: Jonathan Featherstone <jfeatherstone@instructure.com>
2015-07-17 17:20:25 +00:00
Jeremy Stanley 6e826f7325 fix creating wiki pages named "new"
test plan:
 - you should be able to create, edit, and view wiki pages named
   "new", or whose names start with "new"
 - when editing a wiki page, the "Link to a New Page" link in the
   wiki sidebar should function properly
 - if you go to /courses/35/pages/nonexistent-page-id, you should
   see a message indicating the page doesn't exist but you can
   create it, and sent to an editor for the page

fixes CNVS-1428

Change-Id: I306441e1f686a993885beeb066409c30f9e2528b
Reviewed-on: https://gerrit.instructure.com/58649
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-07-17 15:16:11 +00:00
James Williams 038cbb4585 rails4: remove Relation#with_each_shard
in rails 4, apparently relations no longer retain
 their proxy_association.owner when they're merged
 into another non-association relation

better to use Relation#shard explicitly

refs #CNVS-21596

Change-Id: Iad34bbf626c17a3f0b1fc57ac685506199cc5f3d
Reviewed-on: https://gerrit.instructure.com/58151
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-17 12:31:15 +00:00
Spencer Olson 2ee4731017 graded discussions retain grading schemes
graded discussions no longer always show the default grading scheme
after saving and returning to the edit page.

closes CNVS-16911

test plan:

1. Create a grading scheme within a course.
2. Create a graded discussion and set its display grade
	as "Letter Grade".
3. Change the grading scheme to something other than
	the default (so you can tell what's being used to grade).
4. Save the discussion.
5. Go back and edit the discussion again, and click on the
	"View Grading Scheme" link and notice that it's showing
	the scheme you just set it to (not the default scheme).

Change-Id: I6c68b07e9557792778d08fdd8ba2861c55af5f7e
Reviewed-on: https://gerrit.instructure.com/58456
Tested-by: Jenkins
Reviewed-by: Strand McCutchen <smccutchen@instructure.com>
Reviewed-by: Derek Bender <dbender@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2015-07-17 02:45:36 +00:00
Rob Orton 594a8693a2 allow account admins to use brand configs
fixes CNVS-21826

test plan
 - as an account admin you should be able to use
   brand configs

Change-Id: I907e856a9b675681c5d1bc099cec6b7c3cab7b34
Reviewed-on: https://gerrit.instructure.com/58521
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2015-07-16 22:39:27 +00:00
Chris Hart 3c885da96e Update masquerading and student view alerts
Refs: CNVS-19258

This updates the masquerading and student view
fixed-bottom alerts to match Blake's mockup for
the New UI (Blake has approved screenshots of
this ticket).

NOTE: Because this involved a lot of shifting
markup around to get to the new mockup, I had
to make this change affect BOTH the new and
old UIs.

For masquerading:
- Go to Admin > Site Admin > Users
- Choose a user, and click the tiny "Become" link
- For the new UI, masquerading should now look like
  this:
  http://screencast.com/t/7iG8rMjwh00P (tablet - desktop)
  http://screencast.com/t/jxrp5yxL (wide screens)
- For the old UI, masquerading should now look like
  this:
  http://screencast.com/t/uw8agxcf (all screen sizes)

For student view:
- Go to any course > Settings
- Click the Student View button on the right-hand menu
- For the new UI, student view should look like this:
  http://screencast.com/t/SBT6IOnjAgN (tablet - desktop)
  http://screencast.com/t/zLZS7cRtpkt (wide screens)
- For the old UI, student view should look like this:
  http://screencast.com/t/SBT6IOnjAgN (all screens)

Change-Id: I0730a3225eed6b5d42fbb65e8c715ecdfa591d6c
Reviewed-on: https://gerrit.instructure.com/57212
Product-Review: Colleen Palmer <colleen@instructure.com>
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Pedro Fajardo <pfajardo@instructure.com>
2015-07-16 22:22:10 +00:00
Jennifer Stern d422ee4426 Remove grades link from global nav
refs CNVS-21635

Change-Id: Icb996cbcef1e25ebbe2158f63b6de99aac314005
Reviewed-on: https://gerrit.instructure.com/57533
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
2015-07-16 21:48:27 +00:00
Clay Diffrient 344f26dc4e [NUI] Makes Commons logo appear properly
This also adjusts things around so that the Commons global nav item gets the active
state set properly.

closes CNVS-21530

Test Plan:
  - Commons logo should appear when it is enabled (for Commons prod, Commons Beta, and
    Commons Staging)
  - When the Commons icon is active, it should show the active state (white background)

Change-Id: Ifbd4627b0dd06c12b74dc0441a1ebd43464976a2
Reviewed-on: https://gerrit.instructure.com/57531
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
2015-07-16 21:08:40 +00:00
Andrew Huff faa2dfd775 remove duplicate score display on individual view grade summary
fixes CNVS-20215

This fixes a bug with the individual view grade summary page
(/courses/:course_id/grades/:student_id#tab-assignments)

Previously, when a grade was marked "Display grade as: Letter Grade" or
"Display grade as: GPA scale", and the score earned on the assignment
was equal to the grade earned on the assignment (according to the
assignment's grading scheme) the amount of points earned would be shown
twice on the grade summary page.

For example, if a student earned 2 out of 3 points on an assignment,
which translates to a grade of "2.0" on that assignment's grading scale,
the entry for that assignment would be displayed as "2 2 (2.0)" instead
of "2 (2.0)"

See JIRA ticket CNVS-20215 for pictures.

Also, changes blank grade display in the gradebook history from '--' to
'-' for consistency

Test Plan:
* Create different assignments with different "Display Grade as"
settings (e.g. "points", "percentage", "gpa scale") and different
grading schemes, including at least one grading scheme where the grades
are numbers (e.g. replace "A", "A-", etc. in the default grading scheme
with "4.0", "3.7", etc.)
* Grade a student on these assignments
* Make sure that the score and grade displayed in the student's
grade summary page is displayed as expected for each assignment

* Test this from both the student view (including "What-If"
calculations) and the teacher view

Change-Id: I4a76c721d0dbb7d71f3c3db25970ce9533f61707
Reviewed-on: https://gerrit.instructure.com/55116
Tested-by: Jenkins
Reviewed-by: Cody Poll <cpoll@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Christi Wruck
2015-07-16 16:31:07 +00:00
Spencer Olson e73074480c prohibit default grade from being set to 'EX'
when a teacher tries to set the default grade to 'EX',
'ex', 'Ex', or 'eX', an error message will flash and grades
will not be changed.

closes CNVS-21897

test plan:

1. In Gradebook, under the assignment header menu, select
  Set Default Grade.
2. Enter 'EX', 'ex', 'Ex', or 'eX' as the grade (you can
  select the overwrite option if you want, it shouldn't matter)
3. Verify a message alerts the user that the default grade
  cannot be set to 'EX'
4. Go back to the gradebook and verify all grades for the
  assignment are unchanged.

Change-Id: I9f2178ef28739c55fe19aec1ca2d178fbdd99ed0
Reviewed-on: https://gerrit.instructure.com/58526
Tested-by: Jenkins
Product-Review: Spencer Olson <solson@instructure.com>
Reviewed-by: Cody Poll <cpoll@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
2015-07-16 00:09:05 +00:00
James Williams 85dac3b3fb preload "can_unpublish" values for modules
should improve performance when viewing as a course admin

test plan:
* modules index should work as before

refs #CNVS-21476 #CNVS-21317

Change-Id: I00ee7602a48bc78538e8034d562781059f6fabb8
Reviewed-on: https://gerrit.instructure.com/57276
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-07-15 22:08:06 +00:00
Matthew Wheeler 5d3a611316 Revert "Recurring Calendar Events"
This reverts commit d4f4f1a395.

Change-Id: I5b46d244f9c6adffdcf9e62a283825c93344fec4
Reviewed-on: https://gerrit.instructure.com/58522
Tested-by: Jenkins
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
2015-07-15 21:55:23 +00:00
Steven Burnett 3ac5e4400e removed etherpad warning.
fixes CNVS-20573

test-plan:
- go to collaborations page.
- notice error message for etherpad is gone.

Change-Id: I1b1d59827e984f439c387612a3a930c236d04454
Reviewed-on: https://gerrit.instructure.com/58319
Reviewed-by: Alex Boyd <aboyd@instructure.com>
Tested-by: Jenkins
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Peyton Craighill <pcraighill@instructure.com>
2015-07-15 16:52:50 +00:00