Commit Graph

32 Commits

Author SHA1 Message Date
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
Jacob Fugal 93f9accc82 smarter linking of public portfolio owner's name
fixes CNVS-5352

only link to a user page if one is visible to the person viewing the
page. prefer the /about/:id page if the account has profiles enabled.
otherwise, prefer the /users/:id/profile page when viewing my own
portfolio and the /users/:id page otherwise (and only if permitted).

test-plan:
  - have a target user with a student enrollment
  - create a public portfolio for the target user

  - enable profiles on the account
    * log out and view the portfolio
      - the portfolio owner's name should not be linked

    * log in as portolio owner and view the portfolio
      - the portfolio owner's name should be linked to /about/...
      - following the link should be authorized

    * log in as an account admin and view the portfolio
      - the portfolio owner's name should be linked to /about/...
      - following the link should be authorized

    * log in as a teacher in the student's class and view the portfolio
      - the portfolio owner's name should be linked to /about/...
      - following the link should be authorized

    * log in as an unrelated non-admin user (i.e. student from some
      other class) and view the portfolio
      - the portfolio owner's name should not be linked

  - disable profiles on the account
    * log out and view the portfolio
      - the portfolio owner's name should not be linked

    * log in as portolio owner and view the portfolio
      - the portfolio owner's name should be linked to
        /profile
      - following the link should be authorized

    * log in as an account admin and view the portfolio
      - the portfolio owner's name should be linked to /users/...
      - following the link should be authorized

    * log in as a teacher in the student's class and view the portfolio
      - the portfolio owner's name should not be linked

    * log in as an unrelated non-admin user (i.e. student from some
      other class) and view the portfolio
      - the portfolio owner's name should not be linked

Change-Id: I812076d10bd3c56b87938627c9f095a1793128e6
Reviewed-on: https://gerrit.instructure.com/39863
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-09-05 16:04:11 +00:00
Bryan Madsen 2701ac31a6 replace "Rich Text Editor" with "Rich Content Editor"
Test Plan:
  - create or edit a quiz
  - switch editors by clicking on "HTML Editor"
  - Confirm that the editor switch text now reads 'Rich Content Editor'.
  Extra WYSIWYG locations:
  - Confirm that assignments, syllabus content, calendar events, eportfolios, and wiki rich text editors are also edited
  - confirm that locales are updated

Closes #CNVS-14658

Change-Id: I87348365706cd7a9d77932b805204879e521425d
Reviewed-on: https://gerrit.instructure.com/38885
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
2014-08-08 22:15:47 +00:00
Ryan Taylor eaffb011f5 Change text field in quizzes to better conform to documentation.
Closes CNVS-11570

Test Plan:
  - create or edit a quiz
  - switch editors by clicking on "HTML Editor"
  - Confirm that the editor switch text now reads 'Rich Text Editor'.
  Extra WYSIWYG locations:
  - Confirm that assignments, syllabus content, calendar events, eportfolios, and wiki rich text editors are also edited
  - confirm that locales are updated

Change-Id: If110012fea46090dc2283bfba1170e82034e7ff5
Reviewed-on: https://gerrit.instructure.com/38729
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
2014-08-05 20:35:04 +00:00
Landon Wilkins bc78cc6847 converts eportfolios/_wizard_box js_block into js_bundle
test plan:
* regression test eportfolio wizard box

Change-Id: I94cbba4e6d95649bc327226a0c7dc407cce53577
Reviewed-on: https://gerrit.instructure.com/29155
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2014-02-05 17:20:50 +00:00
Jon Jensen be8f32a91c escape translations when manually building html, fixes CNVS-10769
fix places where we manually build up an html snippet w/ a translation
embedded in it. note that this commit does not fix any such issues in
js_blocks, since those are all being removed in other commits.

test plan:
1. regression test of canvas, in particular the areas indicated by the
   files that were updated

Change-Id: I6f966ab5ca9908a21d7a1baef24ce243e7b1e675
Reviewed-on: https://gerrit.instructure.com/29246
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2014-01-27 23:25:52 +00:00
Aaron Cannon 904a6806f3 TinyMCE: Give Switch Views links more meaningful labels
Fixes CNVS-9799

Test plan:
- Visit every RCE editor in Canvas that offers a control for switching
  between the visual and HTML editor (nearly all of them).
- Verify that the control label is clear about what it does. I.E. not simply
  "Switch Views".
- Switch back and forth between views, and verify that the control always
  works, and that the label is correctly updated when the view changes.

Change-Id: Idc62f57b4914b170428c9e97b7286af177dac269
Reviewed-on: https://gerrit.instructure.com/27989
QA-Review: Myller de Araujo <myller@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2014-01-21 00:07:28 +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
Mark Ericksen deb32ca36b handle ePortfolio name when too long
fixes CNVS-3277

