Commit Graph

96 Commits

Author SHA1 Message Date
James Williams a51ebd7eee allow course admins without group manage rights to visit
test plan:
* have a course role with "manage groups" disabled
 but "view all group pages" enabled
* they should be shown link on the people -> groups
 tab to go to the group home pages

closes #CNVS-38842

Change-Id: I66863785f15f4deefd757e35492f763f540ad736
Reviewed-on: https://gerrit.instructure.com/125263
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-09-11 12:28:56 +00:00
Landon Wilkins aaee67adf0 da licença part 55
add consistent license headers to all source files

Change-Id: Iec5a2ecba91e736f3b7230f1fba9526096ffc177
Reviewed-on: https://gerrit.instructure.com/110166
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-04-28 19:42:23 +00:00
Jeremy Stanley 5b837c8b8c make assignments/discussions use new group set dialog
and remove a ton of legacy cruft

test plan:
 - create/edit an assignment or discussion topic
 - check the "This is a group <thing>" box
 - click the "New Group Category" button
 - the same "New Group Set" dialog that appears on the People page
   should appear, and should be fully functional
 - if you save the new group set, it should be selected in
   the dropdown box in the assignment or discussion edit page

also:
 - sanity check the course and account groups pages to ensure
   I didn't delete something that's still needed

fixes CNVS-33593

Change-Id: Ieadc720ed6bce5cc35e6dd5dd7dbee7cca1545ca
Reviewed-on: https://gerrit.instructure.com/97402
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Chris Ward <cward@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
2016-12-20 14:48:48 +00:00
Simon Williams 867da572f5 remove groups#edit and account#canvas_network_enabled?
dead code

closes CNVS-32697

test plan:
- basic regression test of group editing

Change-Id: Id720e5540dc22636a66823bd84a77f9a54b45827
Reviewed-on: https://gerrit.instructure.com/92934
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Tested-by: Jenkins
Product-Review: Simon Williams <simon@instructure.com>
2016-10-26 17:07:36 +00:00
Simon Williams 5c3922b73f clean up rs-margin-top
closes CNVS-32675

test plan: make sure the formatting in the right sidebar looks correct
in the following places:
- account authentication page
- course home page as assignments list as a student
- peer reviews
- prior users
- eportfolios index page
- course home page (join/drop buttons), when self enrollment is enabled
- account groups
- quizzes take/show/history
- account users page
- user show page

Change-Id: If1b308c71ff4c3493ccca20a0d4b32b4c09a899f
Reviewed-on: https://gerrit.instructure.com/92894
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2016-10-21 20:48:55 +00:00
Simon Williams fdb065c5b9 enable_manage_groups2 is always on
closes CNVS-32672

test plan:
- regression test groups page

Change-Id: I109d626a11b4648519e0f5ca1d36cdf4d5b2679c
Reviewed-on: https://gerrit.instructure.com/92895
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2016-10-19 21:55:00 +00:00
Simon Williams 79a7aeea92 remove unused .rs-margin styles and classes
closes CNVS-32674

test plan:
- just check a small subset of the pages listed (mostly right sidebars),
there should be no visual change

Change-Id: I9a447084eea0b52f28a781184e8986bbcf895044
Reviewed-on: https://gerrit.instructure.com/92860
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2016-10-18 16:02:48 +00:00
Ryan Shaw 9501380c34 remove all occurrences of use_new_styles? from ruby code
closes: CNVS-31371

test plan:

* do an lti launch, it should work
* check a couple pages in this list of changes,
  they should work

Change-Id: I8005162dd7e45711cc74204f47a76f9133870a6d
Reviewed-on: https://gerrit.instructure.com/89024
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2016-09-12 15:31:07 +00:00
James Williams eed3401759 remove a bunch of unused front-end files
not a comprehensive list by any means, but these were
the ones that stood out

refs #CNVS-27773

Change-Id: I209d983155e740fe1990b8fc4b1a10167eb149d6
Reviewed-on: https://gerrit.instructure.com/75134
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-04-21 20:36:15 +00:00
Pam Hiett 4510a63fd8 update /groups/ edit group and +announcment for consistency
Fixes: CNVS-28745

