Commit Graph

1990 Commits

Author SHA1 Message Date
James Williams cb7824efca improve speed_grader rubric assessment loading
don't stuff them in the fake js_env and join the data there
 just return them with the rest of the speedgrader data

also don't do unnecessary permissions checks on every rubric
 assessment

test plan:
 * regression test speedgrader rubric assessments

closes #CNVS-22522

Change-Id: I31a025c8f23b054857823f411a229780c27cb94f
Reviewed-on: https://gerrit.instructure.com/60963
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-08-19 15:16:18 +00:00
Strand McCutchen 1c7881f98c view/edit Grading Scheme modal autosizes height
fixes CNVS-21569

Test plan:

1. Log into a course
2. Navigate to course settings (in the left column)
3. Select the Course Details tab
4. Scroll down to the Grading Scheme section and select set
   grading scheme.
5. Confirm the grading schemes and the done button are
   fully visible.

Change-Id: I72aa23056a4875f7d5a1aa1123d6f7315352f01d
Reviewed-on: https://gerrit.instructure.com/60461
Tested-by: Jenkins
Reviewed-by: Derek Bender <dbender@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Christi Wruck
2015-08-17 17:57:59 +00:00
Rob Orton 006eeeaf6f add armenian language
fixes CNVS-21898

test plan
 - canvas should load with armenian
 - date pickers should work

Change-Id: I45ad840fdbe711cb82337bd91ba4009496b19ff1
Reviewed-on: https://gerrit.instructure.com/60960
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2015-08-17 15:38:37 +00:00
Jacob Fugal d79ccc78d9 localize values in datetime picker fields
fixes CNVS-21581, CNVS-21582

test-plan:
 - regression around all datepicker elements
 - for each, when it loads with prepopulated data, that data should be
   localized
 - the prepopulated localized data should be valid to the datepicker

Change-Id: I633034967c70066e337dc22d9b9ad0cd84793834
Reviewed-on: https://gerrit.instructure.com/60229
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2015-08-14 20:25:02 +00:00
Brock Cooper 7bd568d1ca Fix showing modules pill message when NC_or not enabled
Fixes CNVS-22451

Test Plan:
1) Navigate to modules as a teacher
2) Add a modules and an assignment to modules
3) Make assignment a requirement for the module
4) ensure that the pill message does not show

Change-Id: Ic892c6e976b616475db65cb9d3dbf607ee76ce3e
Reviewed-on: https://gerrit.instructure.com/60683
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2015-08-13 23:46:19 +00:00
Ryan Shaw b5d3651ec6 Use ENV.current_user_id instead of $('#identity .user_id')
fixes: CNVS-22491

we used to have a bunch of things in js where look
for hidden elements in #identity to get user_ids
and context_ids. that is a bad idea and has been
deprecated in favor of using window.ENV.
I just did a check and these were the last 2
that I could find.

test plan:
* in the new UI...
* as a student, go to the modules page
* you should see a green checkmark next to the
  modules you've completed


Change-Id: Ic10b903220b93e35b314e274a69872482c52cc64
Reviewed-on: https://gerrit.instructure.com/59863
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2015-08-13 19:29:38 +00:00
Michael Nomitch 6912f32b23 parse date strings using moment
fixes CNVS-21576

test plan:
  run the following:
    tz = require('timezone');
    tz.changeLocale('fr_FR');
    tz.parse('mercredi 1 juillet 2015 15:00')
  the correct date is returned

Change-Id: I0683fa670b443098b2b53ca211fbe38727869a97
Reviewed-on: https://gerrit.instructure.com/60091
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-08-12 19:41:57 +00:00
Clay Diffrient 053a4daf11 Converts some of new Files to Render Using JSX
This also upgrades Groups to use react 0.12
so that react-tools 0.13.3 can be used.

- Upgrades react-tools to 0.13.3

refs CNVS-22335

- Converts:
  - Breadcrumbs
  - Breadcrumbs Collapsed Container
  - Column Headers

Test Plan:
  - Make sure Breadcrumbs and Column Headers work in
    New Files
  - Regression test Groups

Change-Id: I37ce2909223ed5fb3cf09a8e7300d286a40fe838
Reviewed-on: https://gerrit.instructure.com/60109
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2015-08-11 15:55:30 +00:00
Michael Nomitch 12ff98e170 upgrade moment to 2.10.6
fixes CNVS-22400

