Commit Graph

4847 Commits

Author SHA1 Message Date
Jason Bau
ce2cbb74a1 Merge pull request #2104 from edx/edx-West/enable-django-admin-site
add MITX Feature setting to enable django admin site
2013-05-22 12:43:45 -07:00
Ned Batchelder
d7105ddf24 Merge branch 'master' of github.com:edx/edx-platform 2013-05-22 15:32:57 -04: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
Jason Bau
5fc8469a81 add example in lms/envs/common.py 2013-05-22 11:49:58 -07:00
Greg Price
787366fe02 Remove tags for comment client request time histogram in Datadog
According to someone from Datadog, this was generating tags like "knowledgeable_
people_who_put_this_course_together._this_is_harvard._you_can_t_tell_us_there_s_
a_shortage_of_editorial_talent." They say that they can handle tens or hundreds
of unique tags but not thousands. Given that we have a unique URL for each
thread, we can't even use that as a tag. Thus, all tags are removed for now
until we can determine whether there is a useful set of tags with small enough
cardinality. In light of this, I did not investigate why the long tag mentioned
above was being generated.
2013-05-22 14:12:25 -04: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
Jason Bau
70c4af40f0 add MITX Feature setting to enable django admin site 2013-05-22 10:55:21 -07:00
Vik Paruchuri
e9f05640f8 Update comments 2013-05-22 12:16:23 -04: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
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
Vik Paruchuri
c5f9d94cc4 Add in comments, fix behavior 2013-05-21 14:46:22 -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
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
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
e0d
a7b02e0029 actually needs to be 255 given unicode requirements 2013-05-20 14:40:05 -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
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
Carlos Andrés Rocha
34d39dde9a Set the default celery queue name in addition to the default routing key 2013-05-17 17:59:51 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new'
Conflicts:
	lms/envs/common.py
2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Greg Price
5268d982ce Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration
Disable marketing registration button for courses that user cannot enrol...
2013-05-17 12:40:54 -07:00
Carlos Andrés Rocha
0042988ea7 Merge pull request #2063 from edx/feature/rocha/lets-use-celery
Add Celery configuration to LMS and CMS
2013-05-17 12:36:23 -07: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
e4509ae3ad Make "access courseware" buttons for marketing site break out of iframes 2013-05-17 13:31:22 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07:00
Diana Huang
ba983d5f49 Merge pull request #2062 from edx/diana/drupal/lettuce-tests
Fix Lettuce Tests for Drupal site
2013-05-17 08:56:11 -07:00
Carlos Andrés Rocha
35bd38d677 Add status app with simple view to check celery workers 2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
c05efbc31e Added base Celery settings 2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
95496b5c50 Cleanup dev settings a little bit 2013-05-17 11:33:14 -04:00
Diana Huang
dadcdd0599 Fix lettuce signup feature to match Drupal site. 2013-05-17 10:51:38 -04:00
Diana Huang
acfcd0f8a4 Fix the login lettuce feature for the new Drupal site. 2013-05-17 10:51:38 -04:00
Ned Batchelder
f856b69ab5 Merge branch 'feature/ned/sandboxed-python' 2013-05-17 10:28:06 -04:00
Your Name
867d69ed12 update views.py to add docstrings and change exception name to address pylint errors 2013-05-16 18:13:59 -04:00
Greg Price
362736c4d1 Merge pull request #2060 from edx/fix/gprice/marketing-links
Fix marketing links in password reset pages
2013-05-16 14:24:13 -07:00
Greg Price
4e95aa053f Fix marketing links in password reset pages 2013-05-16 16:57:56 -04:00
Greg Price
37ec01dd8d Handle ItemNotFoundError from the modulestore to avoid 500 errors 2013-05-16 16:50:03 -04:00
Diana Huang
b6c0081064 Look for the existence of the links, not for
the actual urls
2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97 Fix bug in lettuce tests where the unregister dialog wasn't
getting closed fast enough.
2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00
Jay Zoldak
71626f4ff6 Pep8 fixes of django_comment_client code 2013-05-16 15:57:34 -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
Arthur Barrett
adcd1dd886 update annotator.min.css with change to fix adder button and serve the minified one. 2013-05-16 14:48:06 -04:00