test plan:
- as a user with old or new ui (ensure change works in both)
- navigate to view "all groups"
- select one... the view should now have the option to "Edit Group" and
  "+ Announcement" - they have been styled as a button for design
  consistency

  ** see jira ticket for example **

Change-Id: I1ebda509569539e9ff3e948e3a8cf28741ad0848
Reviewed-on: https://gerrit.instructure.com/77154
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2016-04-18 22:11:42 +00:00
Pam Hiett 09ebbc01fd change "all groups" to table view vs list view
Fixes: CNVS-28125

test plan:
- as a user that has groups set-up
- in old ui select the "Courses & Groups" link to get the
  expanded sub-nav view - select the "View all groups"
- the groups should now be displayed in a table-style
  view that matches the "all courses" page

- in new ui select the "Groups" link from the left-hand
  nav - within the sub-nav select "all groups"

note: comparison of old view and new view
  old: http://screencast.com/t/jBYtzJwIM3
  new: http://screencast.com/t/DQxjJrZgSKg

Change-Id: I70a9c41eada11226ee6da5e2095abc6588f26f9f
Reviewed-on: https://gerrit.instructure.com/73822
Tested-by: Jenkins
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2016-04-04 15:47:49 +00:00
James Williams 84f0e8d9f7 remove old always-on features
closes #CNVS-27699

Change-Id: I5af3d9915fef4189204283ca87cafc540ed3eed4
Reviewed-on: https://gerrit.instructure.com/73566
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-03-03 16:50:13 +00:00
Jeremy Stanley 859a27dbc9 add all the missing alt text
iow, don't let image_tag generate alt text badly

test plan: (T_T)

fixes CNVS-27489
fixes CNVS-27043

Change-Id: I52dfe7703f57074df61358262f195161cd34c32f
Reviewed-on: https://gerrit.instructure.com/73334
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-03-02 20:27:36 +00:00
James Williams 9531a37afd rails 4.2: fix scope.new calls
scope.new no longer keeps the record out of the association

refs #CNVS-26056

Change-Id: I5867253645c1020cde8853ccc389a0730c241652
Reviewed-on: https://gerrit.instructure.com/70788
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-01-22 16:54:37 +00:00
James Williams 8a41991d74 rails4.2: replace Relation#scoped
either with Relation#all or Association#scope

refs #CNVS-26056

Change-Id: Ie370a3c47c575007ce3b0ba75a122d854e6f8fbc
Reviewed-on: https://gerrit.instructure.com/69497
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-12-30 18:42:04 +00:00
Alex Boyd cdebc47053 Show current groups and previous groups separately
Fixes CNVS-10783

Test plan:
 - Create a course
 - Create a group in said course
 - Add a user to said group
 - As the user, visit /groups and ensure you see the group that
   you were added to under "current groups"
 - Conclude the course
 - As the user, visit /groups and ensure you now see the group
   under "previous groups"
 - Do the same thing but with the course being soft concluded
   (i.e. set a course end date that's in the past instead of
   using the "conclude course" button)
 - Have both a group in a concluded course and a group in an
   active course at the same time and ensure that they still
   show up correctly

Change-Id: Ibb940239a8604455d418111ef60c30d0cb3113d4
Reviewed-on: https://gerrit.instructure.com/57431
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins
QA-Review: Adrian Russell <arussell@instructure.com>
2015-08-27 01:52:50 +00:00
James Williams daef59589d rails4: fix view specs
rails4 removed the automatic initialization of a local variable
matching the name of a partial view
 (e.g. setting `course` to nil in _course.html.erb)

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

refs #CNVS-21596

Change-Id: I7ce8b8a0084602a93f8ac571ee5c98740cb861d1
Reviewed-on: https://gerrit.instructure.com/58718
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-17 20:41:55 +00:00
Ryan Shaw f6edb77702 s/jammit_css/css_bundle
with the new css stuff, we don't actually use
jammit so jammit_css has been renamed to css_bundle.

we left an aliased jammit_css and marked it deprecated
so these all still worked but spit out a deprecation warning.

