Commit Graph

900 Commits

Author SHA1 Message Date
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
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Greg Price
db3189d5ad Disable marketing registration button for courses that user cannot enroll in 2013-05-17 14:10:04 -04:00
Greg Price
b8d2276de7 Remove dashboard links for unstarted courses
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
2013-05-16 15:06:48 -04:00
Greg Price
ff2ba68d79 Tweak behavior of registration button for marketing site
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
2013-05-16 15:06:48 -04:00
marco
33e8621af6 cursor state for discussions (not inline) span text needed to be set to pointer 2013-05-16 10:29:34 -04:00
marco
495cd305d4 adjusted cursor for span label on pins to be default 2013-05-16 10:29:34 -04:00
Your Name
e2d3aee768 styling inline flaggin 2013-05-16 10:29:34 -04:00
marco
65dbd3cf73 padding around icons for flags and pins 2013-05-16 10:29:34 -04:00
marco
0a43c0ff59 minor css tweaks to flag and pin icons 2013-05-16 10:29:34 -04:00
Your Name
78097c7ee1 update css for better cursor on pinning and flagging 2013-05-16 10:29:33 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict""
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
2013-05-16 10:29:33 -04:00
Brian Talbot
e4b5d21ba6 edx.org - adds in text-decoration nullification and revised padding for course registration buttons 2013-05-10 17:24:48 -04:00
Brian Talbot
17affb0ac7 edx.org - reduces padding on course listing register buttons (all states) and resets box-sizing to border box to make a proper box model for element 2013-05-10 17:00:25 -04:00
Greg Price
c00b903757 Make course number in registration button not transformed to lowercase 2013-05-10 10:58:12 -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
Giulio Gratta
87362aa887 Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility 2013-05-07 11:21:44 -07:00
Giulio Gratta
2dde742f38 made login form labels and close modal button accessible friendly 2013-05-07 10:25:08 -07:00
Brian Talbot
126c9f9f37 edx.org - further revision to iframe register button states: coming soon styling 2013-05-07 11:00:21 -04:00
Brian Talbot
3b84d77131 edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment 2013-05-07 10:25:41 -04:00
Greg Price
203a958e68 Outline textareas in red on a form submission error
This was previously done for input but not textarea.
2013-05-06 13:35:52 -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
jarv
f18321cda2 Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration
Update course registration flow for non-modal registration and login
2013-05-06 10:31:29 -07:00
jarv
bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe
Jarv/drupal new/iframe
2013-05-06 07:46:28 -07:00
Brian Talbot
7dd763212e edx.org - fixes to the iframe-based register button's styling 2013-05-03 11:55:14 -04:00
Greg Price
e5846e64bd Modify course registration flow for new login and registration pages
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
2013-05-03 10:01:11 -04:00
Diana Huang
45baf013fe Merge branch 'master' into drupal-new 2013-05-02 17:04:39 -04:00
Brian Talbot
7705941a65 edx.org - added in isolated register button styling/states for <iframe>-based registration fix 2013-05-02 11:54:16 -04:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
Fix/btalbot/studio courseinfo
2013-04-30 13:34:52 -07:00
Brian Talbot
c28647be2d lms - cleared document flow for .teacher elements within a course's about view to coincide with Studio's default HTML for the course overview settings field 2013-04-29 14:47:57 -04:00
Calen Pennington
8dc0df3e6b Don't ignore the old directories for xmodule sass and coffeescript 2013-04-29 07:32:16 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
2013-04-26 12:40:35 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server
Speed up local development
2013-04-24 12:12:05 -07:00
Your Name
acfd0d9fd6 fix merge conflict 2013-04-23 10:30:51 -04:00
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Brian Talbot
22a56fddb4 edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed 2013-04-10 13:38:25 -04:00
Brian Talbot
78079d1ca7 Merge branch 'master' into drupal-new 2013-04-08 22:35:29 -04:00
Brian Talbot
d8368447fd edx.org - adjusted input height and padding to handle previously uneditable fieldsin firefox 2013-04-08 22:35:06 -04:00
Brian Talbot
13b741750a edx.org - basic styling of password reset form 2013-04-08 22:16:32 -04:00
Kevin Chugh
2b2621e20c Merge branch 'master' into feature/kevin/pinning_inline 2013-04-08 17:19:19 -04:00
Brian Talbot
f501000825 edx.org - hiding the login nav element when on the login view 2013-04-03 09:46:36 -04:00
Kevin Chugh
5534d8bdce fix mega merge conflicts 2013-03-29 07:33:52 -04:00
Brian Talbot
f5aaf309e8 edx.org - added in visual spacing for confirmed state of password recovery modal 2013-03-25 15:16:50 -04:00
Brian Talbot
e716530692 edx.org - added necessary JS and Sass to disabled login/register button when form is submitting 2013-03-25 14:52:13 -04:00
Brian Talbot
dc1a7f5d6a edx.org - changed status message UI to be hidden by default (rather than with JS) for the time being for page load/render's sake 2013-03-25 13:59:30 -04:00
marco
f8eacff683 styled textbook css to look closer to the discussion forum navigation 2013-03-22 11:04:44 -04:00
marco
7ecf0e5bc1 small positioning adjustments to inline pins; 2013-03-21 14:27:10 -04:00
marco
f45cc6fb35 changes to textbook styling 2013-03-20 21:30:05 -04:00
Your Name
32f75bfe9e added pinning UI to inline 2013-03-20 11:58:47 -04:00
John Jarvis
78987cc400 resolving merge conflicts 2013-03-19 16:16:32 -04:00