test plan:
  - run followin in JS console
    m = require('moment')
    m()
  - a Moment object is returned

Change-Id: I424001d75d54c53fbf46a820875a10802e8a3902
Reviewed-on: https://gerrit.instructure.com/60308
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
2015-08-07 23:42:07 +00:00
Michael Nomitch 950eaf370c tz.changeLocales works with moment
fixes CNVS-21574

test plan:
  - Do the following commands in a JS console
  tz = require('timezone');
  tz.changeLocale('fr_FR');
  tz.moment('mercredi 1 juillet 2015 15:00', 'LLLL');

  - it works and returns an object with a french locale

Change-Id: I73d14ef5ed6fb343e2a05eaf8178a4b4d8d8a840
Reviewed-on: https://gerrit.instructure.com/59987
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-08-07 17:31:32 +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
Jacob Fugal dd3bfa9168 tz.moment parses w/moment() but honors profile tz
closes CNVS-21572

test-plan:
 - in javascript console:

   tz = require('timezone');
   tz.changeZone('America/Detroit');
   tz.moment('June 24 at 10:00pm', 'MMMM D h:mmA').toDate();
   // should return 10pm EDT equivalent in browser timezone
   tz.moment('Jun 24 at 10:00pm -04:00', 'MMMM D h:mmA Z').toDate();
   // should return 10pm EDT equivalent in browser timezone
   tz.moment('Jun 24 at 10:00pm -06:00', 'MMMM D h:mmA Z').toDate();
   // should return 10pm MDT equivalent in browser timezone

Change-Id: I9dfda9ec5590afebcd4201daedc9a92d83b7498b
Reviewed-on: https://gerrit.instructure.com/59608
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-08-06 14:21:23 +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
Ryan Shaw 27860d1b8f ThemeEditor: fix 404 to default preview images
fixes: CNVS-22258

test plan:
* open theme editor and open the "watermarks and 
  other images section. you should not see any
  404's in the browser console and you should
  see a default for each except for the 'watermark'

* in IE, make sure you don't see a "broken link"
  image for the watermark

Change-Id: Iea743e8efc5115e2f4dfae6b8d12f26d4f3f346f
Reviewed-on: https://gerrit.instructure.com/59793
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2015-08-05 22:52:58 +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
Sterling Cobb 2fdb8dbb73 fix issue with inserting links inside tables
fixes CNVS-21903

When in tinymce, if you had a table with a link inside of it and you
selected the link, then selected something from the wikisidebar it
would remove all of the styles and surrounding html from the link. This
commit ensures that the link changes but html and styles continue to be
preserved.

Test Plan

Open up tinymce where there is a wikisidebar (pages for instance)
Create a table in the text editor
Insert a link into a table row/column
Add surrounding <span> or <div> tags to the link via html editing tool
Use the wikisidebar to modify the link by selecting it with your cursor
and then clicking on a link in the wikisidebar.
Check the html in tinymce. Ensure that the span/div and all styles are
still there.

Change-Id: I290f0fc24e61475f50492ffbde35d5f720b48c4f
Reviewed-on: https://gerrit.instructure.com/59196
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-08-03 21:24:53 +00:00
Michael Nomitch b4f002366a subtitle size line spacing
fixes CNVS-15622

test plan:
  - go to a video with closed captions
  - make it full screen
    - multi line captions dont overlap
      and font size is reasonable
  - make it small again
    - multi line captions spacing
      and font size are reasonable

Change-Id: I0908d2617ceb409adecffa285d2cde9e2c9e6a57
Reviewed-on: https://gerrit.instructure.com/58829
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-08-03 20:03:16 +00:00
Sterling Cobb 497051ad06 add bamboo-tree to public javascripts
Change-Id: I1dbbf4dbf99bf1d2b324a5ac24320b8686b1f181
Reviewed-on: https://gerrit.instructure.com/59631
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
QA-Review: Sterling Cobb <sterling@instructure.com>
2015-07-31 20:56:32 +00:00
Michael Nomitch 7ffbdcd50a remove element path from tinyMCE
fixes CNVS-22184

test plan:
  - go to several pages with tinyMCE
  - none of them have a "p" at
    the bottom (or h1/h2/em/div etc)
  - they work normally