Change-Id: Ib74037711f559f64851d9379644479587c1f83f2
Reviewed-on: https://gerrit.instructure.com/55888
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2015-07-07 21:26:35 +00:00
Matt Wheeler 7511265d30 Fix recent_event partial to use the right time adjectives
Fixes CNVS-16148

Test plan:

Setup:

1. As a teacher, Create & publish 5 assignments, due within the next week, submission type “Online” and “Text Entry”
2. As a student, submit all 5 assignments.
3. As the teacher, give feedback on all 5 assignments

Places to test:
1. Visit the dashboard as the teacher, see that it says “2 more in the next week” in the Coming Up section
2. Visit the course homepage as the student, and verify it says “2 more in the next week” under “Coming Up” and “2 more in the past two weeks” under “Recent Feedback”
3. Verify you see the same on the student’s dashboard

Change-Id: I46c62c4f705c05d6bddd2c4a81dcdc7fee40b9cf
Reviewed-on: https://gerrit.instructure.com/48559
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
2015-02-26 13:27:44 +00:00
Joel Hough 79066b3846 react student groups
fixes CNVS-16945
fixes CNVS-14813

test plan
- navigate to /courses/<course id>/groups as a student
- regression test student groups page

Test Plan for Accessability Improvements:
* Create a course
* Add a few group sets to the course with varying joinability restrictions
* Invite some students to the course that are in different sections
* Masquerade as a student to verify that group joinability status
  behaves in a predictable way (full, invite only, etc.)
* Masquerade as a student with accessibility needs to verify that group
  joinability status behaves in a predictable way

Change-Id: I6ab94ad07f1c351c596c24978e1b26031e8688cd
Reviewed-on: https://gerrit.instructure.com/44572
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-12-03 18:46:33 +00:00
Andrew Butterfield e5fb3acb34 Add Groups button no longer visible to students
fixes CNVS-15199

Added STUDENT_CAN_ORGANIZE_GROUPS_FOR_COURSE to ENV for check to see if students
are allowed to create groups.

Test Plan
- Allow "New Student Groups Page" in Feature Options tab of Account Settings
- Disable "Let students organize their own groups" in a course
- As a student, visit Groups page and notice that the "+ Group" button
  is hidden

Change-Id: I1379834ad44c0cedb13a41ec636547d4c3ffa1bb
Reviewed-on: https://gerrit.instructure.com/43259
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
2014-10-27 22:26:17 +00:00
Andrew Leung 6a196ab4d1 Add course and term names under group listings
Multiple groups with the same name are now better identified with their
context names (and term names if they are courses).

