Commit Graph

2941 Commits

Author SHA1 Message Date
Peter Fogg
4415fb4c42 Started removing XML from video editor.
TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.

TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
2013-06-06 10:29:24 -04:00
dcadams
bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 15:14:48 -07:00
Victor Shnayder
97c788a33a Merge pull request #78 from edx/victor/fix-help-button
Re-insert "if in course" check for displaying paragraph about forums.
2013-06-05 13:04:55 -07:00
Victor Shnayder
1b81d06337 Re-insert "if in course" check for displaying paragraph about forums.
Accidentally got removed in pull request 13.
2013-06-05 16:04:21 -04:00
Nate Hardison
4ea6692e11 Change if ... is not None to if ...
Minor stylistic tweak.
2013-06-05 10:56:24 -07:00
Nate Hardison
2640ab49e0 Stanfordize LMS emails
Adjust language of LMS emails to work specifically for Stanford. Here
there be dragons: lots of ugly conditionals that will need to be
changed once we develop a way to "theme" arbitrary strings throughout
the site.
2013-06-05 10:27:25 -07:00
Nate Hardison
adf9dd3d35 Make email change templates use main layout
Update the email change templates to fit with the rest of the main
site and use the standard notification template. Now they're far
prettier than before.
2013-06-05 10:27:25 -07:00
Nate Hardison
2c90948623 Use settings in LMS emails, not hardcoded values
Instead of hardcoding things like the platform name, use the
corresponding overrideable settings instead. This allows themes to
control emails as well.
2013-06-05 10:27:25 -07:00
Nate Hardison
940888da37 Use bugs email from settings, not hardcoded value 2013-06-05 10:27:25 -07:00
Nate Hardison
2ab00eefa7 Use the contact email setting instead of if/else
Remove the Stanford-specific if/else hack to set the appropriate
contact email address and use the `CONTACT_EMAIL` setting instead.
2013-06-05 10:27:24 -07:00
Nate Hardison
799d56d028 Theme static error pages
Reference the `PLATFORM_NAME` and `TECH_SUPPORT_EMAIL` settings in
the static error pages instead of hardcoded, edX-specific values.
2013-06-05 10:27:24 -07:00
Nate Hardison
d79f064248 Fix forgot password modal for theming
Use the `PLATFORM_NAME` setting instead of "edX"
2013-06-05 10:27:23 -07:00
Nate Hardison
f25fdebe67 Theme the authenticated index view
Much like the work done on the default (unauthenticated) index view,
adjust the background image (actually, let the CSS handle it instead
of an embedded `style` attribute in the HTML). Other adjustments
(language, logo) are made for Stanford specifically and need to be
reworked for general theming.
2013-06-05 10:27:23 -07:00
Nate Hardison
dc8bd32fb2 Theme the individual course about pages
Use the theme's own Google Analytics template (should probably
update to just use parameters once the default GA template is kept
up-to-date). Don't link to the university profile page when a theme
is enabled, as that's an edX-specific feature. Adjust social links
for Stanford, but leave them alone for everyone else (this is just
a hack for the 6/11/13 launch).
2013-06-05 10:27:23 -07:00
Nate Hardison
227271fec6 Theme the courseware dashboard
Again, most of the work here is replacing "edX" with the
`PLATFORM_NAME` setting. Need to ensure that the `news` boolean is
indeed a falsy value as well, or just add a `theme_enabled()` test
to disable the news block entirely (since news is an edX-specific
feature).
2013-06-05 10:27:23 -07:00
Nate Hardison
90ebb4c836 Theme the login page
As with the registration page, the bulk of the theming work here is
replacing instances of "edX" with the `PLATFORM_NAME` setting. There
is also a change to the "help" section, disabling it if the FAQ
marketing link isn't set.
2013-06-05 10:27:22 -07:00
Nate Hardison
8c19b0c98b Theme the base registration page
This mostly involves rewriting all mentions of "edX" to reference the
`PLATFORM_NAME` setting instead. However, there are also some
Stanford-specific rewrite hacks that need to be pulled out
eventually. Additionally, don't display links to marketing pages (or
the sections referencing those marketing pages) if the links are not
defined by the theme.
2013-06-05 10:27:22 -07:00
Nate Hardison
3fbab4d2fa Add theming hooks to (old) landing page
Adjust the now-defunct landing page so that it doesn't render much
of the edX-specific marketing info (social links, press releases,
university partners, etc.) if a theme is enabled.

Additionally, if the Stanford theme is enabled, add in some school-
specific language and adjust the video modal to play a Stanford one.
2013-06-05 10:27:22 -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
Nate Hardison
a3ca0843ae Use a setting for the favicon path
The `FAVICON_PATH` setting determines the location of the favicon for
the site. It's automatically adjusted when a theme is enabled,
establishing the convention that themes will place their favicon in
`static/images/favicon.ico`.
2013-06-05 10:17:15 -07:00
Nate Hardison
f2c40a71fe Enable theming in base LMS template
Provide the appropriate switches to adjust based on whether or not a
theme (in particular, the Stanford theme) is enabled in the settings.
For now, these changes are very specific to Stanford. This is because
the template architecture needs some reworking to generalize nicely.
2013-06-05 10:17:15 -07:00
dcadams
0fb1136559 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 09:25:49 -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
dcadams
56f81fb104 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-04 10:29:04 -07:00
Brian Talbot
eca9eedecf edx.org - adds in I18n syntax for login and register view page titles 2013-06-04 10:59:32 -04:00
Brian Talbot
8da62871a9 edx.org - revises registration h1 text to match the graphical banner texdt 2013-06-04 09:37:21 -04:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Victor Shnayder
e01991eca5 Tweak copy 2013-05-31 14:56:37 -04:00
Frances Botsford
92e159ea37 text and style adjustments to help button modal 2013-05-31 14:31:16 -04:00
Peter Fogg
453bf42133 Revert changes to how video_alpha is stubbed out for testing. 2013-05-31 12:12:14 -04:00
Peter Fogg
782cb05410 Add passing Lettuce testing for video autoplay in LMS. 2013-05-31 11:22:45 -04:00
Victor Shnayder
75f127d76b Change help button text, fixing LMS-319 2013-05-31 10:59:00 -04:00
Peter Fogg
6eeb12ad1c Add Lettuce tests for autoplay in Studio. 2013-05-30 11:34:15 -04:00
Peter Fogg
5465bda5f3 Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div. 2013-05-29 17:00:25 -04:00
Peter Fogg
e0d5118ca0 Add hidden HTML so that the video player knows whether or not we're in the LMS. 2013-05-29 15:45:36 -04:00
Chris Dodge
eb4dd76328 update POST-back URL to the new one - post Drupal 2013-05-29 12:02:41 -04:00
Greg Price
e755bdfdfd Tweak text on 500 error page 2013-05-28 10:59:19 -04:00
Calen Pennington
f521b8e8c0 Handle errors while sending emails around changing user data
The most common error is Amazon SES having blacklisted an email address.
However, we handle any error being raised during user.email_user.

Fixes JIRA LMS-131
2013-05-23 10:27:34 -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
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
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
Ned Batchelder
f856b69ab5 Merge branch 'feature/ned/sandboxed-python' 2013-05-17 10:28:06 -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
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
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00