diff --git a/lms/static/sass/application.scss b/lms/static/sass/application.scss index d1dd3d1d4e..273299f6f9 100644 --- a/lms/static/sass/application.scss +++ b/lms/static/sass/application.scss @@ -29,6 +29,8 @@ @import 'multicourse/password_reset'; @import 'multicourse/error-pages'; @import 'multicourse/help'; +@import 'multicourse/login'; +@import 'multicourse/register'; @import 'discussion'; @import 'news'; diff --git a/lms/static/sass/multicourse/_login.scss b/lms/static/sass/multicourse/_login.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/static/sass/multicourse/_register.scss b/lms/static/sass/multicourse/_register.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/templates/login.html b/lms/templates/login.html index 3fa28b9f72..fe46f54cb4 100644 --- a/lms/templates/login.html +++ b/lms/templates/login.html @@ -1,6 +1,125 @@ <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> -<%block name="title">login +<%block name="title">Log into your edX Account -Hello world +<%block name="js_extra"> + + + +
+
+
+

Log Into Your edX Account

+
+
+ +
+
+ +
+ +
+ + + + + + + + +
+ + +
    +
  1. + + +
    2. +
  2. + + + Forgot password? +
    3. +
+
+ +
+ + +
    +
  1. + + +
    2. +
+
+ +
+ + % if has_extauth_info is UNDEFINED: + Not enrolled? Register + % endif +
+
+
+ + +
diff --git a/lms/templates/register.html b/lms/templates/register.html index 82be5db85d..6bfe92b67e 100644 --- a/lms/templates/register.html +++ b/lms/templates/register.html @@ -1,7 +1,202 @@ <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> -<%block name="title">register +<%! from django.core.urlresolvers import reverse %> +<%! from django_countries.countries import COUNTRIES %> +<%! from student.models import UserProfile %> +<%! from datetime import date %> +<%! import calendar %> -Hello world +<%block name="title">Register for edX +<%block name="js_extra"> + + + +
+
+
+

Register for edX

+
+
+ +
+
+ +
+ +
+ + + + + + +

+ Please complete the following fields to register for an edX account. Required fields are noted by bold text and an asterisk (*). +

+ +
+ + + % if has_extauth_info is UNDEFINED: + +
    +
  1. + + +
    2. +
  2. + + +
    3. +
  3. + + + Will be shown in any discussions or forums you participate in +
    4. +
  4. + + + Needed for any certificates you earn +
    5. +
+ + % else: + +
+

Welcome ${extauth_email}

+

Enter a public username:

+
+ +
    +
  1. + + + Will be shown in any discussions or forums you participate in +
    2. +
+ + % endif +
+ +
+ + +
    +
  1. + + +
    2. + +
  2. + + +
    3. + +
  3. + + +
    4. +
+
+ +
+ + +
    +
  1. + + +
    2. + +
  2. + + +
    3. +
+
+ +
+ + +
    +
  1. + + +
    2. + +
  2. + + +
    3. +
+
+ +
+ + % if has_extauth_info is UNDEFINED: + + % endif +
+
+
+ + +
\ No newline at end of file