Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

84 Commits

Author SHA1 Message Date
Giulio Gratta
6e988443f6 User menu a11y changes to allow use of spacebar, escape key and arrow keys or tab and shift+tab to navigate 2013-11-01 14:34:02 -07:00
Jason Bau
ec8871206a use context processor instead of middleware 2013-10-16 12:16:10 -07:00
Jason Bau
4c664240e1 Move logic that decides whether to show shoppingcart to middleware 
Middleware is a better place for this, rather than navigation.html
template
 2013-10-15 17:11:48 -07: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
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
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
Usman Khalid
3ff203d11f Renamed setting ENABLE_STUDENT_SELF_ENROLLMENT to COURSES_ARE_BROWSABLE 2013-09-23 15:04:11 +00:00
Usman Khalid
d2cd8a6a58 Added setting to disable find courses links 2013-09-20 15:59:34 +05:00
Brian Talbot
159f680711 LMS: semantically hides the ie-centric browser warning/FF/Chrome suggestion message to avoid confusing/misleading assistive tech-based users. 2013-09-19 16:37:50 -04:00
Brian Talbot
4b4c68d9fd LMS: resolves alt attribute copy issue for app/brand logo element - i8tn and settings data 2013-09-13 15:01:07 -04:00
Chris Dodge
3a2bb7ba01 add escaping 2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
Adam Palay
69ffb6a87b replace edx with variable substitution 
fixes template errors

keep tos untranslated

formatting fixes
 2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Brian Talbot
443a50845a lms - adds back in missing/previously added .sr screen reader-focused styling and references in place of the .visuallyhidden application 2013-06-10 16:22:21 -07:00
Giulio Gratta
2cad6fe261 user button and menu accessiblity hidden span addition 2013-06-10 16:22:13 -07:00
Nate Hardison
f055c6f989 Inject theming hooks into navigation bar 
Allow themes to inherit from the default navigation bar and override
pieces of it, including the main logo, the links that display to the
right of the logo, and the links inside the dropdown menu (with the
exception of the `Log Out` link.

In addition, this adds an empty block at the very top so that themes
can place a branding bar at the top of the page. (Stanford identity
guidelines require this: see https://identity.stanford.edu.)
 2013-06-05 10:27:14 -07:00
Brian Talbot
7c4e20f9e5 lms - adds in alt text attribute to logo/edX home image for accessibility purposes 2013-06-04 14:46:01 -04:00
Greg Price
6f06a3d92a Make login link button in header work with course enrollment flow 
When an unauthenticated user clicks the registration button for a course, they
are redirected to the registration page with query params that are ultimately
included in the form that gets submitted so they can be enrolled in the course
upon successful registration. The header login button is fixed to pass the same
query parameters to the login page so the user can be enrolled in the course
upon successful login.
 2013-05-10 11:03:38 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Greg Price
dadb0b6931 Fix courses link in LMS header when not logged in 2013-05-07 16:35:08 -04:00
Diana Huang
6110b54ca8 Address code review feedback 
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
 2013-05-06 14:56:06 -04:00
Greg Price
00729a8c13 Add an omnipresent help tab to the LMS 
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
 2013-05-06 13:35:52 -04:00
Diana Huang
c9a6fe18f0 Create new marketing_link function to abstract link generation 
and use it for the new marketing site links.
 2013-05-03 15:06:24 -04:00
Diana Huang
d35283cf65 Reduce the amount of repeated HTML and add checks for the correct settings. 2013-05-03 10:17:40 -04:00
Diana Huang
e0ac6834da Fix links between marketing site and courseware. 
Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
 2013-05-03 09:31:47 -04:00
John Jarvis
54e5e3d31f Adding the EDX_MKTG feature flag and links back to the marketing site 2013-04-10 14:29:55 -04:00
John Jarvis
78987cc400 resolving merge conflicts 2013-03-19 16:16:32 -04:00
Brian Talbot
d23679ea4e edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme 2013-03-12 15:04:00 -04:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -05:00
Brian Talbot
8374534802 drupal integration - revised copy, layout, and styles per marketing feedback 2013-01-23 18:22:13 -05:00
Brian Talbot
c500896913 drupal integration - adding back in modal assets for passwor recovery - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
2019af4170 drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons 2013-01-23 18:22:13 -05:00
Brian Talbot
d6354fd8b1 drupal integration - revised general header HTML and Sass to coincide with marketing site nav and theme 2013-01-23 18:22:12 -05:00
Victor Shnayder
bcf835532b Pass course_id instead of course to get_site_status_msg 
* makes testing easier -- don't need course objects
 2012-10-08 14:06:58 -04:00
Victor Shnayder
9e43664498 Add support for per-course site status. 
Now looks for a status_message.json file, looks for 'global' and ${course.id} keys. Return any global message and any course-specific message, joined by <br>.

fab files need to be updated to use this new format (new filename, possibly also help manage per-course messages, or at least test for valid json)
 2012-10-07 23:09:26 -04:00
Tom Giannattasio
1804d5410c fixed ie banner showing outside of courseware bug 2012-10-04 15:50:02 -04:00
Tom Giannattasio
49bd3ac905 added ie warning banner to courseware; displayed by ie conditional stylesheet 2012-10-04 15:34:50 -04:00
David Ormsbee
13bfbc820d Prevent caching of block showing top status bar (used for system alert notifications). 2012-10-02 16:38:28 -04:00
Tom Giannattasio
18a66a0b9c styled site status banner 2012-10-02 13:36:36 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner. 
- still needs style
- will cache for 10 seconds
 2012-10-02 11:48:16 -04:00
Calen Pennington
5ca636e606 Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH 2012-08-22 14:43:49 -04:00
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00
Tom Giannattasio
441d1955f9 fixed anonymous header bug 2012-08-22 07:34:55 -04:00
Bridger Maxwell
3dce1c2884 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-14 11:40:00 -04:00
Bridger Maxwell
66d1259d4b Created copy of main.html that is django template. Using this for wiki instead of converting every view. 2012-08-13 19:07:41 -04:00
ichuang
b159eb4825 add feature flag to disable login button (for systems which autologin) 2012-08-10 15:57:41 -04:00
Tom Giannattasio
022c65a6b4 fixed class name header bug 2012-08-10 11:40:16 -04:00