Test Plan:
  * Create two courses, with one of them in the Default Term
  * Create course groups in those courses
  * Add a student to both course groups
  * As the student, go to /courses
  * Make sure the course name appears under the group name
  * Make sure the term name appears (unless it's in the Default Term)
  * Do the same for /groups
2014-09-25 13:28:45 -07:00
Matthew Berns 0491ae3211 updating h1 tags for accessibility
fixes CNVS-15104

test plan:
- visit edited pages from spreadsheet below
- test page headings with screenreader in safari
- pages should have level 1 headers for screenreader that proceed in order logically
- compare top level headers on assignments, modules, syllabus, and wiki pages
bewteen their actual pages, and their pages when called from home page selection
- headers for the above pages should be h1 on their respective pages, and h2
when called from home page, and stll proceed logically

Changes need to be tested on the following pages
default home page (/)
home page set to course modules
home page set to front page
home page set to assignments list
/courses/1
/courses/1/assignments
/courses/1/assignments/new
/courses/1/assignments/1/edit
/courses/1/discussion_topics/new
/courses/1/discussion_topics/1
/courses/1/discussion_topics/1/edit
/courses/1/gradebook#tab-assignment
/courses/1/gradebook/speed_grader(just pick any assignment w/ speedgrader)
/courses/1/groups
/courses/1/user_services
/courses/1/pages/(whatever page for course)
/courses/1/quizzes/1/edit
/courses/1/quizzes/1/take?preview=1
/courses/1/question_banks/2
/courses/1/quizzes/1/take
/courses/1/conferences
/courses/1/modules/progressions
/calendar2
/about/1
/profile/settings
/dashboard/eportfolios
/conversations?#filter=type=inbox
/accounts/1
/accounts/1/users
/accounts/1/sub_accounts
/accounts/1/account_authorization_configs
/accounts/1/groups
/accounts/1/users/2
/accounts/1/permissions
/accounts/1/avatars
/users/2/user_notes
/accounts/1/rubrics
/accounts/1/grading_standards
/accounts/1/user_notes
/accounts/1/admin_tools
/users/1/admin_merge
/users/1/teacher_activity/student/1
/users/1/masquerade

Change-Id: Ifdad341a22631c0d6773977743be741e74fecd88
Reviewed-on: https://gerrit.instructure.com/40370
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2014-09-17 20:59:38 +00:00
Brian Palmer 6863c8fea4 fix rendering of uncategorized account level groups
fixes CNVS-14243

test plan: create an Uncategorized account-level group, easiest way to
do this is a SIS import like so:

group_id,name,status
fromsis,from SIS,available

Then visit /accounts/self/groups. The group should appear in the
"Uncategorized" tab. Visit the group homepage /groups/:id by clicking
the gear -> "Visit Group Homepage". The group homepage should render
without error, and you should be able to interact with the group like
any other. Test this as a student enrolled in the group, as well.

Change-Id: Id4f08b704226653acc35df517fe58ce4f8f9e6eb
Reviewed-on: https://gerrit.instructure.com/40789
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-09-09 21:54:23 +00:00
Simon Williams 4c34761c34 remove unused page_header and page_subhead content blocks
closes CNVS-14803

test plan:
- make sure the headers are unchanged on the following pages:
  - /accounts/1/account_authorization_configs
  - /accounts/1/sis_import
  - /courses/1/content_exports
  - /courses/1/confirm_action?event=delete
  - /accounts/1/terms
  - /accounts/1/sub_accounts
  - /accounts/1/users/1/delete
  - /users/1/admin_merge

Change-Id: I4563e243cb733e2826d52b408991032da3767efa
Reviewed-on: https://gerrit.instructure.com/39373
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-08-27 21:52:14 +00:00
Drew Bowman 3c1786adac improve student group signup experience
fixes CNVS-11832
fixes CNVS-11836
fixes CNVS-13327

test plan

  - enable feature student_groups_next for course
  - regression test groups page student view

  - regression test instructor groups page

  - as an instructor have multiple groups in a group set
  - visit one of the groups
  - the instructor can switch between the groups in the group set

  - as a student you should be able to create a group

Change-Id: Iacf1eaf4467b57f307d45245b53dfc93f14154ff
Reviewed-on: https://gerrit.instructure.com/34454
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Drew Bowman <dbowman@instructure.com>
2014-05-30 20:53:56 +00:00
Drew Bowman 88ff46b0c3 group leaders can edit group name
students who are made group leaders can update
the group name from the group dashboard page

fixes CNVS-11835

test plan:

- make a student a group leader
- visit the group dashboard as the group leader
- change the name as the group leader

Change-Id: I5637f1ef4e423a06f45987e0eccff2e65ac94613
TODO: Add description
Reviewed-on: https://gerrit.instructure.com/35326
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Drew Bowman <dbowman@instructure.com>
2014-05-28 19:52:42 +00:00
Ryan Shaw 7a8bcbb731 Remove assets.yml refs to files that don't exist
there were a few files that we were still pointing
to in our assets.yml css bundles that the actual
css file does not even exist. when that happens,
jammit does not throw an error or anything but
just prints a warning to stdout.  we probably
deleted the sass/css file long ago but forgot to
remove the reference to it in assets.yml

the only thing I can think of that would be dangerous
here is if one of our plugins depended on one of
these bundles existing so it could override it,
so I'll put some of our plugin experts on review

test plan:
verify rake canvas:compile_assets works and doesn't
print Jammit Warning: No assets match ... warnings

Change-Id: I0f356861159e790302fe14d7e74c3e9172c177f5
Reviewed-on: https://gerrit.instructure.com/34010
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2014-05-01 21:38:20 +00:00
Braden Anderson 5aaf487658 fix checkbox and radio button labels
fixes CNVS-12202

test plan:
  * open the edit page for a discussion topic in Firefox
  * click the label "Allow threaded replies"
  * verify that its checkbox is toggled
  * regression test checkboxes and radio buttons

Change-Id: I7bea6f82307b3834ba7f69de3d3c215386f26e26
Reviewed-on: https://gerrit.instructure.com/32847
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2014-04-18 20:45:02 +00:00
Cameron Matheson 5e5554ca60 rails3: fix route generation on course roster page
Change-Id: I7a1038360abf121b3c305f728c1969b5fc852bdb
Reviewed-on: https://gerrit.instructure.com/31288
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-03-06 22:09:07 +00:00
James Williams 6f2b03a56b create temporary records with .scoped.new for rails 3 compatibility
in rails 3, .new is analogous to .build for collections, so otherwise
temporary records will be added to the collection (and be autosaved)

Change-Id: I08ce7b4b35ee35646aff3afd237bbe896162a014
Reviewed-on: https://gerrit.instructure.com/30334
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-20 20:55:11 +00:00
Landon Wilkins e8438ace7c converts add_group_category js_block into js_bundle
test plan:
* regression test add group category results

Change-Id: I1933791d655eadfdb59cb50c5f7111b10e79cd8d
Reviewed-on: https://gerrit.instructure.com/29141
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2014-02-05 20:11:16 +00:00
Cody Cutrer d0895ff7ad fix rendering of account groups when you don't have permission to manage them
test plan:
 * create an admin that has read roster permission only
 * as that user, you should be able to go to /accounts/X/groups, and not
   error

Change-Id: I396d99f971cdbd2dd37b8e9a5a5d7ff578fe9667
Reviewed-on: https://gerrit.instructure.com/29009
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-02-03 20:27:43 +00:00
Jon Jensen b8baa190ab clarify wording for Student Groups, fixes CNVS-9897
test plan:
1. as a student, create a group that allows others to join
2. as a teacher, go to the new manage groups
3. in the Student Groups set, the notice should say
   "...these groups cannot be used for graded assignments."
4. as a teacher, go to the old manage groups
5. in the Student Groups set, the notice should say
   "...these groups cannot be used for graded assignments."

Change-Id: I477d73500a393d307874ac403fbae6b34f52e2ab
Reviewed-on: https://gerrit.instructure.com/27258
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-12-11 18:32:32 +00:00
James Williams 0fe0ba0180 change block helpers for rails 3.2 compatibility
closes #CNVS-5018

Change-Id: If1cef73759f090efe2a58dc97c351410a552ae1d
Reviewed-on: https://gerrit.instructure.com/25109
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2013-10-11 23:09:37 +00:00
Jon Jensen 67c29b7660 group category create/edit dialogs, fixes CNVS-6659
feature parity with the old UI

also add account setting to enable the new UI

reorg some code so we can more easily rip out all the old stuff once we
are done

sass->scss since it's the new hotness

add reorder() method to CollectionView for when things change

test plan:
1. in the console, set the enable_manage_groups2 setting to true on your
   account
2. run delayed_jobs
3. go to the manage groups page
4. you should see the new groups UI
5. you should be able to add a new group set
6. you should be able to edit a group set
7. the tabs should be alphabetical (adding/updating a set should put it in
   the correct spot)
8. auto-creating/splitting groups should work when creating a set

Change-Id: I55f9e7785a0114954a3583257a78f71e78f47b5f
Reviewed-on: https://gerrit.instructure.com/22458
Reviewed-by: Mark Ericksen <marke@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-09-18 19:43:49 +00:00
Jon Jensen 5a6311d286 group category API refactor
refs CNVS-6659

* move validation logic into model
* standardize api error messages
* deprecate split_group_count
* document group_limit
* actually require name (since that's what the api says)
* disallow setting self_signup when editing account categories since it
  shouldn't be an option (and is totally broken)

test plan:
1. run specs
2. regression of creating/editing categories on group management page

Change-Id: Iccdd4e2e98978943f0562aad5c8ac055048d204d
Reviewed-on: https://gerrit.instructure.com/22493
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-07-26 17:03:27 +00:00
Mark Ericksen fa26ce30f1 group categories tab view
fixes CNVS-6222

testing steps:
* using the console or api, create one or more "Group Categories"
  <server>/doc/api/group_categories.html#method.group_categories.create
* visit the groups management page
  <server>/accounts/2/groups
  <server>/courses/2/groups
* verify the tabs load and display the appropriate group content
* verify the "Add Group Set" button displays when no groups
  exist
* verify tab panel contents are not loaded until activated

Change-Id: I6813611b798d23c925089d932a4d578b5367702d
Reviewed-on: https://gerrit.instructure.com/22401
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-07-23 14:43:34 +00:00
Landon Wilkins 261d7725dc adds api endpoint for randomly assigning unassigned members in a group category
fixes CNVS-6696

test plan:
1) use postman to make a request to this new endpoint for a group category that
   has unassigned members
   --asynchronous example:
   POST http://localhost:3000/api/v1/group_categories/<group_category_id>/assign_unassigned_members
   --synchronous example:
   POST http://localhost:3000/api/v1/group_categories/<group_category_id> \
   /assign_unassigned_members?sync=true
2) verify that the group category's unassigned members have now been assigned
   among the available groups
   --NOTE: this may take a minute depending on the number of unassigned members
