Commit Graph

875 Commits

Author SHA1 Message Date
Ryan Shaw 97eb6d1077 fix styling for selectmenus, fixes: #9434
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>
2012-07-17 20:35:04 -06:00
Ryan Florence 585d0e38b6 removed animation from "more_link" fixes #9442
it was ugly anyway even without the strange jump
shown in the ticket :|

Change-Id: I166672bfc4d1fb308ca009328111d4ae20a405d7
Reviewed-on: https://gerrit.instructure.com/12234
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
2012-07-17 10:01:50 -06:00
Ryan Shaw cf5ff5a1cc upgrade backbone
did this so I could use the Collection::where method

Change-Id: I8507b9fceffdc993e28c0a0e3d619ccd909d7f2b
Reviewed-on: https://gerrit.instructure.com/12162
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-07-17 09:34:18 -06:00
Ryan Shaw 40cc2b8d86 handle drag-n-drop on touch interfaces
test plan:
try to drag drop things (like on the discussions
index page) on an iPad or other touch interface

make sure it works

Change-Id: I4bfc443569846afa0ab07f7c818a8fd2ab9c0943
Reviewed-on: https://gerrit.instructure.com/12161
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-07-17 09:34:07 -06:00
Brian Palmer 9a121c89b1 always show student module progression button to teachers
fixes #9351

test plan: as a student visit the course modules page, verify that the
"view student progress" button doesn't appear. as a teacher visit the
page and verify the button appears, even if no students have started
progression through the modules yet, or if all students have finished
all modules.

Change-Id: I0fab645fb7302b90fe46b8c72950889418f1933d
Reviewed-on: https://gerrit.instructure.com/12079
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-07-17 08:57:40 -06:00
Jeremy Stanley 7290ff6470 don't rename every text header when you rename one; fixes #9373
text headers do not correspond to a database row; all have a
content_id of 0.  recent change to allow items to appear in
multiple modules did not take this into account, and treats
all text headers as instances of the same thing.

the same thing applies to external tools and external urls--
renaming one would rename all.

test plan:
 * find or create a module with multiple text headers.
 * rename one.
 * the others should not change.
 * repeat the above with external tools.
 * repeat the above with external URLs.

Change-Id: I063c0e5a769c8bdefd1dbda569b983506add971d
Reviewed-on: https://gerrit.instructure.com/12295
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-07-17 08:55:16 -06:00
Joe Tanner d16318c1e0 add multiple students to an observer in the UI, closes #7768
other changes:
- makes it possible to add a student to multiple sections in the course
- pagination of the user lists
- converted user tab js to coffee and backbone

