Commit Graph

947 Commits

Author SHA1 Message Date
Jon Jensen 308bebe454 send bulk private messages in background process, fixes #7277, #8548
implement background message sending in the inbox. when sending any
message, the form now unlocks right away and a progress bar appears
at the top. you can potentially have several messages sending at once,
each with its own progress bar. determinate progress bars (i.e. for
bulk private messages) will still be on the page if you reload (assuming
they haven't finished sending).

also implement client-side form validations so that users are prompted to
put in recipients and a message

progress bar should be aria compliant. refs #9237

test plan:
1. send a new message to a single recipient
2. there should be an indeterminate progress bar as it sends, and the ui
   should be unlocked
3. send a new group message
4. see step 2.
5. send a bulk private message
6. there should be a determinate progress bar as it sends, and it should
   move with a relatively consistent velocity. the ui should be unlocked
7. send a message on an existing conversation
8. see step 2.
9. repeat steps 1-8 with attachments
10. try sending messages without a body or recipients. you should get red
    error boxes

Change-Id: I1e4641505c3e4c42f840b292d739c78cb1c2baff
Reviewed-on: https://gerrit.instructure.com/13617
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-09-25 09:55:36 -06:00
Jon Jensen eec220d66e better behavior for truncateText
tweak truncateText so it is more like the ruby version (though not 100%
parity). changes include:

1. no longer on the $ object
2. never exceed max (previously it would stop adding words just *after*
   max is exceeded)
3. use i18n ellipses and word separator
4. ensure the ellipses fits within max
5. truncate first word if it exceeds max (otherwise truncate on word
   boundaries)
6. remove all extraneous whitespace

test plan:
1. find question banks to add when editing a quiz
2. the titles should be intelligently truncated

Change-Id: I33e05de32bdd6320a3fd10e5295b7d13bd7906c0
Reviewed-on: https://gerrit.instructure.com/13897
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-09-25 09:55:21 -06:00
Jake Sorce 719fce1e63 fix quiz attempts data validation bug, fixes #7211
test plan:
  1. login as a teacher
  2. create a new quiz
  3. click on 'Allow Multiple Attempts'
  4. click on 'Allowed Attempts'
  5. enter a number larger than 3 digits
     and click out of the box
  6. alert should popup with error message
  7. text input should be cleared after alert is dismissed
  8. enter a couple of letters for quiz attempts
     and click out of the box
  9. validate steps 6-7
  10. enter a couple of letters and numbers for quiz attempts
  11. alert should popup with error message
  12. validate steps 6-7
  13. validate you can enter a 3 digit number for
      quiz attempts and the quiz saves fine with
      the correct number of quiz attempts

Change-Id: I9f78871f05dac66dfa757f106a1f85e19a2444f9
Reviewed-on: https://gerrit.instructure.com/13820
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
2012-09-25 09:32:21 -06:00
Sterling Cobb b443884085 Add better accessibility for quiz settings
fixes #10557

This fixes a flow issue when navigating
checkbox items. It also adds and
standardizes labels.

Test Plan:
  1. Navigate to the edit quiz page
  2. Navigate the "Quiz Settings" sidebar
     with a screen reader.
  3. Check a few checkboxes and ensure you
     can navigate and check their sub-checkboxes
  4. See that labels are named appropriatly for
     each input field type.

Change-Id: Ia9c33bcad207f3a561649a954c75d4e6e290fc10
Reviewed-on: https://gerrit.instructure.com/13792
Reviewed-by: Joe Tanner <joe@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-09-24 11:19:21 -06:00
Cameron Matheson b5f566f1f6 crocodoc integration
Adds support for optionally viewing documents with Crocodoc.

closes #9865

Test plan:
  * configure the crocodoc plugin
  * add an assignment that allows file uploads
  * make a submission for that assignment with a pdf or doc or ppt
    - on the 'submission details' page, opening a preview of the
      assignment should display it in crocodoc
    - speedgrader should display the submission in crocodoc too
  * make a submission with odt or rtf
    - the submission should be displayed with scribd or google docs
  * if you disable the crocodoc plugin, submissions could continue being
    previewed in google docs or scribd

Change-Id: I7dd2547f8e2d907c98ebe894a7f1ee9d58f1e030
Reviewed-on: https://gerrit.instructure.com/13668
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-09-21 12:57:02 -06:00
Jake Sorce 3fd9e9dcd1 fix wrong password input focus on profile page, fixes #9823
test plan:
  1. log in as a user
  2. click 'Settings' on the top right of the page
  3. click 'Edit Settings' middle right of the page
  4. click the 'Change Password' checkbox
  5. notice the focus is in the old password box and
     not the confirm password box

Change-Id: I03ea8c91ada3e5d3c0f4f4734f8c5efdfc33d4b7
Reviewed-on: https://gerrit.instructure.com/13842
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
2012-09-21 10:30:56 -06:00
Jeremy Stanley fc8df95ec8 add missing flagged_question_dim.png; fixes #10507
derived from flagged_question.png, since the historic
flagged_question.png looked different

Change-Id: I3e72135916628bb43218c226727c3f4846122ea9
Reviewed-on: https://gerrit.instructure.com/13838
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-09-20 13:29:48 -06:00
Zach Pendleton 95fb516603 remove out-of-order <h1 /> tags, replace w/ <h2 />.
refs #10365

until we can come up with a more coherent header strategy, this
commit removes the out-of-order <h1 /> tags and opts instead for
just starting at <h2 />.

also removes the <h2 /> tags in the navigation, as they're
potentially confusing to users trying to find content via the
heading tags.

test plan:
  N/A

Change-Id: I1a1cf75feae981eba3ed4ecf0897060759ec46a0
Reviewed-on: https://gerrit.instructure.com/13599
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-09-19 09:39:47 -06:00
Zach Pendleton 15f6b914e9 improve accessibility of files page. fixes #9271
this commit marks up the file list as a tree and makes it
keyboard navigable. it also adds labels to each of the file
sections to make them easier to understand.

test plan:
  * using a screen reader, navigate to the files page and
    attempt to click a file in the tree navigation;
  * verify that it opens in the preview pane as expected;
  * do the same with a folder and verify that it displays as
    expected.

Change-Id: Icc9ad33973882f35d6aca0219a2b77e0358d3cb3
Reviewed-on: https://gerrit.instructure.com/13638
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-09-19 09:39:10 -06:00
Jon Jensen 9e27b56740 eportfolio direct-to-s3 upload, fixes #10572
don't proxy uploads through canvas

also fix ui so that file picker goes away after saving

test plan:
1. w/ s3 file store, edit an eportfolio
2. add a file/image
3. it should work
4. repeat steps 1-3 for local file store
5. edit an eportfolio
6. add a file from your existing user files
7. it should work

Change-Id: I1518e06dec495180371eef75af2e6659d49d36b1
Reviewed-on: https://gerrit.instructure.com/13692
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
2012-09-18 10:02:12 -06:00
Bryan Madsen c835ccd39a revert several grade calculation changes
Revert "make grade_summary page use GradeCalculator"

This reverts commit 4776cb2880.

Revert "fix gradebook bug in ie8"

This reverts commit c927237458.

Revert "gb2: don't lie about which assignments are dropped"

This reverts commit da37933079.

Revert "fix ruby calculation of grades (grade-dropping)"

This reverts commit 63f75597a2.

Revert "fix grade-dropping in gradebooks"

This reverts commit 4a4a2f53c1.

Conflicts:

	spec/selenium/grading_standards_spec.rb

Change-Id: I597d777fee23c4dc57bb915c6cbe5185dc18d0af
Reviewed-on: https://gerrit.instructure.com/13716
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
2012-09-18 09:20:51 -06:00
Zach Pendleton 12a8ab05aa focus course wizards when they first display. fixes #10381
when a link is clicked to display a course wizard, move focus
to the wizard to accommodate users using screen readers.

test plan:
  * using voiceover or another screen reader, navigate to the
    assignments page;
  * click the "How Do I...?" link in the right sidebar and verify
    that focus is assigned to the wizard popup box.
  * click the close link in the wizard and verify that focus is
    returned to the "How Do I...?" link.

Change-Id: Ie3b09e2fc43439f6c09c87694a6f6150a62f9982
Reviewed-on: https://gerrit.instructure.com/13474
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-09-17 14:13:55 -06:00
Zach Pendleton 7e496120b9 fix edit rubric button. fixes #10479
on the show rubric page, when a user edited a rubric, saved it,
and then clicked the edit rubric button again, it wasn't opening
the edit form.

test plan:
  * from course outcomes page, click 'manage rubrics' button;
  * create a new rubric;
  * click the 'edit rubric' button and then click the 'update rubric'
    button;
  * without refreshing the page, click 'edit rubric' again and verify
    that the edit form displays as expected.

Change-Id: If65785f09f1a0f5034d67b503597bc674d79f2d5
Reviewed-on: https://gerrit.instructure.com/13688
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-09-14 10:42:35 -06:00
Ryan Florence 6858df5aec extended Backbone.Collection
added:

- Collection default options
- Collection request parameters

moved:

- default url

Change-Id: I68146cdc43df788bf14ae3d1e5b0c6e5215b0f44
Reviewed-on: https://gerrit.instructure.com/13589
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-09-13 11:42:05 -06:00
Cameron Matheson 4776cb2880 make grade_summary page use GradeCalculator
fixes #8177, #9253

this commit also improves accessibility in the grades table
by adding an aria-label to dropped assignment cells that can
be read by screen readers.

Test plan:
  * Go to the gradebook2
    - compare grades and dropped assignments to those listed on the
      grade_summary page (you can get to the grade_summary page by
      clicking on a student's name in the gradebook).  Be sure to
      compare the grades with and without including ungraded assignments
  * as a student, go to the grades page
    - try changing some scores and make sure the final grade, assignment
      group totals, and dropped assignments change accordingly.

Change-Id: I938354781e6925018bc7c3669e71dc18e2b7ab1b
Reviewed-on: https://gerrit.instructure.com/12682
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-09-13 09:07:22 -06:00
Jon Jensen e2dcea8472 onSubmit callback for formSubmit
if you don't like success/error callbacks and instead want a deferred
object, use this callback. your function will receive a deferred object
encompassing the request(s) triggered by the submit, and the formData
being posted

test plan:
N/A, see #7277... this will be used by that code

Change-Id: I070f3fb33169256eb151919d820a1b4f0010e4f3
Reviewed-on: https://gerrit.instructure.com/13615
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-09-11 16:24:38 -06:00
Zach Pendleton 8e274f6832 make "show scoring details" keyboard navigable. fixes #10395
on student grades page, the "show scoring details" button and
its tooltip weren't keyboard navigable. they are now accessible,
and the user is alerted to the new row through aria attributes.

test plan:
  * using voiceover or another screen reader, navigate to the
    student grades page within a course;
  * tab to a "show scoring details" link and verify that it is
    properly read;
  * click the link, and verify that you are notified of the new
    table now and that tabbing to the new row reads its
    contents.

Change-Id: I520165503984fe296c9f4097e6b1260ac3d6ac70
Reviewed-on: https://gerrit.instructure.com/13485
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
2012-09-11 15:49:05 -06:00
Jon Jensen 825ce5f2a4 DRY up jquery.instructure_forms.js
no functional changes, just cleaning things up and making it consistent

this does fix success/error callbacks for prepared file uploads so that
they receive all the same arguments that the callbacks for the other
upload/submit types get

test plan (should all be covered by selenium):
1. test a regular formSubmit (e.g. signup form)
2. test a fileUpload formSubmit (e.g. eportfolios)
3. test a preparedFileUpload formSubmit (e.g. conversations w/ attachment)
4. test a HTML5 upload formSubmit (e.g. profile pics)
5. test a noSubmit formSubmit (e.g. turnitin settings on a new assignment)
6. test an uploadify file upload (e.g. files section)

Change-Id: I2c9affd48eb44925cd04dbf8d9c6486593ebc7d3
Reviewed-on: https://gerrit.instructure.com/13552
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-09-11 09:32:43 -06:00
Ryan Florence d0b051c0cc added user filter to gradebook2
test plan:

1. Enter a user's name, login, or secondary ID
   into the the new filter in the toolbar
2. Observe the other users are hidden
3. Repeat, make sure it doesn't get in any sort of
   weird state

Change-Id: Icf0e1c5af551dc29786c83480346692fe20b70ef
Reviewed-on: https://gerrit.instructure.com/13199
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
2012-09-10 16:37:37 -06:00
Jon Jensen aea857aef7 fix i18n js issues, fixes #10456
ensure that translations don't get overridden due to the locale being in
the translation hash twice (symbol and string)

also ensure _core translations (date/time/number formats) are always
included

test plan:
1. use canvas w/ optimized js
2. switch to another language (e.g. spanish)
3. go to the web conferences page
4. click to delete a conference
5. the confirmation dialog should be translated

Change-Id: I73cb94a34a4acc2fe80b01148b950240bbd26d94
Reviewed-on: https://gerrit.instructure.com/13580
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-09-10 12:19:05 -06:00
Joe Tanner 5d46c48a43 Show 11:59p instead of rounding to 12 in cal2 week view, fixes #8068
Also fixes a bug where clicking on events in the week view failed
to show the details popup.

test:
- create an assignment due at 11:59pm
- verify the time on the assignment shows 11:59p in the week view
- refresh the page
- the week view should still show 11:59p for the assignment

Change-Id: I12bd31bfc50ef7715c6c376263dc580a8e52f4e1
Reviewed-on: https://gerrit.instructure.com/13459
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-09-10 09:37:34 -06:00
Zach Pendleton 6be12b344c enlarge input boxes to fit answers on quiz show pages.
fixes #10345

text boxes on quiz display pages (e.g. results and history
pages) now have a min-width of 120px, a max-width of 100% of
of the answer, and will grow to fit the given answer within
those limits.

test plan:
  * create a quiz with a fill in the blank question;
  * take the quiz, and fill in the question's text field with
    an answer longer than the visible field;
  * finish the quiz and verify that the input has now grown to
    fit your answer.

Change-Id: I221743a98daf33a0671823fe7c32501ef67716d8
Reviewed-on: https://gerrit.instructure.com/13427
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-09-08 15:36:12 -06:00
Ryan Florence 5d83e7d127 analytics event tracking
Change-Id: Ic5be459102e2cd532dc57e9b94c06d4bddb8272c
Reviewed-on: https://gerrit.instructure.com/13294
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-09-04 14:37:30 -06:00
Brian Whitmer 7f4adbade8 remove friendlyName i18n in calcCmd
It's actually not used anywhere in the code,
and is confusing people that are trying to
translate Canvas into different languages.

fixes #10122

test plan:
- create a formula question
- make sure the built-in function still work
  (sin, cos, abs...)
- click the "Need Help?" link
- click the "Functions" tab
- make sure the dropdown shows a list of functions
  with correct explanations

Change-Id: I9264ee6e286d7c51fe0d39fda53c248e70431290
Reviewed-on: https://gerrit.instructure.com/13299
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
2012-08-31 15:36:04 -06:00
Zach Pendleton cfdf2cbf2c propery re-enable disabled elements w/o opacity set. fixes #10225
when an element didn't have an explicit opacity set,
disableWhileLoading would leave the opacity at 0.5 in
IE.

this commit fixes the problem by assuming that, if no opacity
is set, it should be 1.

test plan:
  * create a course with students;
  * visit the users page of that course (/courses/:id/users)
    in IE8;
  * verify that the student and teacher lists load and are
    displayed as fully opaque.

Change-Id: Iad16cfbe01cf841209d1ca6ddb99b86eabd69d75
Reviewed-on: https://gerrit.instructure.com/13287
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2012-08-31 15:35:11 -06:00
Zach Pendleton 5519a6e337 fix opacity on flagged questions in IE. fixes #10207
when viewing flagged questions during a quiz in IE8, use transparency
in the png instead of css opacity to prevent display issues in IE.

this commit also adds some spacing to the quiz flag icons in the
sprite so they don't look as bad when the user is zooming in his/her
browser.

test plan:
  * take a quiz in IE8;
  * verify that question flags look and function as expected.

Change-Id: I0db69d5cda62ef9ad9d9ec296e83cedcd347e002
Reviewed-on: https://gerrit.instructure.com/13384
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2012-08-31 15:32:23 -06:00
Jake Sorce 93b78549e9 change wording on user settings page
fixes #10244

test plan:
  1. login
  2. click on Settings link at the top right
  3. verify page title says User Settings
  4. verify wording changed in breadcrumb
  5. verify wording changed in header
  6. click Edit Settings link and verify
     link hides
  7. verify button says Update Settings
  8. verify delete link says Delete My Account
  9. click the Cancel link
  10. verify Edit Settings link shows again
  11. click Edit Settings, edit a setting
      click Update Settings link
  12. verify Update Settings button shows
      after a new page load

Change-Id: Id200db687d79f24cceca8c2f93a720903b76471f
Reviewed-on: https://gerrit.instructure.com/13321
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
2012-08-31 11:03:12 -06:00
Jon Jensen 042ad9862f fix input overlays in IE, fixes #10223
made overlays a little bigger, and add background image to prevent
clicking through to the inputs

test plan:
1. take a quiz in IE
2. look at the results
3. confirm you can't toggle checkboxes or radio buttons

Change-Id: I9662b8ed74a2a732cdc70a4e4d60f797f4cf891c
Reviewed-on: https://gerrit.instructure.com/13366
Reviewed-by: Mark Ericksen <marke@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-08-30 19:25:23 -06:00
Zach Wily 0cc34f2ff9 make sure not to show any "correct" arrows on surveys; refs #10154
A previous commit got rid of all the right/wrong arrows, but we were still
showing things like "Correct Answers" for fill-in-the-blank questions, for the
answers wrapper. This hides all the correct answer markers for survey
responses (and when editing).

test plan:
 * create a quiz, make it one of the survey types
 * create a question of each type
 * preview the quiz and submit it
 * verify that you don't see any "Correct Answers" arrows
 * also re-test normal quiz functionality

Change-Id: Ib774943856feef25b55c772ab1c0290518a4f74c
Reviewed-on: https://gerrit.instructure.com/13359
Reviewed-by: Mark Ericksen <marke@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2012-08-30 14:36:14 -06:00
Mark Ericksen 8917b60663 don't display correct answers when quiz set to not show. Fixes #10235
fixes #10154

Address the case when a quiz is set to not show the correct answers
when reviewing the results. This adds question-level arrows that show
if it was correct, incorrect, or partial.

This also addresses:
* incorrectly showing answer feedback on a survey
* making the text inputs be readonly when viewing results
* survey results style issues with borders and header area
* hides 'Some questions not yet graded' when an essay
  question is used on a survey
* hide question points on a survey
* shows "You Answered" as grey arrow on survey results

Testing Notes:
=============
* Setup a quiz with the option "Let Students See their Quiz Responses"
   and ensure "Show Which Answers Were Correct" is unchecked and
   save the quiz.
* Take the quiz.
* The answer arrows should all be on the question level (not on the individual answers).
* The "red box" around incorrect answers should not appear.
* The arrows should include the following
   * "Correct!" - When fully correct. Full points received.
   * "Partial" - Shows as red/incorrect. Partial points were awarded.
   * "Unanswered" - shows for questions that don't have an easy
      way to show what the user enetered.
   * "Incorrect" - when wrong and no points were awarded.
* When the option to show correct answers is checked on the quiz, it
   should still show the "Correct Answer" arrow and put red error
   boxes around incorrect answers.
* When viewing the quiz in edit mode and checking "Show Question Details"
   it should show the "Correct Answer" arrow regardless of the checked
   quiz option. (Teacher view)

Change-Id: I0083d383fcd28c906e1810615769586e7ecd48a7
Reviewed-on: https://gerrit.instructure.com/13293
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2012-08-30 14:02:20 -06:00
Jon Jensen 5639ccacf7 fix ES5 shim
require.js runs later, so define doesn't exist here. also we don't need it

test plan
1. use canvas in IE
2. you should not get a javascript error on every page

Change-Id: I350e991d54962765612cb984aaf72604c5348ee5
Reviewed-on: https://gerrit.instructure.com/13317
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-08-30 13:45:50 -06:00
Mark Ericksen ef0cc7d662 fix a few quiz behavior problems discovered in QA process. Fixes #10161
The following issues are corrected with this:
 * wasn't showing "You Answered" arrow on incorrect answer
   for multiple-drowpdowns
* The "Correct Answer" arrow was not showing up on the quiz edit
   page when use clicks "Show Question Details" checkbox
* On questions where the correct answer can be selected
   (t/f, multiple checkboxes, etc), it was no longer showing
   the persistent green arrow of the currently specified correct answer.

Testing Plan:
===========
* When editing an existing quiz, click the "Show Question Details" and
   verify that the "Correct Answer(s)" arrow appears and points to the
   answer area.
* Edit a t/f question (for example) and change the "correct" answer.
   After updating, verify that the "Correct Answer" arrow updates to the
   new correct answer.
* Take a quiz (preview or otherwise) and for a multiple dropdown question,
   verify that a blank or incorrect choice shows the red "You Answered"
   arrow and it is surrounded by the red error box.

Change-Id: I004896b9272b69bfe224379f153d577a17e82f66
Reviewed-on: https://gerrit.instructure.com/13280
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-08-28 14:59:14 -06:00
Mark Ericksen 2fe698524a On calendar1, open a syllabus event in dialog. Closes #9398
Testing Steps:
==========
* Create an event on the calendar (preferably not for the current month).
* Ensure you are setup to use Calendar1 (can change from Cal2 with button)
* Visit the course syllabus and find the event listed there.
* Click the event in syllabus
* Verify that calendar opens to the proper month and the dialog
  with event information opens and is displayed.

Change-Id: Ib6d3eee1a863eccfebd42a2788c51e7af4b4689a
Reviewed-on: https://gerrit.instructure.com/13182
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-08-28 11:17:30 -06:00
Zach Pendleton 24bda7a2e5 fix javascript on edit rubric button. fixes #5207
clicking the edit rubric button multiple times no longer
causes the edit rubric form to appear multiple times on
the page.

also update edit/cancel buttons on edit rubric form to
match new canvas styles.

test plan:
  * create and view a new rubric;
  * click the 'edit rubric' button in the right sidebar
    and verify that 1) the button appears disabled, and
    2) the edit rubric form appears;
  * click the edit button again and verify that the form
    does not appear twice; also verify that the edit/cancel
    buttons are right-aligned and match the new canvas
    styles.