Change-Id: I3e1e517673daa423b9b89e1560faecab435fad31
Reviewed-on: https://gerrit.instructure.com/59405
Product-Review: Cosme Salazar <cosme@instructure.com>
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2015-07-30 18:54:36 +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
Ryan Shaw 0531e3e4f4 remove old uploadify code
full_files.js was the last thing to use this.
since it is gone, this can go too. 


test plan:

* think of anywhere you might know of that might
use uploadify, try it, make sure it works

Change-Id: I41dd7b806bbcee881a9624dd93ffb385dd53a454
Reviewed-on: https://gerrit.instructure.com/59181
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2015-07-27 21:55:10 +00:00
Brock Cooper 4dd1666cc9 Add Expand/Collapse screenreader message on Modules
Fixes CNVS-20464

Test Plan:
- Use NVDA on Firefox and navigate to Modules page
- Expand and collapse a module
- You should expect to hear "Exapnded" and "Collaped"
  from the screenreader

Change-Id: I29778f8c26d1d9e54c1e4ef40c96dec107521232
Reviewed-on: https://gerrit.instructure.com/57615
Tested-by: Jenkins
Reviewed-by: Sterling Cobb <sterling@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Brock Cooper <bcooper@instructure.com>
2015-07-21 15:27:53 +00:00
Weston Dransfield ea903c6b84 Update Content-Item LtiLink types to LtiLinkItem
Fixes PLAT-1125

