Commit Graph

13 Commits

Author SHA1 Message Date
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04: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
Brian Talbot
638fb79a16 Verification: adding in more Sass variable/mixin/extend scaffolding 2013-08-29 13:44:48 -04:00
Frances Botsford
abd678e464 initial step interaction for verification 2013-08-21 15:27:37 -04:00
Kevin Chugh
5d106ee048 Merge branch 'master' into feature/kevin/email_notifications_panel 2013-07-25 00:31:42 -04:00
Greg Price
47b51e9329 Add endpoints to set user notification preference
Two endpoints are intended to be used by AJAX calls from the web UI with an
authenticated user. When enabled, the value of the preference is an encryption
of the username, to be used as a token for one-click unsubscribe links. The
third endpoint is the target of unsubscribe links, which displays a page with
an appropriate message to the user.
2013-07-22 11:50:26 -04:00
marco
f94ec6cf2a merge conflicts resolved 2013-06-26 10:47:32 -04:00
marco
23f19423be cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references 2013-06-25 13:28:54 -04:00
Nate Hardison
c7f56cf456 Move theme import right after variables import
Since the theme Sass is just a simple variables overrides (for the
moment), it must be imported right after the default variables Sass
file (if at all). At the bottom of the file, it has no effect.
2013-06-05 10:27:25 -07:00
marco
f213113361 cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references 2013-06-04 15:15:12 -04:00
Nate Hardison
f826198214 Use "is not None" convention 2013-05-22 19:34:14 -07:00
Nate Hardison
a0b6a176f2 Use .get instead of [] to access env hash
If the `THEME_NAME` environment token isn't defined, then the
application.scss.mako file will crash during preprocessing. Use
.get to avoid a crash.
2013-05-22 14:49:22 -07:00
Nate Hardison
ea3506d2b9 Add general theming capabilities
This commit adds the requisite settings and startup features to
enable integration of themes into the edX platform. It does not
yet provide hooks in any of the templates, but it does cause the
main `lms/static/sass/application.scss` file to `@import` a theme's
base Sass. Template hooks will come down the road.

CHANGELOG
---------
Define a new `MITX_FEATURE`, `USE_CUSTOM_THEME`, that when enabled,
can be used in templates to determine whether or not custom theme
templates should be used instead of the defaults.

Also define a new setting, `THEME_NAME`, which will be used to
locate theme-specific files. Establish the convention that themes
will be stored outside of the `REPO_ROOT`, inside the `ENV_ROOT`,
in a directory named `themes/`. `themes/<THEME_NAME>` will store
the files for a particular theme.

Provide a function, `enable_theme`, that modifies the template and
static asset load paths appropriately to include the theme's files.

Move the main LMS Sass file to a Mako template that conditionally
`@import`s the theme's base Sass file when a theme is enabled.

Add logic to the assets Rakefile to properly preprocess any Sass/
Mako templates before compiling them.
2013-05-22 12:22:27 -07:00