Change-Id: I595e776af624b1b5c524194ccfff03835e31ae75
Reviewed-on: https://gerrit.instructure.com/13139
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-08-28 09:33:13 -06:00
Ryan Shaw 2b1fffdecc use a simple dialog for creating new courses
this gets rid of the "getting started" workflow (with the 4
steps: name, assignments, students, save) and just uses a
simple dialog for creating new courses.  It is part of the new
user experience stuff.

refs: #9898

test plan:
click "create a new course" on dashboard, make sure
it works.

Change-Id: If1b28f3dd58fa40e3a0c0195dc5db97292566e7e
Reviewed-on: https://gerrit.instructure.com/13003
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-08-27 13:29:42 -06:00
Bryan Madsen 43eff09deb remove default "1 + 1" in equation editor, fixes #9036
test-plan:
1) load up equation editor
2) verify default "1 + 1" is not in the editor
3) make sure editor still works

Change-Id: I9c01ca7f4194b1c1cde64d21e8416066150928d6
Reviewed-on: https://gerrit.instructure.com/12957
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-08-27 11:20:22 -06:00
Ryan Shaw 4bc93e7e85 shim String::trim and Function::bind and make always available
all environments we support besides ie8 do these
natively, these are accurate and safe since they
will not mess with any for … in loops.  better than
having to do $.trim and _.bind everywhere.