test plan:
- as a teacher go to /courses/*/settings#tab-users
- verify that multiple students can be linked/unlinked to an observer
- verify that users can be added to and removed from multiple sections
- verify that 'Resend Invitation' and 'Remove from course' work

Change-Id: I0f64f72f1937348817990b6f13b6310185b68a73
Reviewed-on: https://gerrit.instructure.com/10865
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
2012-07-16 15:48:27 -06:00
Ryan Shaw 73e6d19108 fix ordering of ui-dialog buttons and make primary ones blue again
our old jquery ui theme css was float:right'ing these
which means to have them show up in the right order
you would have to create them in the wrong order.
we fixed that with the new jquery-ui-theme but now
we need to fix places where they were in the wrong
order in code.

also the class name to make them blue has changed
so I fixed that too

Change-Id: If0cbebce4788b0c68cd71a08cd2880076e139bc0
Reviewed-on: https://gerrit.instructure.com/12214
Reviewed-by: Joe Tanner <joe@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-07-16 13:05:25 -06:00
Ryan Shaw a73b37b8e5 new-new breadcrumbs (that look like the old ones)
closes: #9243

test plan: look at how breadcrumbs look

Change-Id: Ib55dfd8b0eb7c30bab08b38732b7eb108baa73f2
Reviewed-on: https://gerrit.instructure.com/12232
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-07-16 10:54:13 -06:00
Ryan Shaw 4a72bcfc7d upgraded handlebars
Change-Id: I7c05df9d41e9908c09dd95209f7c6b15c4af89c9
Reviewed-on: https://gerrit.instructure.com/12163
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2012-07-16 10:53:59 -06:00
Ryan Shaw 5419af6dfd fix jquery ui datepicker styles, refs: #9247
test plan:
go to a page that has a date picker,
make sure it looks good

Change-Id: I02d2846e5bc7064e261bfb26cf0b23d8bae7ec75
Reviewed-on: https://gerrit.instructure.com/12160
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-07-16 10:51:50 -06:00
Simon Williams 9fc42cde44 remove visible traces of anonymous peer reviews
refs #3341

there is some backend support for anonymous peer reviews but it was never
finished and exposed in the UI, except for when posting a peer review via ajax.
this removes the visible traces of the feature until it can be completed.

test plan:
- leave a peer review comment on an assignment
- when the comment is inserted into the page, the author should be your name,
  rather than 'Anonymous'

Change-Id: I8ecaf4ab8941b4c0f3f80605445d7361ed2b2747
Reviewed-on: https://gerrit.instructure.com/12171
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2012-07-16 09:10:18 -06:00
Jon Jensen 22ac5426f8 updated favicon
test plan:
1. clear your cache and/or force refresh
2. you should see the new favicon

Change-Id: Iba44bdb6629ac240b180a5be5be5219c2917a0c9
Reviewed-on: https://gerrit.instructure.com/12173
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-07-12 09:27:48 -06:00
Simon Williams 287bdfd53a allow resetting student view; closes #9229
this creates a fixed bottom bar that shows up on every page when you are in
student view, serving as both a reminder and a place for the buttons to leave
student view or to reset the test student.  resetting the test student is a new
piece of functionality which removes all course artifacts created by the test
student, letting a teacher "start over" the test student.

test plan:
- enter student view
- there should be a permanant bar at the bottom of the page, with buttons
- there should no longer be a [Leave Student View] link in the top right corner
- the leave button should work
- as the test student, interact with the course (submit assignments, take
  quizzes, comment in discussions, etc)
- click the reset student link in the bottom bar
- all of the interactions above should be gone

Change-Id: If73be7a28f6af5378da26f92e82a69a72352d831
Reviewed-on: https://gerrit.instructure.com/12057
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
2012-07-11 10:18:34 -06:00
Jeremy Stanley f8f6627602 don't omit the drag target from the order list, fixes #8689
test plan:
 * find or create a course with multiple assignment groups
 * try to drag an assignment group to somewhere other than
   the top slot
 * it should stay where you put it, and not snap to the
   top slot

Change-Id: I966144fd8ef92ef9357a75b5abd64ffb90211366
Reviewed-on: https://gerrit.instructure.com/12092
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-07-10 09:19:20 -06:00
Ryan Shaw 5353a2bc8e only set focus on link if using keyboard nav, fixes: #9211
Change-Id: Id1bbde5d933ad0d7d6e994f4ed89681d59823b56
Reviewed-on: https://gerrit.instructure.com/11932
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-07-10 09:02:27 -06:00
Jon Jensen d8b52a9605 account-level user quota defaults, closes #9198
adds (root) account-level setting for (default) user file quotas. defaults
to 50 MB.

test plan:
1. on a root account, change the default user quota to something other
   than 50 MB (e.g. 1 MB)
2. as a user in that account:
   1. go to /users/self/files/quota . you should see the new quota
   2. attempt to upload files. once you have hit/exceeded the quota, you
      should not be able to upload additional files
3. as a user in multiple (root) accounts:
   1. go to /users/self/files/quota . your quota should be the sum of the
      root account user quotas
   2. attempt to upload files. once you have hit/exceeded the quota, you
      should not be able to upload additional files

note that the previous behavior does not change in that one file can exceed
your quota. e.g. if your quota is 1 MB, you can upload a 2 MB file. only
then will you be prevented from uploading additional files

Change-Id: If7f5903fb54eb2b62d80a2b4ee8adfcc48a63683
Reviewed-on: https://gerrit.instructure.com/12005
Reviewed-by: Joe Tanner <joe@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-07-09 16:34:48 -06:00
Jon Jensen 51c571ce24 don't query collection items if there are no collections
if you aren't logged in or you have no collections, we shouldn't
query for collection items

test plan:
1. go to a page with the wiki sidebar without being logged in
2. it should not do an AJAX call for the collection items
3. go to a page with the wiki sidebar for a user that has no collections
4. it should not do an AJAX call for the collection items

Change-Id: I73f984a43d0d3d0e09ebb2faa71473cbdf20c3de
Reviewed-on: https://gerrit.instructure.com/11965
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
2012-06-29 12:46:11 -06:00
Jon Jensen 13f9a5a29e don't show collections tab in wiki sidebar if you have none
test plan:
1. edit a wiki page
2. you should only see the collections tab if you have collections

Change-Id: Ia1743f5a7440b16d4813646eb66fde98f97b99ab
Reviewed-on: https://gerrit.instructure.com/11924
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
2012-06-29 10:30:31 -06:00
Ryan Florence ebe23c3032 remove conflicting jQuery.fn.menu
Change-Id: Ia863dde8f37f5db566e54de7cd480d7fb3078181
2012-06-28 00:32:07 -06:00
Jon Jensen d45870956f Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-27 16:40:07 -06:00
Ryan Shaw b8b0533198 put a margin around #right-side
which means that .rs-margin(left|right) aren't needed
anymore.

the new width of 286 leaves the same width (260px)
as before after doing .rs-margin-lr

Change-Id: I3a754ee67860f2f4023d9fa2efa2538b016e6236
2012-06-27 00:06:03 -06:00
Jon Jensen 3a60d57633 fix "Hide student names" setting in speedgrader, fixes #9073
ensure we hide student names (and avatars) everywhere in the speedgrader
when this settings is checked.

test plan:
1. enable avatars
2. go to the speedgrader and click on settings
3. check the "Hide student names" setting
4. confirm that you don't see:
   1. student names in the dropdown
   2. student avatars next to the dropdown
   3. student names next to submission comments
   4. student avatars next to submission comments
   5. student names in the file download preview (for non-inline
      attachments)
5. confirm that you still see teacher names and avatars in submission
   comments

Change-Id: I1b8bfbd70b1d9dea366aa6fb355b2a85c572f2ca
Reviewed-on: https://gerrit.instructure.com/11769
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2012-06-26 10:59:14 -06:00
Ryan Shaw 77138c4d4a Merge remote-tracking branch 'origin/master' into dev/fft
Conflicts:
	app/controllers/collections_controller.rb
	app/views/layouts/application.html.erb
	config/build.js
	lib/tasks/parallel_exclude.rb

Change-Id: Ic9664c29d1469c13b514343915c5929dfb15c6ad
2012-06-26 10:14:46 -06:00
Simon Williams d3b5a76c71 remove auto-scroll on assignment index page; refs #9051
scrollToVisible isn't working correctly, so when you click edit or update on
the assignment index page, the assignment you are trying to interact with
scrolls out of view.  this just temporarily disables the auto-scroll behavior
until scrollToVisible can be fixed.

test plan:
- in a course with enough assignments that there is a significant scroll bar on
  the assignment index page
- go to the page and click the edit pencil icon for an assignment midway down
- you shouldn't be scrolled to the bottom of the page.

Change-Id: I9ce35abf1272137f10a01d4d10b9d986ae2a2783
Reviewed-on: https://gerrit.instructure.com/11649
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-06-25 09:13:32 -06:00
Zach Pendleton bc88730b6b hide curve grade error box after 3 seconds.
fixes #9132

when a user attempts to curve grades on an assignment that has
no submissions, he/she sees an error message bubble that does
not disappear and can instead only be closed by clicking on it.
this commit fades out said bubble after 3.5 seconds.

test plan:
  * create a course with at least one assignment;
  * view that assignment in gradebook and gradebook2, and attempt
    to curve the grades for it;
  * "Nothing to update" popup should display, and then fade out
    after 3.5 seconds.
  * verify that clicking the bubble still makes it disappear.

Change-Id: I6ea4256e80dc320845afef950843bd7a08788b58
Reviewed-on: https://gerrit.instructure.com/11754
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-06-22 22:54:12 -06:00
Cody Cutrer df97e23785 refactor sis imports api
basically, use the API from the UI, and delete duplicate code.
the api specs already covered everything the non-api specs tested

also drop the unused sis_batch_log_entries table

test plan:
 * validate an sis upload from the UI works, and shows progress,
   and completes successfully
 * validate the ui shows progress when the page is reloaded and
   a batch is in progress

Change-Id: I9be1ac5901a5c6a1b01719718eeda106aaf3045d
Reviewed-on: https://gerrit.instructure.com/11595
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2012-06-22 12:25:56 -06:00
Ryan Florence cdd62968f6 removed new dashboard link
Change-Id: Id53c60f75ef02dcea04c91d4cf47275caacf6fed
2012-06-22 10:22:29 -06:00
Ryan Shaw 0c8d3386c4 unify jqueryui, bootstrap and our buttons
Change-Id: Ieee31a083bbffce428f45886269dd3e0df45de9a
2012-06-21 23:30:44 -06:00
Cameron Matheson d243879162 report a problem: require email when not logged in
fixes #9001

test plan:
  * click 'Help' in the footer on the login page
    - the 'report a problem' dialog should require an e-mail address
  * log in and click 'Help' in the upper-right corner
    - the 'report a problem' dialog should not show or require an e-mail
      address

Change-Id: I65e9793e0058fa52cf392ff21642140177870226
Reviewed-on: https://gerrit.instructure.com/11728
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-06-21 16:37:40 -06:00
Brian Palmer 73380d2bc8 allow using an item in modules more than once
closes #8769

An item can be added to multiple modules, or even the same module more
than once. This is especially useful for attachment items, but is also
useful for allowing multiple paths through a course, with say an
assignment in two different modules and the user only has to complete
one of the two modules.

test plan:

For an item in only one module, verify that the module navigation still
appears if you go straight to that item's page, without going through
the modules page.

Add an item to more than one module. If you visit that item from the
modules page, you'll see the right nav depending on which instance of
the item you clicked on. If you visit the item directly without going
through the modules page, you'll see no nav.

Lock one instance of the item by adding a prerequisite, but leave the
other unlocked. You can still see the item as a student.

Lock all instances of the item with prerequisites. The item will now be
locked and you can't see it as a student.

Add completion requirements to the item, such as a minimum score on a
quiz. Make the requirements different -- 3 points in one instance and 5
in the other, for instance. Verify that if you get 3 points on the quiz,
one item is marked as completed but the other isn't, as expected.

Rename the item. Verify that all instances of it in modules get renamed.

Change-Id: I4f1b2f6f033062ec47ac34fe5eb973a950c17b0c
Reviewed-on: https://gerrit.instructure.com/11671
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2012-06-21 10:12:22 -06:00
Cameron Matheson 4efe9189d9 Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-20 15:27:01 -06:00
Cameron Matheson ce2e15b86a more wiki sidebar fixes
Change-Id: I3dc656d2968b8dce84d01d179e6f579f4358ff13
2012-06-20 10:59:17 -06:00
Cameron Matheson f7c2eb2bb7 wiki sidebar fixes
Change-Id: Iebd9fec9a8ca0c624cb627cc3aba43fa289680a4
2012-06-19 16:45:34 -06:00
Brian Palmer f160402698 remove unused context_module_legend html dialog
this was being rendered on every page that contained a module item, but
wasn't being used.

test plan: load module items (assignments, files, etc that are
included in a course module), and verify the page still renders.

Change-Id: I7b4a17b608c6d0484d58c2d80e7228b14cf5d24d
Reviewed-on: https://gerrit.instructure.com/11670
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2012-06-19 12:49:51 -06:00
Cameron Matheson de1dad5ace fix jslint error in dashboard.js
Change-Id: Iec4ebc158e1f723a0e3d5fa2a963bf5db024ba18
2012-06-18 15:58:43 -06:00
Cameron Matheson 665d295ce7 Merge branch 'master' into dev/fft
Conflicts:
	Gemfile
	app/controllers/courses_controller.rb

Change-Id: Ie01f68d5ab6f02e3a581d70adf674f222b88574b
2012-06-18 15:24:09 -06:00
Jon Jensen b7d48e45ae fix dashboard toggle and a couple style regressions
Change-Id: I47ab5610df59ec192c7296875ec1df74691ac789
2012-06-13 16:45:55 -06:00
Jake Sorce e2704f1ace don't show un-needed text in additional comments dialog
fixes #8613

test plan:
  1. Create a Rubric in a course and use it on an Assignment
     for grading and set it to allow free-form commenting
  2. As a Student, submit the assignment used in Step 1
  3. As the Teacher, go to the Speedgrader for the
     assignment/student used in Step 2, add comments to some
     criterions and Save
  4. From the right-hand column of the Speedgrader, click a
     comment you left in the Rubric (should display a popup
     dialogue about the Rubric)
  5. Notice, only the title of the criterion is displayed
     in addtion to the comments

Change-Id: Ia0cd884ee6468bdac85e5c597ae28670e78d7f26
Reviewed-on: https://gerrit.instructure.com/10834
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
2012-06-13 15:26:59 -06:00
Jon Jensen 9003c46801 collection items for tiny / wiki sidebar
test plan:
1. create some collection items (images, urls, video, etc.)
2. go to a wiki page
3. add them
4. they should be embedded/linked appropriately

Change-Id: I739a5cae863113ef66109cf3edc5c6068e105e4a
2012-06-13 14:14:50 -06:00
Ryan Shaw c8da953429 there are no "new styles", take 1
Change-Id: I975b55814c344e5953d7346fb7bfcc396ff832f5
2012-06-13 13:58:19 -06:00
Ryan Shaw 897451c086 Revert "resize content area to be as big as left side"
This reverts commit bf08fd0d91.
2012-06-13 13:58:19 -06:00
Ryan Shaw ff9014feef fix media comments for discussions with tons of videos
if you called $().mediaCommentThumbnail() with an
empty set it would break it so it won't make mediaCommentThumbails
any more for anything else.

Change-Id: I1a8868439563df7655c07d1aedfada37ad4db857
fixes: #8874
Reviewed-on: https://gerrit.instructure.com/11522
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2012-06-12 10:31:24 -06:00
Ryan Shaw 48a125edce new minimal style for breadcrumbs
Change-Id: I55471805b701c9809a56864e947734f11aefb978
2012-06-11 16:29:20 -06:00
Ryan Florence b57f9aa79f drawer icon toggling
Change-Id: If692e0591419e6e5c578dbcc434934441a557140
2012-06-08 15:17:33 -06:00
Ryan Shaw 8487c92167 make default canvas look like fft canvas
this changes the #identity styles and the header styles

also the course & assignments drop downs

and finally the default link color

Change-Id: I78471f2867b6e1a2f04518631c143c96751c72cc
2012-06-08 14:09:26 -06:00
Ryan Florence bf08fd0d91 resize content area to be as big as left side
Change-Id: I6a9222b9351892d9495c8cefb41dea2d11cb4fca
2012-06-07 11:35:17 -06:00
Jacob Fugal 043de4612e %-d instead of %e in date formatting
Change-Id: Ice15ad81e618c5acc4974e204d2c0ccba6da4486
Reviewed-on: https://gerrit.instructure.com/11379
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2012-06-07 10:19:22 -06:00
Cameron Matheson ec816c3dac group profile page
closes #8827

Change-Id: Ifd02bfe30828b4f3d5e6da1d1c00976fa65be6ac
2012-06-07 02:00:06 -06:00
Jon Jensen 84bec0bea9 dashboard phasing, closes #8802
adds button (and underlying pref/endpoint) so users can opt in to (or out
of) the new dashboard. button appears on old and new dashboard and group
pages.

test plan:
1. opt in to the new dashboard
2. you should see the new dashboard (and new group page)
3. opt out
4. you should see the old dashboard (and old group page)

Change-Id: I151f3a3979ddc3e18e7e0dbf97d271ace91b3235
2012-06-05 23:19:08 -06:00