Test Plan
 - Add the example test tool (https://github.com/rivernate/lti_tool_provider_example)
   to a course using Editor Button, Link Selection, and Module Menu placements.
 - Add the tool as a module item. While adding make sure to add a new content item by pressing the green '+' in the modal that pops up.
   This content-item should 'Lti Link' set as the type.
 - Click on the tool module item and make sure the link works.
 - Using similar steps add the tool in the RCE and make sure the link works as expected.

Change-Id: I91681d6b6937467ef1aadf3029ccbfd566ba3a71
Reviewed-on: https://gerrit.instructure.com/57296
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Tested-by: Jenkins
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2015-07-20 20:49:13 +00:00
Colleen Palmer 1364d25285 Change Canvas logo svg from orange to white
refs: CNVS-21746

To be consistent within both new ui and k12 ui, we've changed the Canvas logo
from orange to white.

Test Plan:

- Load up new ui
- You should now see the logo in the top left of the default Canvas theme
is white instead of orange

Change-Id: Ided4dc3fc0707e3848ffb516544a97146f5b0a6c
Reviewed-on: https://gerrit.instructure.com/58338
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Colleen Palmer <colleen@instructure.com>
2015-07-17 21:09:49 +00:00
Jacob Fugal dda1d7f413 add moment.js to our common bundle
fixes CNVS-21570

test-plan:
 - visit a page in canvas
 - open the javascript console
 - run `require("moment")().format()`
 - get a string representation of the current time

Change-Id: I3f5dc6978855574e13bcaa0100db792a726b8167
Reviewed-on: https://gerrit.instructure.com/57606
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-07-17 18:35:12 +00:00
Ryan Shaw 1e91b8860b fix css loading inside tinyMCE editors
fixes: CNVS-21910

test plan:

* load a page with a tinymce editor
* make sure the content inside of it is styled like
  it is currently in production

Change-Id: I7640575a21929ea6b3f80e09b5036c38d54f9b59
Reviewed-on: https://gerrit.instructure.com/58585
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2015-07-17 03:50:32 +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
Andrew Huff 2e773af8d7 make grade summary round displayed grades
fixes CNVS-21106

Changed the rounding of total scores on the grade summary page
from 1 digit to 2 digits (See the pictures in the JIRA ticket)

Note that trailing zeros will not be shown. For example, a score of
exactly 73.3% will be shown as "73.3%" rather than "73.30%"

Also, changes a bunch of hacky JS rounding to use compiled/util/round.js

Test plan:
* Ensure that all percentages shown in the gradebook and on the grade
  summary page are rounded to 2 decimal places

Change-Id: I622e894e76c4c7c46a9d8820ff4a7ad791d79868
Reviewed-on: https://gerrit.instructure.com/56382
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Christi Wruck
2015-07-16 16:31:00 +00:00
Brock Cooper a65074fa2c Fix issue with non-updating 'all' value from Teacher view in Modules
Refs CNVS-21865

Test Plan:
- Navigate to the Modules teacher view and create a
  new module with a module item
- Edit module and add a requirement then select the radio button
  where you only need to complete one item
- Ensure message in the pill in the header of the module now says
  "Complete One Item"

Change-Id: Idf7c0feea35ddbcf33c526dd1828b4700445b575
Reviewed-on: https://gerrit.instructure.com/58390
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Brock Cooper <bcooper@instructure.com>
2015-07-16 14:46:33 +00:00
Cameron Matheson d5284d03b1 gradebook csv: support excused assignments
closes CNVS-21267

Test plan:
  * excuse some assignments in a course
  * download the gradebook
  * excuse/unexcuse students in the gradebook
  * upload the gradebook

Change-Id: I624f48415f0be524da70d0ea41ccd6216e06ed68
Reviewed-on: https://gerrit.instructure.com/57158
QA-Review: Adam Stone <astone@instructure.com>
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2015-07-15 03:41:23 +00:00
Josh Simpson 35cc61e40d add excused assignment support to grading history
closes CNVS-21065
This commit accounts for excused assignments in the grading history.
Now, if an assignment has been excused, the grading history will
report 'EX', as opposed to a blank value.

Test plan
- Check grading history for both graded assignments and
excused assignments.
- They should reflect prior behavior, except for excused assignments,
which should be shown as an "EX" value.

Change-Id: I8f8cc2f2f807414ae063e176fae301cb9a7ea19a
Reviewed-on: https://gerrit.instructure.com/58284
Tested-by: Jenkins
Reviewed-by: Derek Bender <dbender@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2015-07-14 15:14:53 +00:00
Chris Hart b11f1ff4d4 Update dashboard toggle to new ic-Super-Toggle
Fixes: CNVS-21840

No change in functionality - just replace the existing
toggle on the dashboard header with the new and improved
toggle from the styleguide.

Test Plan:
- Make sure the Use New Styles feature flag is ON.
- Log into Canvas.
- The toggle at the top-right of the dashboard should
  now look like this:
  http://screencast.com/t/lrvrehPgqY3c
- It should work exactly the same as before when you
  click it.

Change-Id: Ib6b03cdf2314869cfa48596a922036ae56ca2178
Reviewed-on: https://gerrit.instructure.com/58245
Tested-by: Jenkins
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2015-07-13 22:36:58 +00:00
Rob Orton e597ac8f88 s/availible/available
Change-Id: I2a4d61a897f648a1ce8c587487083f210637b96f
Reviewed-on: https://gerrit.instructure.com/58073
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2015-07-13 20:43:26 +00:00
Cameron Matheson ff4b281c96 speedgrader: show "graded" checkbox for excused assignments
fixes CNVS-21448

Test plan:
  * Excuse some assignments
  * Open speedgrader
  * The excused assignments should show they are graded in the dropdown

Change-Id: Idbec25587ebf64574a7c38bf38ddcca22e9ccb6d
Reviewed-on: https://gerrit.instructure.com/58292
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2015-07-13 20:17:35 +00:00
James Williams 417329b3b4 s/visibile/visible
lul

Change-Id: I303e168053ec058cdbf40acc6337b3d3404034ad
Reviewed-on: https://gerrit.instructure.com/58065
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-13 15:24:07 +00:00
Stephen Jensen 21ba974ef4 New UI: Fix Roll Call iFrame height
Fixes: CNVS-21594

Code Review Test Plan:
- You will need to install Roll Call locally

- Lucky for you, the instructions are awesome, and it
  takes all of 10 minutes:
  https://gollum.instructure.com/Rollcall
  https://gollum.instructure.com/OtherServiceTestAccounts

- Make sure the Use New Styles feature flag is ON

- Go to a course, and click on Attendance in the
  context menu

- The Roll Call layout should now look like this,
  with the LTI tool iframe taking up any available
  space between the breadcrumbs and the footer:
  http://cl.ly/image/1j1B2t1W0Y2M

***
QA Note: I was unable to test this on IE10 because
Virtual Box wouldn't load Roll Call inside Canvas
due to security restrictions. If possible, please
test in IE10 to make sure we're good there. Thanks!
***

Change-Id: I3a0ef522f1fd72a367d867a1674ca43b1cfcacb5
Reviewed-on: https://gerrit.instructure.com/57429
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
2015-07-09 19:10:35 +00:00
Ryan Shaw d7d3ccf9e3 extract smartbanner out of 'common' into it's own bundle
this change does a few things:
* removes 'smartbanner' from the 'common' css and
  js bundles into it's own that is only loaded on
  android devices.  (this is a win since we only
  use it for android anyway so we won't be sending
  that needless css/js on every page load now)
* uses bower to load 'smartbanner'. this is good
  since it makes upgrading easier and makes it clear
  where the separation of our code and vendor code is.
* now, there are no files in our repo that are just
  copy-pasted from 'smartbanner'

test plan:

* load canvas on a web browser on an android device,
  it should show the "install the canvas native app"
  just like it used to.
* load canvas on a normal browser, the banner should
  not appear.
* aka, there is no observable change to users.

Change-Id: Ifed35a255d774a9148a90b1daf7b4c8e09af91ce
Reviewed-on: https://gerrit.instructure.com/54806
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2015-07-07 20:54:15 +00:00
Ryan Shaw 84a7192a36 A new way of doing css/sass & New Canvas Theme Editor
what this does:
* Changes the way we generate css so we are able to generate custom
  css for people that use the theme editor.
* Sets everything up so we can push all of our static assets
  (js, fonts, css, images, etc) to s3 pre-deploy and serve them
  from cloudfront. Yay! faster canvas for everyone!
* as part of that, this enables the rails asset pipeline just so we
  can use it to put md5s in our urls.  we don't use it for any of the
  coffeescript/sass/sprockets transformer stuff.
* adds a new "Theme editor" functionality (only for people that have
  have the use-new-styles feature flag turned on) where an admin for
  an account can pick their own colors/images for all the users
  at their account/school.
* when the user is done saving things in theme editor, it will,
  in a delayed job, generate all the css with against the variables
  that user specified and push it to s3 so it will be available to
  anyone else that requests it.  (the delayed job will shell
  out to a node.js executable called `brandable_css`).
* ability to pick an existing shared theme and to reset to
  blank theme. closes: CNVS-19685
* gets rid of jammit.

test plan:
(this is exaustive, so not every person has to do every step
but we should make sure at least someone does each of these things.
maybe as part of the review add a comment if you have done one of these
bulletpoints)

* before you check this out, compile all css and copy the
  public/stylsheets_compiled directory somewhere. after you check out
  this code and regenerate all the css. make sure there are no
  significant changes to the css output. (we updated the versions of
  node-sass and autoprefixer that we use so we want to make sure they
  don't change things in a way we weren't expecting)

* make sure the way we load css for handlebars templates still works.
  eg: if there is a handlebars template at
  app/views/jst/some/template.handlebars
  if there is also a scss file at
  app/stylesheets/jst/some/template.scss
  then that stylesheet should get loaded when that template is rendered

* check out the code and run migrations. browse around canvas,
  make sure css and js files load correctly as before.

* cody, jacob, or someone on queso: look at the db migrations and
  make sure everything looks good and that I am handling sharding
  correctly.
* verify that both rake canvas:compile_assets and guard, works as well
  as `node_modules/.bin/brandable_css` (note: if you have
  "node_modules/.bin" in your PATH (which you should), it will also
  work with just `brandable_css`)

* verify that passing the --watch option to
  `.bin/node_modules/brandable_css` works and picks up changes to
  sass files, images, fonts, or any other resource that goes into
  a css file. and that it only recompiles the css files that actually
  depend on that file.

* go to https://github.com/ryankshaw/brandable_css and check out the
  code there. that is what is actually doing the sass compiling

* create a config/canvas_cdn.yml file and add aws access creds and
  an s3 bucket and cdn hostname (for testing, you can use the credentials
  for instructure_uploads_engineering from
  https://gollum.instructure.com/OtherServiceTestAccounts ). for a test
  cdn hostname you can use https://diu0rq5m1weh1.cloudfront.net. that
  is a cloudfront bucket I set up on my personal account that points to
  instructure_uploads_engineering

* run rake canvas:compile_assets again, this time, at the end, you
  should see it run the assets:precompile task that puts md5s in filenames
  and, gzipps them, and copys them to public/assets.
  then you should see it run canvas:cdn:upload_to_s3
  (look at log/development.log for progress),
  which pushes everything to s3.
  closes: CNVS-17333 CNVS-17430 CNVS-17337

* try out the theme editor: turn on new styles, go to accounts/x
  (where x is the @domain root acount you are testing from) and click
  the "theme editor" button on the right side of the page.
  that should take you to a page that has the ability to pick colors/images
  on the left side and preview your changes in an iframe on the right
  closes: CNVS-19360 CNVS-20551

* test the "preview", "save", "reset", and "choose existing" functionality
  closes: CNVS-17339 CNVS-17338 CNVS-19685

* make sure that the themeeditor works both if you have
  config/canvas_cdn.yml set up and enabled as well as if you don't.
  if it is enabled, you should see it push the css for just that new
  brand config to s3 when you hit preview, and the css
  should be accessible from the cdn you configured.

Change-Id: Ie0a812d04f5eeb40e7df7e71941ff63ea51a4d22
Reviewed-on: https://gerrit.instructure.com/53873
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2015-07-02 22:42:18 +00:00
Dan Minkevitch cf3d13fb53 Fixes issue with setting "or" condition
for "OR" module feature flag

Test Plan:
* Enable "OR" Condition Feature Flag
* Create a module and specify completion
  requirements with the default setting
  that ALL requirements must be met to be
  marked as completed
* Log in as a student that has access
  to the modules; it should not be marked
  as completed if the student hasn't compeleted
  the requirement

Change-Id: I0c45d13c8dd21a0d5c80c4deb49a6c2c68030342
Reviewed-on: https://gerrit.instructure.com/57506
Reviewed-by: Brock Cooper <bcooper@instructure.com>
Tested-by: Jenkins
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Brock Cooper <bcooper@instructure.com>
2015-07-01 19:04:21 +00:00
Abhishek Singh ac2118e36f Negative quiz group question points
Fixes CNVS-19918

Test Plan
 - User should not be able to create quiz group with negative question points

Change-Id: Iff7dd1b8ca952a2fc1e7b81350dfb73b8d308939
Reviewed-on: https://gerrit.instructure.com/57146
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Tested-by: Jenkins
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2015-06-30 21:08:26 +00:00
Dan Minkevitch 56e494f789 Fix permissions issue for changing user login
fixes CNVS-21551

Test Plan:
* Create an Account Role with only
  "Modify login details for users"
  and "See the list of users"
  permissions
* Create a user and assign them to
  the custom role you just created
* Log in as the new user and go to
  another user's profile
* Add/update the one of the login's
  passwords
* It should work successfully and
  show a success message

Change-Id: I3bfa41cbfcfac7a8a5375e8d67e2c59f8b39bfd9
Reviewed-on: https://gerrit.instructure.com/57426
Tested-by: Jenkins
Reviewed-by: Sterling Cobb <sterling@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2015-06-30 19:05:19 +00:00
Brock Cooper 23a5d93239 Teacher Edit Module Settings form for CNVS-20853
- Adds radio button for Edit Settings Module for CNVS-20853
- Changes prerequisite list to the header of the module
- adds "pill" info section that says if this is an ALL or OR type of module
- Features will be behind a feature flag

Change-Id: Iee0c32234a49eb3d4ac7fcd5d7ff7b1309d0d53f
Reviewed-on: https://gerrit.instructure.com/56297
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
2015-06-29 20:14:23 +00:00
Jennifer Stern 780517e63f Update icons for tinymce editor
refs CNVS-19605

Note: added two new icons to the canvas iconset (equation, equella)

Test plan:

- Enable the kaltura plugin at /plugins/kaltura (see https://gollum.instructure.com/OtherServiceTestAccounts#Notorious-(NO-MORE-KALTURA-YAY))
- Enable the Equella feature for the account
- Verify that the link, image, equation, record video and equella icons are updated (http://cl.ly/image/2H3m331w0f1O)
- Hover states should match the other menu buttons

Change-Id: I91c298f3dcb2146748d6104342aa265eb43462e9
Reviewed-on: https://gerrit.instructure.com/56283
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2015-06-29 19:48:39 +00:00
Brock Cooper 5a51f6e09f Fixes accessibility shortcut keys for modules
Fixes CNVS-206051

Testing Plan:
1. Go to the Modules page.
2. Press the "," key to open the menu to see what the hotkeys are.
3. Try out all the listed shortcut keys (j, k, e, d, i, o, n, up, down, space)
   to ensure they work as expected

Change-Id: I45cde62c38684394008a01a08ddb5d9a9e1d1342
Reviewed-on: https://gerrit.instructure.com/55094
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-06-29 18:16:58 +00:00
Jeremy Stanley 1d858ae41c disallow deleting accounts that recursively contain courses
test plan:
 - in a root account's Sub-Accounts tab,
  - create a subaccount containing no courses (directly),
    but a sub-sub-account with courses
  - try to delete the subaccount
  - you should get an error message indicating the subaccount
    can't be deleted because it contains courses

fixes CNVS-21463

Change-Id: I8542d51d992658e4fa852d9a7aaa1e72798ab769
Reviewed-on: https://gerrit.instructure.com/57149
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-06-26 21:51:14 +00:00
Strand McCutchen db27cb6462 make online url submissions display as external links
fixes CNVS-18645

When a teacher clicks on a online url submission link
it should behave like an external link and open in
a new tab. This behavior should be maintained even if
the link is internal.

Test plan:

0. In a published course with students…
1. Add a URL submission assignment and publish it.
2. As a student submit http://placekitten.com as
   the assignment submission.
3. As a teacher view the submission in speedgrader,
   and click the submission links in the left frame.
4. Confirm that these links open in a new tab or window.

Change-Id: Id2dc922b0b942344bcc88f56e565bd71105cb48f
Reviewed-on: https://gerrit.instructure.com/53115
Tested-by: Jenkins
Reviewed-by: Dylan Ross <dross@instructure.com>
QA-Review: Adrian Foong <afoong@instructure.com>
Product-Review: Christi Wruck
2015-06-26 21:26:47 +00:00
Brian Finney 773aba7079 Be more specific about where to fill in comments
Fixes CNVS-20858 and CNVS-20711

Test plan:
 - Create a quiz with a matching question
 - Add comments on the matching answers and save
 - Edit matching question and save
 - Edit and preview quiz, maching prompts should be correct

Change-Id: I9ce30aef94769bf353fface3e5ea656af3dfbc5b
Reviewed-on: https://gerrit.instructure.com/57238
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Brian Finney <bfinney@instructure.com>
2015-06-26 19:17:04 +00:00
Brad Horrocks 2481c938eb JS tests for lti content-items in tinymce
LTI link in iframe with thumbnail
LTI link as url to new window
LTI link as iframe
Regular URL in current frame
Regular URL in iframe with thumbnail

Fixes: PLAT-1122

Test Plan:
Regression test LTI Launches in TinyMCE :D

Change-Id: I2b43398a2cdc4707e898a68848e7260adc9a4079
Reviewed-on: https://gerrit.instructure.com/57122
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2015-06-26 18:50:28 +00:00
Rob Orton 468335ce13 add danish and swedish languages
closes CNVS-21324

javascript timezone locale file for swedish already existed, and used it
as a template for danish given their similarities, then updated based on
http://std.dkuug.dk/cultreg/registrations/narrative/da_DK,_4.3.html

Change-Id: I28d03ee26f04e7802b31992a63ec8051f43f29ce
Reviewed-on: https://gerrit.instructure.com/56981
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2015-06-25 21:39:48 +00:00
Chris Hart 8d3c65e563 Add loading spinner to new nav trays
Refs: CNVS-21198

I ended up using text as well as the panda-loader
image because I found the loader image would
generally load after or at the same time as the
course data. Please see the screencast below.

http://screencast.com/t/QAVAmxAy9

UPDATE - Jen suggested CSS-only preloading, which
seems to have worked great. The panda-on-a-bike is
now being loaded as a background of another element
and then is positioned off-screen.

QA Test Plan:
- Make sure the Use New Styles feature flag is on
  and your cache is cleared
- Load the Canvas dashboard (or any other page)
- Before everything has finished loading, click
  on the Courses, Accounts or Groups links in the
  primary navigation
- You should now see the word "Loading ..." before
  the content loads. If the content takes long
  enough to load, the animated GIF of the panda on
  a bike should appear.

Change-Id: Ib8c8cd73c94e7d735db505d7ba2e2276c48597e0
Reviewed-on: https://gerrit.instructure.com/57100
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
2015-06-25 20:11:30 +00:00