Change-Id: I2292a2303884a2fcf68ee055945c29fbbd2b1b88
Reviewed-on: https://gerrit.instructure.com/12997
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-08-24 16:40:46 -06:00
Cameron Matheson f2ce2102a2 allow variables to have the value 0
fixes #8155

Test plan:
  * create a formula quiz question
  * make the variable definition x with a min/max of 0
  * make a formula definition that uses x (ex: 5 + x).  You should see a
    computed value, not an error message

Change-Id: Ida604c4b0c10b2567ab6061e8205c823366c9aea
Reviewed-on: https://gerrit.instructure.com/13127
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-08-23 15:23:24 -06:00
Zach Pendleton 10a357944c Update styles on quiz pages. fixes #9802
On quiz pages:
  * change background to light blue;
  * replace right/wrong indicators with new arrows;
  * change 'flag' question icon;
  * update layout of questions;
  * standardize question comment styles;
  * display radio and checkbox buttons on results
  * changed last-chance save to not be async to fix FF issue

Test plan:
  * view all quiz pages (new/edit, take, review, history)
    and verify that they work as expected.

Change-Id: I523f13324a34622a7fe5e50bae7b2239eaba8acc
Reviewed-on: https://gerrit.instructure.com/12906
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-08-23 11:44:16 -06:00
Cameron Matheson 4a4a2f53c1 fix grade-dropping in gradebooks
The main feature of this commit is that it introduces a grade-dropping
scheme that maximizes the students grade (rather than the simple yet
somewhat arbitrary and inconsistent scheme we had before)