3) verify the api documentation for Group Categories - "Assign unassigned members" makes sense
4) verify that an asychronous request returns a Progress JSON
   (see api documentation for example)
5) verify that a synchronous request returns an array of Group Memberships
   (see documentation for example)

NOTE: I've made some tweaks to the current Groups page such that you can
  still randomly assign students. However, this shouldn't matter because
  it's all getting replaced anyway.

Change-Id: I894ff2b1e11c7919a110b5159710683869caedc4
Reviewed-on: https://gerrit.instructure.com/22044
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-07-11 15:09:34 +00:00
Landon Wilkins e8302b12d0 updates several "Add Students to the Course" links to go directly to the People page
fixes CNVS-6434, CNVS-6543

test plan:
a) have a course with no students
a.1) verify that the "Add Students to the Course" links shown in http://screencast.com/t/KWxYeqBis
     go directly to the People page (rather than the users tab on that Settings page)
b) have a course with students
b.0) update anything on the course (such as adding a student to the course) in order to overcome caching
b.1) verify that the "Add Students to the Course" link shown first in http://screencast.com/t/KWxYeqBis
     goes directly to the People page (rather than the users tab on that Settings page)

Change-Id: Ic6a8b940d81795fb08c1f177998043bf23e7809b
Reviewed-on: https://gerrit.instructure.com/21825
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-06-28 21:47:10 +00:00
Jon Jensen 853e4a163e message students who haven't joined a group, fixes CNVS-5408
test plan:
1. allow self signup on a group category
2. click the "message students..." link that appears in the Unassigned
   section
