Commit Graph

4962 Commits

Author SHA1 Message Date
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
3934770d05 Add the PLATFORM_NAME setting for display config
This setting is used to control the display name of the platform. The
default is "edX", but themes may wish to override. For example,
Stanford will use "Stanford Online" for the time being.
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
chrisndodge
468dfe3437 Merge pull request #71 from edx/feature/cdodge/allow-setting-of-session-cookie-name
Feature/cdodge/allow setting of session cookie name
2013-06-05 08:36:17 -07:00
Chris Dodge
6fb97d52c0 fix typos 2013-06-05 11:21:35 -04:00
Diana Huang
ff7b851f95 Merge pull request #4 from edx/diana/fix-error-descriptor
Ensure that the original error gets preserved by the ErrorModule
2013-06-05 07:39:40 -07:00
Chris Dodge
3c9bd1ddf8 allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) 2013-06-05 10:26:30 -04: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
Brian Talbot
f34b131678 lms - revises the physical height of the edX logo within the slim-sized header and vertically aligns all elements 2013-06-04 14:46:01 -04: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
e4cc0dfdba edx.org - revises login and register graphical banner images to include higher contrast between type and imagery 2013-06-04 10:45:42 -04:00
Brian Talbot
aa8f73ffb4 edx.org - revises base blue and color references to adhere to WCAG color contrast guidelines 2013-06-04 09:37:21 -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
Diana Huang
f3b36b8bc9 Use from_descriptor instead of from_xml to make ErrorDescriptor 2013-06-03 17:21:41 -04:00
Ned Batchelder
c865641f13 Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox
Ned/move loncapa etc into sandbox
2013-06-03 11:27:16 -07:00
Jonah Stanley
cdadcba9da Merge pull request #10 from edx/jonahstanley/add-more-tests
Jonahstanley/add more tests
2013-06-03 10:25:53 -07:00
Nate Hardison
1001b315a3 Preprocess assets as Django management command
Rather than directly invoke command-line Python (and Mako) from the
assets Rakefile, or call an external Python script, use a Django
management command to preprocess all asset template files.

An "asset template file" is defined as a static asset file with a
file extension indicating that it needs to be run through a template
engine prior to Sass/CoffeeScript compilation or packaging with other
assets. The preprocess_assets management command will look through
all of the files listed in the `STATICFILES_DIRS`, preprocessing each
as needed. Preprocessing strips off the special template file
extension, creating a new file in the process.

Currently, the only variable accessible in an asset template file is
the `THEME_NAME`, defined in the settings.
2013-06-03 09:58:01 -07:00
JonahStanley
6af54ead39 Fixed scenario wording 2013-06-03 12:43:54 -04:00
JonahStanley
0d11eb16ba Fixed typo
I accidently had show_answer instead of showanswer.  This error was hidden by a previous default of showanswer=always.
2013-06-03 11:52:40 -04:00
JonahStanley
a17c487f16 Merged from Master 2013-06-03 09:46:19 -04:00
JonahStanley
8cc93cb5d8 Merge branch 'master' into jonahstanley/add-more-tests 2013-06-03 09:37:25 -04:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Victor Shnayder
1d8e46f01c Merge pull request #13 from edx/victor/help-button-text
Change help button text, fixing LMS-319
2013-06-02 20:47:45 -07:00
Ned Batchelder
4c6e482d39 Merge pull request #24 from edx/ned/remove-test-ike
Remove test_ike.py, Ike says we don't need it, and it looks like a test.
2013-06-02 18:45:05 -07:00
Christina Roberts
52b76c87f4 Merge pull request #11 from edx/feature/christina/metadata-ui
Feature/christina/metadata ui
2013-06-01 16:01:53 -07:00
Peter Fogg
5434f2750e Cleaning up code to fix pylint/pep8 errors. 2013-05-31 15:58:12 -04:00
Ned Batchelder
ae2a507ec8 Remove test_ike.py, Ike says we don't need it, and it looks like a test. 2013-05-31 15:40:51 -04:00
JonahStanley
cb9da2cd03 Potentially fixed all flakey tests
New function was added: is_css_not_present
This function works like is_css_present in that it will wait and can take in an optional argument to wait longer.  This should be used everywhere INSTEAD of not is_css_present as in the latter case, you are telling selenium to wait for the thing you don't want to be there to either be there or time out.
2013-05-31 15:16:45 -04:00
Victor Shnayder
e01991eca5 Tweak copy 2013-05-31 14:56:37 -04:00
JonahStanley
3308bb4be7 Fixed pull request comments and refactored the duplicate code 2013-05-31 14:53:29 -04:00
Ned Batchelder
98673f8e6a Somehow, when I moved symmath, I left behind its test files!? 2013-05-31 14:39:23 -04:00
Frances Botsford
92e159ea37 text and style adjustments to help button modal 2013-05-31 14:31:16 -04:00
Vik Paruchuri
badd3a8d13 Properly stub out the controller_qs variable in the tested module. Test times out without this. 2013-05-31 13:14:19 -04:00
Peter Fogg
2277c82efd Fix pep8 whitespace violation. 2013-05-31 12:54:09 -04:00
marco
290d049c29 Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui 2013-05-31 12:41:13 -04:00
marco
72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed 2013-05-31 12:40:40 -04:00
Peter Fogg
a503a753cd Remove unnecessary pylint warning disable. 2013-05-31 12:16:25 -04:00
Peter Fogg
453bf42133 Revert changes to how video_alpha is stubbed out for testing. 2013-05-31 12:12:14 -04:00
Ned Batchelder
9314154ec1 Move loncapa grading helpers into the sandbox-packages directory. 2013-05-31 12:01:33 -04:00
Peter Fogg
782cb05410 Add passing Lettuce testing for video autoplay in LMS. 2013-05-31 11:22:45 -04:00
e0d
2e84540af0 removing the request debugger entirely. 2013-05-31 11:15:28 -04:00
Victor Shnayder
75f127d76b Change help button text, fixing LMS-319 2013-05-31 10:59:00 -04:00
JonahStanley
a49acc73ee Removed the save_html line 2013-05-31 09:16:14 -04:00
marcotuts
46967a78dc Merge pull request #6 from edx/release
Release 2013-05-29, with Hotfix 2013-05-30 back into master
2013-05-30 16:34:22 -07:00