testing steps:
- either create a new ePortfolio or edit
  the settings for one (i.e. left side nav
  when in a portfolio "ePortfolio Settings")
- in popup, enter text longer than 255 characters
  and try to submit
- should display that "Name is too long"
- when creating a new ePortfolio and when editing,
  verify that it requires a "Name" and gives
  a descriptive error message

Change-Id: Id7b6b495a3e47290ea5c37054865812ddc7f1dec
Reviewed-on: https://gerrit.instructure.com/23829
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-09-05 17:26:04 +00:00
Mark Ericksen df51cefe04 fix bug preventing profile export
fixes CNVS-4438

testing steps:
1. Create an ePortfolio
2. Using the Home Page or New Section edit the page
3. Select the Course Submission tool under Add Content (Top right)
4. You must have a recent assignment submission with attachment
5. Select an assignment submission with an attachment and save the page
6. Navigate to Back to Portfolio Dashboard
7. Select "Download the contents of this ePortfolio as a zip file". It should now work and not hang.

Change-Id: I088388473ae4b7c81581e34e79159ded8a09facd
Reviewed-on: https://gerrit.instructure.com/23211
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>
2013-08-09 21:45:05 +00:00
Landon Wilkins db1b2de8ff fix ePortfolio entry update bugs
fixes CNVS-5416

test plan:
0) make sure you can NOT reproduce the bug
  (see CNVS-5416 and http://screencast.com/t/Fvze4WFTMwmo)
1) click "Edit this Page" button on a ePortfolio page and
  ensure that you can edit the title and the title updates
  appropriately (as does the link on the right sidebar).

optional info from bug report:
Description)
  When  you edit a page name in ePortfolio and refresh, all
    the content disappears and you cannot bring back the
    page via URL.

Expected Behavior)
  It is expected that editing the name of a page in
    ePortfolio will change the page name and keep the
    content that was previously there.

To Reproduce Bug (which should be impossible now))

1.  Go to ePortfolio
2.  Create a page and put xyz in it.  Save the page.
3.  Using the "Organize/Manage Pages" link, edit the page name.
4.  You have to refresh to save the page.
5.  Note that the new page name is there, and the content is gone.
6.  Try to go to the previous page name via URL.  A green bar comes up with a check mark and says "Can't find that page."

Change-Id: I11b2c0c4c2278edb5349a61b6cf9af7fd74d8cae
Reviewed-on: https://gerrit.instructure.com/21945
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>
2013-07-03 21:14:35 +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
Chris Hart 516dd253bd Icon font replacement for ePortfolios
To test:

- Create and edit an ePortfolio

- Comment on an ePortfolio page

Change-Id: I324fabf0d5b5ae081da59db7e0d79605feaecc34
Reviewed-on: https://gerrit.instructure.com/15635
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-11-30 09:20:03 -07:00
Chris Hart b0e90a9041 Icon replacement for all wizard boxes
To test:

Open wizard boxes for courses, ePortfolios, calendar and assignments

Change-Id: Icee84b57fdb18189c5c10d1ed0e7c89f9959f2cf
Reviewed-on: https://gerrit.instructure.com/15346
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-11-28 15:13:00 -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
Chris Hart 171b05a4f7 update dialog box button appearance to conform with styleguide
fixes 

test plan:

check each updated form to ensure it looks correct and works

Change-Id: I073c3bff5860bab0b892fecbf61a41a8e9c5ec76
Reviewed-on: https://gerrit.instructure.com/13904
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-11-13 13:00:36 -07:00
Ryan Florence e676dad920 fix eportfolio section list fixes
should look like this:
https://dl.dropbox.com/u/10952887/screenshot.png

Change-Id: I3fe9bad1e4b944990082c06371b5c648b4b59cc4
Reviewed-on: https://gerrit.instructure.com/12208
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-07-13 18:32:21 -06:00
Efrain Chu-Jon bdd840786e spec: making the eportfolios specs more robust
Change-Id: I2942b6e8207539aab4963bb4c18869c95edf7e8e
Reviewed-on: https://gerrit.instructure.com/9928
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
2012-04-16 11:59:56 -06:00
Ryan Florence 19134d7eda manage tiny resources ourselves
Change-Id: Ia2df0322b036f2206b17cad82082bbdb58ff2ac0
Reviewed-on: https://gerrit.instructure.com/8675
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2012-02-17 09:25:47 -07:00
Simon Williams 2102a6f41d remove extra eportfolio add submission option; fixes
two small bugfixes, one that prevents sending both a create and update
request when making a new section, the other is hiding the "New Section" option
which showed up in the add submission form, which is just a template for the
javascript to use.

test plan:
- go to eportfolio
- add a new section (submit with the enter key)
  make sure you don't get the error flash message
- click on a submission, make sure "New Section" is not an option