3. you should be able to send a message to those students who have not
   joined a group yet

Change-Id: I1766c8ade8233226a16dfd88b53524ae2e3d2f7e
Reviewed-on: https://gerrit.instructure.com/20338
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-05-11 14:08:05 +00:00
Joe Tanner a5cc1bcf96 limit self-assigned group size, closes #CNVS-5407
test plan:
- go to the groups page of a course or account
  /courses/*/groups or /accounts/*/groups
- edit a group category by clicking on the pencil icon or
  click 'make a new set of groups'
- check the 'Allow self sign-up' checkbox
- a textbox should appear to limit group members
- enter a number (2 or 3) for the group limit and save
- add at least on group
- masquerade as students in the course and join a group until it's full
- once the group is full students should not be able to join the group
- also, when editing a group category you should be able to remove the group limit

Change-Id: I0d035320a171b03a7cd2e4d81ecb0648c5aacad0
Reviewed-on: https://gerrit.instructure.com/20309
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Joe Tanner <joe@instructure.com>
2013-05-08 16:47:14 +00:00
Joe Tanner bb76aa1b07 adds missing tooltips to student group contextual buttons,
closes #CNVS-4746

test plan:
- prerequisite: a course with at least one student group
- go to the groups page for the course
- hover over a group
- the collapse/expand, edit, and delete buttons should have tooltips

