Greg Price
f8539cc2d7
Redirect authenticated users from registration or login to dashboard
2013-05-08 17:10:54 -04:00
Greg Price
c82b28aac3
Merge pull request #1977 from edx/fix/gprice/drupal-registration-links
...
Fix links to honor code, ToS, and privacy policy for marketing site
2013-05-07 14:58:26 -07:00
Greg Price
7143749d7b
Fix links to honor code, ToS, and privacy policy for marketing site
2013-05-07 17:54:32 -04:00
Greg Price
50d8321bc5
Merge pull request #1975 from edx/fix/gprice/drupal-registration-button-text
...
Fix registration button text
2013-05-07 14:21:48 -07:00
Greg Price
ab7795aaf6
Merge pull request #1972 from edx/fix/gprice/drupal-fix-course-link
...
Fix courses link in LMS header when not logged in
2013-05-07 13:59:23 -07:00
Greg Price
23eacdbea2
Fix registration button text
2013-05-07 16:45:33 -04:00
Greg Price
dadb0b6931
Fix courses link in LMS header when not logged in
2013-05-07 16:35:08 -04:00
jarv
621f4c65fe
Merge pull request #1971 from edx/jarv/new-mktg-url
...
be more forgiving about the iframe url
2013-05-07 13:19:10 -07:00
John Jarvis
0b7af27b4b
be more forgiving about the iframe url
...
If anything after mktg/ does not parse as a course-id return "coming soon"
This will prevent 404 errors when urls are incorrect on the marketing
site.
2013-05-07 16:00:00 -04:00
Greg Price
f7f791ab69
Merge pull request #1963 from edx/feature/gprice/drupal-iframe-breakout
...
Make register button for marketing site break out of iframe
2013-05-07 11:21:54 -07:00
Diana Huang
30e1dd6e8e
Merge pull request #1966 from edx/diana/drupal/fix-lms-links
...
Better error handling for when marketing urls are missing
2013-05-07 10:56:06 -07:00
Greg Price
0ff4d1ca9f
Merge pull request #1968 from edx/feature/gprice/drupal-course-redirects
...
Redirect from LMS courses page to marketing courses page
2013-05-07 10:34:35 -07:00
Diana Huang
2947ce246f
Better error handling for when marketing urls are missing from the settings.
2013-05-07 13:17:30 -04:00
Greg Price
93cbb2e422
Redirect from LMS courses page to marketing courses page
...
(Only if marketing site is enabled)
2013-05-07 13:06:38 -04:00
Greg Price
ef27b8f787
Make register button for marketing site break out of iframe
...
Use window.top.location.href instead of location.href for redirection.
2013-05-07 12:41:33 -04:00
Greg Price
6361280075
Merge pull request #1959 from edx/feature/gprice/drupal-register-button-fix
2013-05-07 08:57:12 -07:00
Greg Price
2c67352606
Fix new view containing only register button to properly enroll
2013-05-07 11:34:41 -04:00
Greg Price
3fd8b6ff59
Merge pull request #1960 from edx/feature/gprice/drupal-reset-buttons
2013-05-07 08:17:44 -07:00
Brian Talbot
7aa9a6cfa5
Merge pull request #1962 from edx/fix/btalbot/lms-mktgiframe
...
edx.org - resolved iframe button styles in IE + added in coming soon state
2013-05-07 08:04:45 -07:00
Brian Talbot
9a01bb5e52
edx.org - adding back js-dependent register class to register button
2013-05-07 11:02:02 -04:00
Brian Talbot
126c9f9f37
edx.org - further revision to iframe register button states: coming soon styling
2013-05-07 11:00:21 -04:00
Brian Talbot
3b84d77131
edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment
2013-05-07 10:25:41 -04:00
Diana Huang
a081ba4bbb
Merge pull request #1934 from edx/diana/drupal/fix-lms-links
...
Fix links between marketing site and courseware.
2013-05-06 14:14:29 -07:00
Diana Huang
13d29b8e72
Fix indentation of settings dictionaries.
2013-05-06 16:49:10 -04:00
Diana Huang
6110b54ca8
Address code review feedback
...
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
2013-05-06 14:56:06 -04:00
jarv
f18321cda2
Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration
...
Update course registration flow for non-modal registration and login
2013-05-06 10:31:29 -07:00
Diana Huang
a8ea201b6a
Move the link map to the settings.
2013-05-06 12:55:42 -04:00
John Jarvis
d69bbf272e
using new template for "coming-soon"
2013-05-06 12:30:18 -04:00
John Jarvis
424d295686
syntax errors
2013-05-06 12:00:46 -04:00
John Jarvis
e852574a17
adding 404 handling for courses that do not exist
2013-05-06 11:54:09 -04:00
jarv
bf5ac6c263
Merge pull request #1950 from edx/jarv/drupal-new/iframe
...
Jarv/drupal new/iframe
2013-05-06 07:46:28 -07:00
Diana Huang
5b3f5a47de
Add marketing_link to the Template context dictionary.
...
Pep8 fixes
2013-05-06 10:03:00 -04:00
Diana Huang
c9a6fe18f0
Create new marketing_link function to abstract link generation
...
and use it for the new marketing site links.
2013-05-03 15:06:24 -04:00
Diana Huang
e4e6c0dd7b
Add new URLS to MKTG_URLS.
2013-05-03 15:05:03 -04:00
Diana Huang
3e217c8f85
Use new login page for marketing site when student is trying to
...
access login_required page.
2013-05-03 15:04:41 -04:00
Brian Talbot
192e1d798d
edx.org - trying a fix for IE ignoring styles within registration button iframe
2013-05-03 13:33:47 -04:00
John Jarvis
258537e3d2
adding csrf middleware token to form submission
2013-05-03 13:05:10 -04:00
John Jarvis
58dbcf9d31
break out of iframe
2013-05-03 13:04:36 -04:00
Greg Price
d61945081d
Fix disable/re-enable submit button
2013-05-03 13:01:39 -04:00
Brian Talbot
7dd763212e
edx.org - fixes to the iframe-based register button's styling
2013-05-03 11:55:14 -04:00
Diana Huang
d35283cf65
Reduce the amount of repeated HTML and add checks for the correct settings.
2013-05-03 10:17:40 -04:00
Greg Price
031a74865e
Add login link to registration page if user is trying to enroll in a class
...
If an unauthenticated user clicks on a course registration button, they will
be redirected to the user registration page. Now, that page will include a link
to the login page. If the user follows the link and logs in successfully, then
they will be enrolled in the class.
2013-05-03 10:01:11 -04:00
Greg Price
e5846e64bd
Modify course registration flow for new login and registration pages
...
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
2013-05-03 10:01:11 -04:00
Diana Huang
1d42df8cb1
Add MKTG_URLS to settings for new footer and header links.
2013-05-03 09:31:47 -04:00
Diana Huang
e0ac6834da
Fix links between marketing site and courseware.
...
Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
2013-05-03 09:31:47 -04:00
Diana Huang
582b23d780
Merge pull request #1933 from edx/diana/drupal/fix-cms-tests
...
Drupal: Add cookie name to the cms settings so we don't error out while looking for it
2013-05-03 05:53:44 -07:00
Diana Huang
182d69e36c
Add cookie name to the cms settings so we don't error out
...
while looking for it
2013-05-02 17:21:49 -04:00
Diana Huang
45baf013fe
Merge branch 'master' into drupal-new
2013-05-02 17:04:39 -04:00
Brian Talbot
d7d68a1e8c
edx.org - resolved JQuery submit() method error on <iframe> register button actions
2013-05-02 15:31:17 -04:00
John Jarvis
59c56c2610
fixing old about view, iframe updates
2013-05-02 15:05:12 -04:00
