Commit Graph

121 Commits

Author SHA1 Message Date
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit b8184d188f.
2015-01-28 17:26:46 -05:00
Mark Sadecki
8cffa152d8 changes the skip link text to the industry standard Skip to main content 2015-01-28 11:07:10 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS
[second attempt which addresses bug building Studio]
2015-01-27 17:56:29 -05:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit 1d6fceda50.
2015-01-21 17:13:27 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
2015-01-20 14:27:23 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content.
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
2015-01-14 23:34:11 +02:00
Sarina Canelake
314c935369 Remove edX branding from default Open edX LMS
OPEN-307
2015-01-09 10:48:20 -05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00
John Jarvis
a9d731165c optionally using environment variable for edx-platform hash 2014-12-16 15:13:08 -05:00
jmclaus
082cb3b9ed Load OVA JS with requireJS in LMS. 2014-12-09 09:49:45 -05:00
Will Daly
23a51a6515 Add email opt in to old login and register pages 2014-12-08 09:29:16 -05:00
Will Daly
0a35af5530 Remove extra viewport meta tag 2014-11-12 11:01:32 -05:00
Will Daly
0c59f10b52 Include zoom only if the page is marked as responsive 2014-11-10 14:02:01 -05:00
Renzo Lucioni
5edb7b9c87 Track logistration form toggles and password reset form views 2014-11-06 10:00:42 -05:00
AlasdairSwan
d889a362ae ECOM-369 added meta to header to enable responsive. Set country dropdown to required for registration form 2014-10-23 15:22:27 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
stephensanchez
c15d97ea9b Removing the feature flags for new header and footer.
Fix acceptance tests

Updating lettuce tests.

Revert the deletion of the original edx header and footer.

Renaming old header and footers to legacy files.

Add IS_EDX_DOMAIN flag for header.

Updating tests and django main template.

renaming the header files for microsite backwards compat.
2014-10-14 17:47:46 +00:00
Calen Pennington
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates
[LMS-11372]
[LMS-11370]
2014-10-01 10:26:52 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile.
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
2014-09-25 08:36:22 -04:00
Brian Talbot
a04c4bf12f LMS: renaming edx-specific footer template files/references 2014-09-11 07:37:26 -04:00
Stephen Sanchez
75d6f99fed The main django template needs header and footer feature flags. 2014-09-02 12:08:22 +00:00
Jesse Zoldak
96153ceed0 Revert "The main django template needs header and footer feature flags." 2014-08-29 16:43:30 -04:00
Stephen Sanchez
20a66ee2ef The main django template needs header and footer feature flags. 2014-08-29 15:38:28 +00:00
Chris Dodge
04d3a5723b be sure to just use the Open edX footer.html when we're running a white label on edx.org 2014-08-26 17:11:58 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx.
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
2014-08-25 15:33:43 +00:00
Stephen Sanchez
b3f4ce2312 Merge pull request #4879 from edx/sanchez/update-platform-header
Updating the platform header styles to match new site styles.
2014-08-25 09:57:14 -04:00
Stephen Sanchez
033551416b Updating the platform header styles to match new site styles.
Putting the new edx header behind a feature flag.
2014-08-22 18:25:45 +00:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support
Microsites alongside Theme
2014-08-19 12:39:21 -04:00
Renzo Lucioni
2380235fd7 Add Optimizely widget 2014-08-08 14:58:18 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul""
This reverts commit 079808ee47.
2014-07-30 17:01:52 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
2014-07-29 17:41:46 +00:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Giulio Gratta
77c3d15d20 always include GA file 2014-07-17 10:25:06 -07:00
James Tauber
3cb8780284 Separate edX / Open edX footer.
We need to use an Open edX footer by default (and that's what all non-edx.org
instances should base their footer off) and only use the edX footer on
edx.org.

This commit uses `SITE_NAME` to determine which footer to use.

Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org`
should not be affected.
2014-07-10 14:15:37 -04:00
Felipe Montoya
8fd3ab07ba If microsites are enabled and it is a microsite request, then take the microsite path for theming 2014-06-27 23:01:29 -05:00
Piotr Mitros
17d2420f7b Removed suppress_top_level_nav, as per Cale 2014-06-20 10:23:16 -04:00
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Dave St.Germain
2d72184620 Added an alt tag to the footer logo; added charset meta tag; moved
DOCTYPE to the top of the file.
2014-02-06 11:25:16 -05:00
Dave St.Germain
9945d3e9cf Add a means to skip to more specific parts of the page. Contributes to
LMS-2156
2014-02-05 11:28:11 -05:00
Dave St.Germain
b0af0b18b9 Converted <ol> to <div> to prevent a11y confusion. 2014-02-04 14:00:17 -05:00
Jason Bau
7399d5171f get rid of the <title> conditional altogether 2014-01-30 17:33:42 -08:00
Dave St.Germain
b78e33dbc5 This script and meta tag shouldn't be inside the title. 2014-01-30 20:13:15 -05:00
Jason Bau
d06fbae8e0 fix main.html template -- <title> was eating everything 2014-01-30 15:20:06 -08:00
Dave St.Germain
636eab8b9e Added more descriptive page titles. 2014-01-30 17:32:03 -05:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00