Also fixes the following bugs:

fixes #8454
fixes #8330
refs #8177

Test plan:

  Create a few assignments in an assignment group with drop rules
  (you'll need at least 'drop lowest' and 'never drop') and make sure
  those rules are respected in the gradebooks (old and new).

  Don't forget to test with the 'treat ungraded as 0s' option

Change-Id: I7e4f11939a311e1360aedbeda4d4461f317cfee6
Reviewed-on: https://gerrit.instructure.com/12405
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-08-21 10:29:47 -06:00
Ryan Shaw 723d9c7e6d make jslint settings more sane
we use jslint just as a last resort effort to make
sure our javascript doesn't have syntax errors or
something.  these changes will make the jenkins
output less verbose.

Change-Id: I937ad1bc6f6b142c4ba424f65e72e9806468638f
Reviewed-on: https://gerrit.instructure.com/12787
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-08-17 11:04:40 -06:00
Ryan Florence 8d872d1f9b updated social icons fixes #9857
- moved generic "contact" method icon to "message"
- added a google docs logo

facebook used to be in the 0x0 position, making
any services without an icon default to the
facebook logo, now it defaults to the message
logo which is better until we have an icon for
everything

Change-Id: I05378295dcfc4f86ab865ada838c77e321414cc4
Reviewed-on: https://gerrit.instructure.com/12984
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-08-17 10:16:22 -06:00
Ryan Shaw ac9eebb275 new discussion topics/announcement index, edit and create
closes: #7172

test plan:

* open discussion topic index page:
  - see how it looks in blank course
  - full course
  - try graded & unread filters (make sure you see things you expect to and not those you don't)
  - do bulk actions by clicking checkbox for a few and hitting delete and lock buttons
  - verify infinite scroll works
  - verify that as a student you don't see posts that had delayed posting
  - click "create new" button to make a new one, make sure it works
  - do all the above in the announcement index page

* while viewing announcements index:
  - verify teacher can create external feed on right
  - no right side unless external feeds exist or they are teacher
  - external feeds are listed
  - only teacher can delete external feed

* while editing/creating new discussion/announcement
  - verify that announcement cant be made into assignment
  - for discussion topic, set as assignment and make sure the assignment settings set.
  - cant change discussion -> announcement (& vise versa)
  - type crazy & blank input, verify that it validates it for you
  - title cant be longer than 254
  - make sure these features work:
    - podcast feed
    - student posts in podcast feed
    - delayed posting
    - toggling threaded/unthreaded
    - must post before seeing replies
  - attach file, remove file attachment, upload new attachment should work

* make sure announcements/discussions look & behave right in other places they show up
  (like course, user dashboard)

* if you can think of any other places where you can edit/create discussions/announcements, make
  sure that still works

Change-Id: Ib0acaff8542bf09f99cd7aa99fb3ed16c999d224
Reviewed-on: https://gerrit.instructure.com/12655
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-08-17 09:26:04 -06:00
Cody Cutrer b7b407248f multi-factor authentication closes #9532
test plan:
 * enable optional MFA, and check the following:
   * normal log in should not be affected
   * you can enroll in MFA from your profile page
   * you can re-enroll in MFA from your profile page
   * you can disable MFA from your profile page
   * MFA can be reset by an admin on your user page
   * when enrolled, you are asked for verification code after
     username/password when logging in
   * you can't access any other part of the site directly until
     until entering your verification code
 * enable required MFA, and check the following
   * when not enrolled in MFA, and you log in, you are forced to
     enroll
   * you cannot disable MFA from your profile page
   * you can re-enroll in MFA from your profile page
   * an admin (other than himself) can reset MFA from the user page
 * for enrolling in MFA
   * use Google Authenticator and scan the QR code; you should have
     30-seconds or so of extra leeway to enter your code
   * having no SMS communication channels on your profile, the
     enrollment page should just have a form to add a new phone
   * having one or more SMS communication channels on your profile,
     the enrollment page should list them, or allow you to create
     a new one (and switch back)
   * having more than one SMS communication channel on your profile,
     the enrollment page should remember which one you have selected
     after you click "send"
   * an unconfirmed SMS channel should go to confirmed when it's used
     to enroll in MFA
   * you should not be able to go directly to /login/otp to enroll
     if you used "Remember me" token to log in
 * MFA login flow
   * if configured with SMS, it should send you an SMS after you
     put in your username/password; you should have about 5 minutes
     of leeway to put it in
   * if you don't check "remember computer" checkbox, you should have
     to enter a verification code each time you log in
   * if you do check it, you shouldn't have to enter your code
     anymore (for three days). it also shouldn't SMS you a
     verification code each time you log in
 * setting MFA to required for admins should make it required for
   admins, optional for other users
 * with MFA enabled, directly go to /login/otp after entering
   username/password but before entering a verification code; it
   should send you back to the main login page
 * if you enrolled via SMS, you should not be able to remove that
   SMS from your profile
 * there should not be a reset MFA link on a user page if they
   haven't enrolled
 * test a login or required enrollment sequence with CAS and/or SAML

Change-Id: I692de7405bf7ca023183e717930ee940ccf0d5e6
Reviewed-on: https://gerrit.instructure.com/12700
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2012-08-16 13:09:07 -06:00
Brian Palmer ce4eb5cb42 upgrade Uploadify to 3.1.1
fixes #8221

test plan: no user visible changes in behavior, so this is a regression
test. repeat this test plan once for s3 files and once for local
files:
  * verify file uploads on /courses/X/files and /dashboard/files
    * upload to other folders
    * upload multiple files
    * zip uploads
    * weird characters in filenames, duplicate filenames
  * verify other places we upload files like content imports and sis
    imports

Change-Id: I01b7805eb947097b250bf9be944a9347ecc4ff5e
2012-08-14 14:49:35 -06:00
Ryan Shaw 5af0132a87 fix speed grader dialog button styling
this: http://cl.ly/image/0b0c013w2H02
and this: http://cl.ly/image/0u3n0Q2h2W0n

instead of:
this: http://cl.ly/image/2n283o012d0O
and this: http://cl.ly/image/43232r1i0Z3K

Change-Id: I1d2c66ab3c158c0e2fd8fde277f65ec4c92456ab
Reviewed-on: https://gerrit.instructure.com/12841
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-08-14 12:16:59 -06:00
Ryan Florence b5cce9d6bb removed instructure_record from tinymce in files
closes #9842

Change-Id: I559905fdc5ff6c1829f5929ce27d0bdd8a36cfda
Reviewed-on: https://gerrit.instructure.com/12881
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-08-13 13:21:11 -06:00
Ryan Shaw a86cae48bb minor style tweaks kyle wanted
Change-Id: I8a32b9b00e7a3eda9e853cafcd3d1044d49122b4
Reviewed-on: https://gerrit.instructure.com/12649
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-08-13 10:36:53 -06:00
Ryan Shaw df3ff2c348 add a way to do tooltips with just markup, closes #9492
test-plan:
open /styleguide
hover over all the links/buttons with tooltips on the bottom of the page
and make sure they look good.

Change-Id: Ib0c00293a12dde2c58577d894eb380bf9ee1aaf6
Reviewed-on: https://gerrit.instructure.com/12455
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-08-13 10:22:39 -06:00
Ryan Shaw 8403f9a06a upgrade jqueryui to 1.9b1, closes: #9493 refs: #9492
wins:
* we now have a tooltip widget
* no more having both jqueryui 1.8 and alpha 1.9
  stuff on the same page

for more info:
http://blog.jqueryui.com/2012/06/jquery-ui-1-9-beta/
info about tooltips:
http://wiki.jqueryui.com/w/page/12138112/Tooltip

test plan:
interact with as many jquery ui widgets as possible
e.g.: wiki sidebar (the tabs and accordion), gradebook2
(and all of its dialogs), date pickers, help dialog, etc

Change-Id: I2c1c0d761a99c972fd8ae704ee3782140955ce3c
Reviewed-on: https://gerrit.instructure.com/12258
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-08-13 10:20:06 -06:00