2202545aec
This completes the work started in https://github.com/edx/edx-platform/pull/19453 to use the LMS login and registration for Studio, rather than Studio providing its own implementation. LMS login/registration are being used for the following reasons: 1. LMS logistration properly handles all SSO integrations. 2. A single logistration is simpler to maintain and understand. 3. Allows Studio to work more like all other IDAs that use LMS logistration. The original switch to use LMS logistration for Studio also added the toggle `DISABLE_STUDIO_SSO_OVER_LMS` to provide the community some additional time for switching. This commit removes this toggle, which at this point means all deployments will use the LMS logistration. This change requires sharing cookies across LMS and Studio. Should that prove to be a problem for certain Open edX instances, there are discussions of possible alternative solutions. See https://github.com/edx/edx-platform/pull/19845#issuecomment-559154256 Detailed changes: * Fix some Studio links that still went to old Studio signin and signup. * Remove DISABLE_STUDIO_SSO_OVER_LMS feature toggle. * Remove old studio signin and signup pages and templates. * Fix url name "login", which had different meanings for Studio and LMS. * Use the following settings: LOGIN_URL, FRONTEND_LOGIN_URL, FRONTEND_LOGOUT_URL, and FRONTEND_REGISTER_URL. * Redirect /signin and /signup to the LMS logistration. * Add custom metric `uses_pattern_library`. * Add custom metric `student_activate_account`. * Add Django Settings to allow /signin, /signup, and /login_post to be disabled once ready. This work also relates to ARCH-218 and DEPR-6. ARCH-1253
41 lines
1.1 KiB
HTML
41 lines
1.1 KiB
HTML
<%page expression_filter="h"/>
|
|
<%inherit file="../base.html" />
|
|
<%!
|
|
from django.conf import settings
|
|
from django.utils.translation import ugettext as _
|
|
from openedx.core.djangolib.markup import HTML, Text
|
|
%>
|
|
|
|
<%namespace name='static' file='../static_content.html'/>
|
|
|
|
%if not user_logged_in:
|
|
<%block name="bodyclass">not-signedin view-activation</%block>
|
|
%endif
|
|
|
|
<%block name="content">
|
|
<section class="container activation">
|
|
|
|
<section class="message">
|
|
|
|
<p style='padding-top:100px; text-align:center;'>
|
|
%if not already_active:
|
|
${_("Thanks for activating your account.")}
|
|
%else:
|
|
${_("This account has already been activated.")}
|
|
%endif
|
|
|
|
%if user_logged_in:
|
|
${Text(_("Visit your {link_start}dashboard{link_end} to see your courses.")).format(
|
|
link_start=HTML('<a href="/">'),
|
|
link_end=HTML('</a>')
|
|
)}
|
|
%else:
|
|
${Text(_("You can now {link_start}sign in{link_end}.")).format(
|
|
link_start=HTML('<a href="{url}">').format(url=settings.LOGIN_URL, link_end=HTML('</a>'))
|
|
)}
|
|
%endif
|
|
</p>
|
|
</section>
|
|
</section>
|
|
</%block>
|