Change-Id: I6509ff1f5111d1aafba7c3108625fccf9850aa8b
Reviewed-on: https://gerrit.instructure.com/8707
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2012-02-15 16:32:19 -07:00
Ryan Florence a1e31c8c9a AMD Conversion
"Trivial" JavaScript / CoffeeScript changes
--------------------------------------------------

For the most part, all javascript was simply
wrapped in `require` or `define`. The dependencies
were found with a script that matched regexes in
the files, it errs on the side of listing too many
dependencies, so its worth double checking each
file's dependencies (over time, anyway).

i18n API changes
--------------------------------------------------

No longer have to do I18n.scoped calls, just
list i18n as a dependency with the scope and it's
imported already scoped

  require ['i18n!some_scope'], (I18n) ->
    I18n.t 'im_scoped', 'I'm scoped!'

JS bundling now done with r.js, not Jammit
--------------------------------------------------

We don't use jammit to bundle JS anymore. Simply
list dependencies for your JS modules in the file
and RequireJS handles the rest.

To optimize the JavaScript, first make sure you
have node.js 0.4.12+ installed and then run:

  $ rake js:build

The app defaults to the optimized build in
production. You can use non-optimized in
production by putting ?debug_assets=true in the
url just like before.

You can also test the optimized JavaScript in
development with ?optimized_js=true.

Significant changes
--------------------------------------------------

These files have "real" changes to them (unlike
the JavaScript that is simply wrapped in require
and define).  Worth taking a really close look at:

- app/helpers/application_helper.rb
- app/views/layouts/application.html.erb
- config/assets.yml
- config/build.js
- lib/handlebars/handlebars.rb
- lib/i18n_extraction/js_extractor.rb
- lib/tasks/canvas.rake
- lib/tasks/i18n.rake
- lib/tasks/js.rake

Change-Id: I4bc5ecb1231f331aaded0fef2bcc1f3a9fe482a7
Reviewed-on: https://gerrit.instructure.com/6986
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2012-02-06 16:41:40 -07:00
Zach Wily 00c23f0697 fix flickr image search in eportfolios; fixes
I went ahead and added a rendered wiki_sidebar to the eportfolio pages, but
hidden. It looks like there are a few things in tiny plugins want that are
only found in the wiki sidebar.

Change-Id: Ifb4d08766d0a3ccc374b15ae33f141ed12c2bb9a
Reviewed-on: https://gerrit.instructure.com/4965
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-09 08:12:19 -06:00
Jon Jensen cb864c6ae0 misc view i18n
Change-Id: I9cd27dd9d6d3daa8c1fe70cb0de21b82d1980de7
Reviewed-on: https://gerrit.instructure.com/4586
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-07 10:37:38 -06:00
Jon Jensen 6f0e2a18a3 misc title/alt attribute i18n
Change-Id: Ifb9d24d913df0fc8a03350b96e949d0204024d30
Reviewed-on: https://gerrit.instructure.com/4590
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-07 09:36:03 -06:00
Jon Jensen 35705ee7bc various i18n fixes/deduplication
added checks to extractor for some common typos/oversights (and more line numbers)

Change-Id: I7a2b080cf2a26cb6711539220fe2486a1a4f04b5
Reviewed-on: https://gerrit.instructure.com/4581
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-06 17:29:33 -06:00
Jon Jensen 7928b695a2 fix a few i18n issues
Change-Id: If5fd5dd4ffb848ba2a09b29d36c2a08b9859f83f
Reviewed-on: https://gerrit.instructure.com/4409
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-07-06 10:49:20 -06:00
Jacob Fugal 10060131b3 fix broken eportfolios i18n
Change-Id: I1d257c194c8a62cf0f60b916a66a1d5cec3c3c7d
Reviewed-on: https://gerrit.instructure.com/4378
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-24 14:14:36 -06:00
Jacob Fugal e0e09bfea1 localize ePortfolios
Change-Id: If79d2b7e219ba4855d1a441e3fc7de2d8da0fad3
Reviewed-on: https://gerrit.instructure.com/4152
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-06-24 13:17:25 -06:00
Zach Wily 20092fb2c9 fix more find_by_id cases where we could pass in an empty string
Change-Id: I6bd72dd78f739edac6377f863f298fa14283be38
Reviewed-on: https://gerrit.instructure.com/3299
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-27 10:45:09 -06:00
Zach Wily 9c0448cc58 fix uploading files to eportfolios; fixes
We renamed 'upload' to 'attachment' and missed a couple spots.

Change-Id: I5f53f59e135a7887ff106803f70d9c4d52596e79
Reviewed-on: https://gerrit.instructure.com/3124
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-16 13:41:54 -06:00
Zach Wily f3e702a264 fix image/file upload section in eportfolios, fixes
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>
2011-02-10 12:34:07 -07:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes 
2011-01-31 18:57:29 -07:00