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
d724223a4c
Merge pull request #2053 from edx/fix/gprice/modulestore-500-errors
...
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-22 10:58:06 -07:00
VikParuchuri
f8e68216a7
Merge pull request #2096 from edx/fix/vik/oe-cache
...
Fix/vik/oe cache
2013-05-22 09:59:33 -07:00
Vik Paruchuri
e9f05640f8
Update comments
2013-05-22 12:16:23 -04:00
e0d
e4c3f92372
Merge pull request #2100 from edx/hotfix/e0d/code-jail
...
Sandbox-installed packages will be really installed instead of -e instal...
2013-05-22 09:05:03 -07:00
Vik Paruchuri
96f145b8f6
Update error message
2013-05-22 12:00:36 -04:00
Vik Paruchuri
3bd04290f5
Add tests, address review comments
2013-05-22 11:58:03 -04:00
Victor Shnayder
361faacc57
Merge pull request #2099 from edx/bugfix/abarrett/advanced_modules_list
...
Fix advanced components list in Studio.
2013-05-22 08:29:07 -07:00
Vik Paruchuri
a44eacd474
Make fields stringy, remove false dict
2013-05-22 10:54:52 -04:00
Vik Paruchuri
21f7e222f7
Fix exception clause
2013-05-22 10:51:11 -04:00
e0d
bf20760922
changes to refactor local requirements.
2013-05-22 10:19:30 -04:00
Christina Roberts
945fbe010f
Merge pull request #2093 from edx/feature/christina/acceptance-config
...
Use draft module store so we can test editing components (problems, html...
2013-05-21 17:19:51 -07:00
Ned Batchelder
ce005072b0
Sandbox-installed packages will be really installed instead of -e installed.
2013-05-21 19:21:39 -04:00
Arthur Barrett
cf502e2349
Fix advanced modules list.
2013-05-21 17:49:20 -04:00
Greg Price
caef8d272d
Merge pull request #2097 from edx/gprice/add-rb-config
...
Add Review Board config to repo
2013-05-21 12:39:54 -07:00
Greg Price
5bcae4e79f
Add Review Board config to repo
2013-05-21 14:52:28 -04:00
Christina Roberts
747dec07ae
Merge pull request #2091 from edx/feature/christina/xblock_version
...
Upgrade version of xblock.
2013-05-21 11:47:29 -07:00
Vik Paruchuri
c5f9d94cc4
Add in comments, fix behavior
2013-05-21 14:46:22 -04:00
Ned Batchelder
8b64d581f7
Merge pull request #2095 from edx/ned/fix-lazymod-test
...
Use a different arbitrary dotted module, which Christina doesn't already...
2013-05-21 11:39:02 -07:00
Ned Batchelder
9bf6281339
Merge pull request #2079 from edx/ned/fingerprint-site-packages
...
Fingerprint the filenames in site-packages to decide when to install req...
2013-05-21 11:37:57 -07:00
Ned Batchelder
e59d345917
Use a different arbitrary dotted module, which Christina doesn't already have imported
2013-05-21 14:27:50 -04:00
Vik Paruchuri
c91fa2f45a
Add in some comments
2013-05-21 14:23:24 -04:00
Vik Paruchuri
956669de21
If location cannot be found, move on
2013-05-21 14:21:46 -04:00
Vik Paruchuri
0887383ca7
Don't show peer grading button unless there is a peer grading element in the course
2013-05-21 14:18:00 -04:00
Calen Pennington
158948336f
Merge pull request #2046 from edx/fix/cale/pylint-cleanup
...
Fix/cale/pylint cleanup
2013-05-21 10:27:13 -07:00
Nate Hardison
ea1bc6b875
Merge pull request #2080 from edx/feature/nate/handle-heroku-maintenance-mode
...
Handle Heroku's 503 maintenance mode response
2013-05-21 10:07:09 -07:00
Calen Pennington
cfe220a746
Add exceptions for unused imports in settings files
2013-05-21 13:07:04 -04:00
Nate Hardison
cc7b2942ee
Handle Heroku's 503 maintenance mode response
...
The LMS comment client previously would try to parse the response
as JSON, choke, and return a 500 to the client. Now, the LMS client
displays a message indicating that the forums are down for
maintenance.
2013-05-21 10:03:51 -07:00
cahrens
3b15207bc6
Use draft module store so we can test editing components (problems, html, etc.).
2013-05-21 09:58:34 -04:00
cahrens
0b92e0b91b
Upgrade version of xblock.
2013-05-21 09:49:28 -04:00
Calen Pennington
d5d99ef60f
Switch to official pylint 0.28 release
2013-05-21 09:34:13 -04:00
Calen Pennington
241ef68f4f
Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location
2013-05-21 09:34:12 -04:00
Brian Talbot
073c6d9a79
Merge pull request #2088 from edx/bug/btalbot/studio-lineheight
...
Studio - adding back in older Sass lh() function/mixin
2013-05-20 13:49:18 -07:00
Brian Talbot
8bbbe992fe
studio - references new line-height() Sass mixin when declaring typography archetypes
2013-05-20 15:20:17 -04:00
Brian Talbot
31b5c4ab61
studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet
2013-05-20 15:20:17 -04:00
e0d
c94f8d6f56
Merge pull request #2089 from edx/bugfix/e0d/resize-notes-uri
...
actually needs to be 255 given unicode requirements
2013-05-20 11:49:59 -07:00
e0d
a7b02e0029
actually needs to be 255 given unicode requirements
2013-05-20 14:40:05 -04:00
Ned Batchelder
c947133e54
A better way to compute the hash, that gets the right hash after an install actually installs something.
2013-05-20 14:39:25 -04:00
e0d
f63a4432d0
Merge pull request #2086 from edx/bugfix/e0d/resize-notes-uri
...
Bugfix/e0d/resize notes uri
2013-05-20 10:24:27 -07:00
Ned Batchelder
23384ca2eb
Use backticks so that the command won't echo to the user.
2013-05-20 12:09:28 -04:00
Ned Batchelder
fa87a64984
Missing trailing paren
2013-05-20 12:06:36 -04:00
e0d
0e37564490
pep8 fixes
2013-05-20 12:01:25 -04:00
e0d
a54ecb98c6
resizing uri column
2013-05-20 11:59:56 -04:00
Ned Batchelder
5b5fbc6b14
Fingerprint the filenames in site-packages to decide when to install requirements.
2013-05-20 11:46:56 -04:00
Brian Talbot
3671c7a7fd
Merge pull request #2075 from edx/fix/btalbot/studio-navLineHeight
...
Studio - Revised Course Nav Line Heights
2013-05-20 07:29:19 -07:00
Brian Talbot
bf8df49728
studio - revising line height between course nav titles and prefixes
2013-05-20 08:40:28 -04:00
Brian Talbot
0947329fc4
Merge pull request #2076 from edx/fix/btalbot/studio-fontrefs
...
Studio - Font Import Method Revert/Fix
2013-05-20 05:39:50 -07:00
Brian Talbot
098a5dda48
studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing
2013-05-20 08:39:18 -04:00
Ned Batchelder
9834f27eb9
Fingerprint the filenames in site-packages to decide when to install requirements.
2013-05-17 18:15:40 -04:00
e0d
f8e9c4d4d1
Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name
...
Set the default celery queue name in addition to the default routing key
2013-05-17 15:02:31 -07:00
