Commit Graph

2941 Commits

Author SHA1 Message Date
Julia Hansbrough
75eddb6a15 Implemented bulk email interface for new dashboard
Responses to Adam's comments; reset common.py, i18n compliance, deleted extraneous email.html file, fixed an HttpResponse, deleted unnecessary commented-out code, some small style tweaks
2013-10-10 17:06:36 +00:00
Adam Palay
3f8c2f55f5 disable buttons for large courses on legacy and beta instr dash
set max enrollment for downloads to 200
2013-10-10 17:06:34 +00:00
Julia Hansbrough
dba11a9677 Implemented bulk email interface for new dashboard 2013-10-10 17:06:34 +00:00
frances botsford
187fc8ea1c Merge pull request #1280 from edx/fix/frances/lms-video-dl-buttons2
Improving the video and transcript download buttons
2013-10-10 07:10:38 -07:00
Frances Botsford
5d509c2e08 addressing review feedback on video buttons - switched to use themeable color variables 2013-10-10 10:09:43 -04:00
Julia Hansbrough
47685af07d Defined baseUrl in the legacy instructor dashboard template, fixing a bug where the HTML editor would fail to load 2013-10-09 21:32:50 +00:00
David Baumgold
6c747e31bc Merge pull request #1273 from edx/db/fix-drag-and-drop-requirejs
make drag_and_drop component work with requirejs and changed static url
2013-10-09 12:16:55 -07:00
Frances Botsford
729c0bca09 updating video download links to a list - review feedback 2013-10-09 14:40:01 -04:00
David Baumgold
8906cffb22 correct placement of baseUrl variable, use it to configure requirejs 2013-10-09 11:28:46 -04:00
Calen Pennington
2514dca550 Put XBlock css and javascript onto the LMS courseware page
This required changing structural XModules to fully implement
student_view, rather than just returning the HTML of their children in a
get_html call.

[LMS-223]
[LMS-1170]
2013-10-09 09:40:47 -04:00
Julia Hansbrough
d93e96cbc3 Defined baseUrl in the LMS template, fixing a bug where HTML editors called within LMS would fail to load 2013-10-08 17:03:52 +00:00
David Baumgold
15b65fbecc Fix static links for footer images 2013-10-08 11:39:22 -04:00
Valera Rozuvan
e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover
Valera/add option transcripts remove onhover
2013-10-08 07:37:02 -07:00
Valera Rozuvan
812b085b84 Added hard-coded flag to video.html that turns on/off autohiding of captions.
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
2013-10-08 12:00:06 +03:00
Adam Palay
c64399424e re-enable some buttons on instr dash 2013-10-07 18:13:21 -04:00
Brian Talbot
8ec583c355 LMS: abstracts consistent message/copy color styling from Instructor Dashboard view
LMS: adds message styling to the separate instructor_2 Sass file
2013-10-07 10:14:10 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash
set max enrollment for downloads to 200
2013-10-07 10:11:08 -04:00
Usman Khalid
a47442ed01 Merge pull request #1222 from edx/usman/lms1112-register-form-help-text
register.html: Corrected help text for username & name fields
2013-10-04 11:28:31 -07:00
Diana Huang
f51a99c9bc Add in the static namespace to the new template 2013-10-04 13:28:33 -04:00
Diana Huang
3ec8df9f5e Merge pull request #1216 from edx/diana/dashboard-cleanup
Some dasbhoard template cleanup
2013-10-04 06:17:06 -07:00
Usman Khalid
f80a32e082 Register.html: Corrected help text for username & name fields 2013-10-04 17:12:23 +05:00
Frances Botsford
55d8a72395 adding a little ux to the download video and transcript links 2013-10-03 16:51:39 -04:00
Diana Huang
6bb2ba283b Remove more unnecessary imports 2013-10-03 16:34:16 -04:00
Diana Huang
ed5168ec61 Move more dashboard logic into the views 2013-10-03 16:22:00 -04:00
Sarina Canelake
66b8e1fc8e Merge pull request #1195 from edx/sarina/more-ins-dash
Sarina/more ins dash
2013-10-03 12:58:40 -07:00
Sarina Canelake
1251003d10 Remove enrollment from Student Admin page of new instructor dash 2013-10-03 15:57:31 -04:00
Sarina Canelake
d9f7f8cf98 I18n Student Admin page of new instructor dash 2013-10-03 15:57:31 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Diana Huang
7ba38c0ff3 Refactor out logic for individual course listings. 2013-10-03 14:08:38 -04:00
Diana Huang
51f44e02a6 Delete Pearson code from the dashboard page. 2013-10-03 11:53:08 -04:00
jmclaus
9d418755a6 Added changes made to video.html to fixtures. Addressed latest PR comments 2013-10-02 16:54:48 +02:00
jmclaus
d201ce1035 Addressed PR comments 2013-10-02 15:55:23 +02:00
jmclaus
e5895adb2b Progress slider announces its nabe and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
ce976a80c8 All buttons have an ARIA role, name , and state 2013-10-02 15:55:22 +02:00
marco
81a2ac413d Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
2013-10-01 17:05:02 -04:00
Jason Bau
06cac195f0 make ENABLE_SHOPPING_CART truly optional
course_about was throwing 500s if ENABLE_SHOPPING_CART=False
2013-09-30 09:09:17 -07:00
Vik Paruchuri
9a6ae8f740 Clean up open ended problems view and fix error. 2013-09-27 16:02:12 -04:00
Vik Paruchuri
4ab47c4d05 Fix mako syntax in rubric template. 2013-09-27 15:57:41 -04:00
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional
Added setting to disable 'find courses' links
2013-09-27 12:40:07 -07:00
Giulio Gratta
d75cdda064 An assortment of small OE changes, both for ICE and standard
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
2013-09-27 11:29:06 -07:00
Sarina Canelake
3813e51cfb Add more feedback for instructors on Student Admin section of the dash. 2013-09-27 12:18:01 -04:00
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -04:00
Jason Bau
c1d555beef Merge pull request #1118 from edx/jbau/shoppingcart-stanford
Stanford paid course registration
2013-09-27 07:31:17 -07:00
Usman Khalid
1737984b34 Merge pull request #1122 from edx/usman/lms1167-pdfjs-update
PdfViewer: Added missing link to compatibility.js
2013-09-27 02:49:06 -07:00
Jason Bau
667a1eadb5 Stanford paid course registration
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
2013-09-26 18:25:00 -07:00
Greg Price
7aea7369a7 Merge branch 'release' 2013-09-26 18:12:31 -04:00
Brian Talbot
b86ab28401 Merge pull request #1129 from edx/talbs/fix-lms-banners
edx.org/LMS: Use/Style Semantic Text in Login and Registration Banners
2013-09-26 14:06:24 -07:00
Giulio Gratta
68ce6ed1c8 Second batch of ORA UI fixes:
- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback

Changes after comments:

- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file

More changes:

- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
2013-09-26 09:26:35 -07:00
Usman Khalid
724fc5adbd Updated copy in dashboard 2013-09-26 15:04:43 +05:00
Nick Parlante
08cb469409 Merge pull request #1104 from edx/nick/anon-userids
Add "Download CSV of all student anonymized IDs" button to instructor dashboards
2013-09-25 20:58:34 -07:00