Change-Id: Ia99fa46ea210c989d07e730086e405830a748b34
Reviewed-on: https://gerrit.instructure.com/20154
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Joe Tanner <joe@instructure.com>
2013-05-01 20:34:27 +00:00
Ryan Florence afa6fe3eaa checkbox madness and some other form fixes
fixes CNVS-4846, CNVS-4877, CNVS-4861, CNVS-4872, CNVS-4825, CNVS-4831

Change-Id: Icdb921bce379043f5c640aeffe39a1ced1babc0c
Reviewed-on: https://gerrit.instructure.com/19042
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
2013-03-28 21:54:10 +00:00
Eric Berry 34ea35abf6 bootstrapified the edit group form on the groups view
also updated the 'Start a New Group' and 'View Course Roster'
button icons with the new style

fixes CNVS-4574

test steps:
- visit the groups page
- add a group
- hover over the group name on the left side and ensure
  the buttons on the right look good
- click on the 'edit' button while hovering over the name
- click 'cancel' and make sure it works
- modify the name and click 'save' and make sure it works

- log in as a student
- visit the course groups page
- confirm that the buttons on the right are using the new bootstrap
  font icons

note: there is a regression issue with the name removing the link
      after saving the group name

Change-Id: I8212828c5545d3166c52fcd33f194ad6887c2d91
Reviewed-on: https://gerrit.instructure.com/18694
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
2013-03-20 18:51:20 +00:00
Ryan Florence 926cb0ca24 Fully adopt Bootstrap & update css to work with it, closes: #CNVS-1344
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>
2013-02-28 21:06:45 -07:00
Nathan Mills b039dee3e1 create group categories api methods
move group categories methods from groups_controller to group_categories_controller

fixes PS-79
fixes PS-80
fixes PS-108
fixes PS-109

test plan:

*check that group categories still works in ui for accounts, and courses via api

*you should be able to list/show group categories for a course as a teacher or ta via api

*you should not be able to list/show group categores for a course as a student via api

*you should be able to list/show group categories for an account as an admin via api

*you should be not be able to list/show group categories for an account as a non-admin via api

*you should be able to create a new group in a course using the api

*you should be able to create a new group in a account using the api

*you should be able to create a course group category in the api and have it automatically create groups

*you should be able to create a course group category  in the api and have it split students between groups

*you should not be able to use "split_group_count", "create_group_count", or "enable_self_signup" on a non course group category

Change-Id: Ied696a2c5571dad39eae6f0fe9e45692e6f8494c
Reviewed-on: https://gerrit.instructure.com/16820
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Dave Jungst <dave@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-01-28 16:06:51 -07:00
Chris Hart 644daad1e0 Icon replacement for Account > Settings
To test: Open managed account from main dropdown and go thru each menu option on left

Notes:

Did not do icon replacement for "Account Permissions" section as it is heavily CSS sprite-based

Account > Settings > Announcements -- icon font replacement is possible here, but need small dev help

Change-Id: I1b0e52b338eb04a118230fbc2b563ddbf74ea3c1
Reviewed-on: https://gerrit.instructure.com/15569
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-11-30 09:19:55 -07:00
Cameron Matheson fd833e450f kill old new group profile page
Change-Id: I0d0f7a624a7ab6676823dd2c01fe634263cef844
Reviewed-on: https://gerrit.instructure.com/15337
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-11-28 16:42:34 -07:00
Ryan Shaw 713d0b8c91 replace all .button(s) with .btn
in order to not have to support buttons with .ui-button AND
.button AND .btn classes this simplifies and and makes our
codebase more consistent by deprecating the .button class
with .btn

Change-Id: I4802d785a47b36aa477f302e6ac8c87715db8a62
Reviewed-on: https://gerrit.instructure.com/15194
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-11-14 13:29:30 -07:00