this commit does the following:
* upgrade bootstrap-sass gem to most recent version
* switches to using bootstrap's normalize.css and forms.css
which fixes a whole bunch of misformatting of how bootstrap
stuff is supposed to look, but changing those 2 affects
a lot of our old stylesheets.
* gets rid of unified_buttons.sass and just uses bootstraps buttons.
.ui-button @extends these because we still have to support .ui-button
for modals & buttonsets. but .button is no longer supported.
* a lot of css file reorganization (there's no more 'blue' and
'normal canvas', there's just canvas)
* a bunch of files had to be tweaked to look good with these changes.
test plan:
This change touches every page in canvas so, no kidding, we need to make
sure every page looks OK. In order to do that:
1. each sprint team needs to give a +1 after they make sure all the
pages in the features they are over look good.
2. the QA person on each team needs to look at the pages for their
teams features for a QA +1
things to look for specifically when testing:
* buttons: this gets rid of all those red 'cancel' links
that are actually buttons, make sure all the buttons you see
look right. if you see 2 plain gray buttons next to each other
like [Save] [Cancel], we should make the primary one blue (by
adding the .btn-primary class)
* Forms: a lot of this change has to do with how form elements look,
especially <select>s, <input>s and <label>s. look at the diffs
for the ones that have the most changes and make sure those look
good, but also check for the ones I missed and make sure those
look good too.
* and just random style changes, if something looks ugly or broken
(and it didn't before), we should fix that.
Also:
just use a link instead of a drop-menu for adding event from sidebar
we used to have a drop down menu for adding events
to cal2 from the sidebar where you'd hit a cog
and it'd ask you if you wanted to add an event or
an assignment. this just simplifies it to an add
icon.
this: http://cl.ly/image/133a2A3q3q1M
instead of: http://cl.ly/image/46463o2s3W0g
Change-Id: I384fe273934bca96bf28423afb1402c7792d8766
Reviewed-on: https://gerrit.instructure.com/15422
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
using a library called mediaElement.js, try to show
all kaltura video and audio using html5 and fall back
on flash if needed.
Test Plan:
* in all the different browsers (including mobile safari/chrome)
* try recording webcam videos (as homework submission, as content in a wiki page, etc)
* view those same pages
* view recorded submission in speedgrader
use the playlist urls to get kaltura urls
This will get CDN-configured links from Kaltura instead of direct Kaltura
links. It also allows for the case where a MediaObject does not exist. When
one is requested, it will be created in the database and details fetched.
Test Plan for cdn urls:
* Make sure kaltura is enabled
* Open your web inspector's network tab
* Browse to a recorded media file in Canvas, and play it
* Ensure that the file is streamed from kaltura's configured CDN (s3 in the case of instructure).
Test Plan for nonexistent MediaObjects:
* Make sure kaltura is enabled
* In a wiki page, record a media comment
* Destroy that MediaObject from the database (use Inspect Element to find the media_id which looks like 0_1234abcd)
* Reload the page, and verify that you can still view the video
fix error when viewing a video file that has an unknown source type
There are some videos that have valid sources that don't
have an extension for some reason. This fixes handling
of those correctly.
There was also a bug that would sort by bitrate as
strings, instead of as integers. The sort function was
refactored out and tests written to ensure that's fixed.
Test Plan
* find a video in kaltura that has an asset with no extension,
and make sure you can view that video in a wiki page
refs #CNVS-324
Change-Id: I8ff24a94b8af11fc29b84e45545f8a8b639eeaff
Reviewed-on: https://gerrit.instructure.com/16824
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
There are still several issues that need to be resolved with this, so it's
being removed from master for now.
Commits being reverted are:
f77b1d77f0
"make media_object info action not an api, fixes: #11464"
497156a4f7
"fix error when viewing a video file that has an unknown source type"
39eaab2269
"use the playlist urls to get kaltura urls"
a22f8c13a3
"Use html5 to show videos by default & show subtitles"
Change-Id: Iefcef83a42174634485e1c61e993244b0029aae2
Reviewed-on: https://gerrit.instructure.com/15440
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
now looks like: http://cl.ly/image/3Q2R0l0n3e15
cleaned up styling so it used real dialog buttons.
refactored code to lazy-load math quill css, js
and font only when first needed.
Change-Id: I7cf0894222d7fb7d6fc2ddb09935b2c849bbd4ac
Reviewed-on: https://gerrit.instructure.com/14562
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
using a library called mediaElement.js, try to show
all kaltura video and audio using html5 and fall back
on flash if needed. fixes#3969
test plan:
in all the different browsers (including mobile safari/chrome)
try recording webcam videos (as homework submission, as content in a wiki page, etc)
view those same pages
view recorded submission in speedgrader
AND...
Allow uploading subtitle tracks to videos
when you upload a video, you will now see a [cc]
box in the player for that video if you are
the uploader of that video and in a modern browser.
it will have a link to upload a caption track in
SRT or WebVTT format in any language you specify.
once you attach a caption track to any of your
videos, other people that view it will be able
to choose that track while playing it.
helpful for people that are deaf or that speak
another language!
this change also adds google analytics tracking to
videos so we know when a given media_id was
played, paused, and ended.
test plan:
* record a video, go to play the video
* (only) you should see a [cc] button (make sure others don't)
* click the "upload subtitles" link, a dialog should appear
that lets you choose a language and file to upload. here's
one you can test with:
http://mediaelementjs.com/media/NT113_u008_v005_transcript.srt
* refresh, you (and anyone else that can see video)
should now have the option to select that track
for subtitles. (if using in HTML5 player)
* (only) you should see a delete 'x' on it to delete
it, when you click it it should go away. reload
to make sure it is not there.
Change-Id: I8ed8f14167e68c750815ec6496a9f992b744aa56
Reviewed-on: https://gerrit.instructure.com/2963
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
test-plan:
look at the drop down in: speedGrader (in a course with multiple sections)
multiple choice quiz question answers,
the "expand all/unread" button on a discussion topic page
…and make sure they look good
Change-Id: I2c56059990dc526ca2ca82a024748a138b4ee7dc
Reviewed-on: https://gerrit.instructure.com/12308
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
the latest version of firefox has a problem with large positioning
offsets. removing a digit brings back the horizontal scrollbar in the old
gradebook.
see https://bugzilla.mozilla.org/show_bug.cgi?id=749699
test plan:
1. go to the gradebook in a course with a lot of assignments
2. confirm that the scrollbars work
Change-Id: Ic4975336aa6d30fd65e92d7b869dc802b7d4603c
Reviewed-on: https://gerrit.instructure.com/10463
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
we were using a deprecated mixin syntax, and had broken calls in other
places. normalized all occurrences to just do plain old css, since the
mixin wasn't helping our browser support matrix and just inflated the size
of our css
test plan:
1. use canvas
2. ensure drop shadows appear where they should
Change-Id: I8feea097fc6855bff0e820dc3b790d49c1e1a9da
Reviewed-on: https://gerrit.instructure.com/10201
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
latest mathquill:
1. fixes copy/paste oddity
2. reverts broken \left / \right / bracket behavior
3. implements more commands
4. various other fixes/features (refer to
https://github.com/laughinghan/mathquill git history)
test plan:
1. paste latex into the equation editor (within the subset mathquill
supports) and confirm that it renders correctly and creates a valid
codecogs image after you save
2. type and click buttons in the equation editor and confirm that it
renders correctly and creates a valid codecogs image after you save
3. ensure you can still edit previously inserted equations
Change-Id: Ia7a771ec24f3ec691ee313ff359a9f302a462633
Reviewed-on: https://gerrit.instructure.com/9099
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
test plan:
1. edit a quiz
2. add a multiple choice question
3. click the pencil on the first answer
4. add stuff to tiny
5. click done
6. click "update question"
7. reload page, note the HTML answer
8. repeat now that the answer is saved (make sure
new and existing questions are handled
identically)
9. Mess around w/ the question types to ensure
no weird behavior
Change-Id: Idaf741777635fd2b697747a5d331a6b7e34dee8d
Reviewed-on: https://gerrit.instructure.com/8823
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
the driver behind this change was to fix quizzes for IE 8 so that select
options didn't get clipped when the contents were relatively long
summary of changes:
* replace all select controls in quizzes with ui.selectmenu's
* upgrade ui.selectmenu
* tweak active control background to use a gradient instead of an image
* remove quiz select control bugfix hacks
* clean up speedgrader selectmenu usuage, which incidentally fixes issue
where the selectmenu wouldn't close on subsequent clicks
* fix amd bug in app/views/quizzes/history.html.erb
this change will make html answers in dropdowns fairly trivial to
implement
test plan:
* create a quiz with matching questions and multiple dropdown
questions, some with extremely long answer options
* take the quiz
* ensure that the selectmenu dropdowns appear and function correctly
(e.g. all text should be visible for each option when the dropdown is
expanded)
* ensure that the selectmenu dropdowns appear and function correctly
when viewing the quiz submission after the fact (as the student
and via the teacher, e.g. in speedgrader)
* use the speedgrader and ensure there are no regressions in the
student dropdown behavior
Change-Id: I9e50853d4bf1ff4e7e606de872577f374df93061
Reviewed-on: https://gerrit.instructure.com/8869
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
there were a few little bugs with the old one
we were using. this change also makes them accessible
and keyboard navigable.
removed input type="search" because the rounded corners
webkit adds makes it look bad with the autocomplete dropdown.
fixes#5548
Change-Id: Iff1c8516fdc6886bd6b5d190d1b878497b6a80be
Reviewed-on: https://gerrit.instructure.com/6249
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
as it was before, the second time you opened a dialog
it would not look "modal" because .ui-widget-overlay
was opacity: 0.
Change-Id: Id650767ace6977cfa303e1374580bd8382c14864
Reviewed-on: https://gerrit.instructure.com/6006
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
"Mute Assignment" links in gradebook and speedgrader
stop all announcements, emails, and stream items for grades
and comments from appearing until the teacher unmutes the
assignment.
Change-Id: Id74b305b568ff86e2a0e6f9319cfa40bb98b1bcd
Reviewed-on: https://gerrit.instructure.com/5779
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Zach Pendleton <zachp@instructure.com>
they were just white, that was a mistake.
the new theme has them looking exactly like the
new styles we are working on but this will get
them looking right now.
Change-Id: I115b84351d8afe44bfdf17e1a3758ba9e4d129e5
Reviewed-on: https://gerrit.instructure.com/5850
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
need to ensure that the element always has the
class name applied so the css animation takes effect.
Change-Id: I26d9dbcbce8520f12223d293278bf197dabf8b53
Reviewed-on: https://gerrit.instructure.com/5470
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
changes:
* a little i18n work
* show only a certain section
* show attendance
* include ungraded assigments in score
* don't wait for first xhr to fire second
* cool drop down menu thing
Change-Id: Ie93fd06e20aec399710e32441f8d35c686fbbaf2
Reviewed-on: https://gerrit.instructure.com/4868
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
It looks like at some point we switched from an "upload" to an "attachment"
section type, which broke this
Change-Id: I49f1a45ad5b39acd00376504962b9841264d4bd0
Reviewed-on: https://gerrit.instructure.com/2227
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Ryan Florence