From b75398b0df518236d2164875deb4af7229c74763 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 3 Sep 2013 17:17:03 -0400 Subject: [PATCH] Verification: moves common page elements/copy into central templates w/ supportive styling --- .../templates/course_modes/_contribution.html | 60 +++++++++---------- common/templates/course_modes/choose.html | 42 +++---------- lms/static/sass/views/_verification.scss | 5 ++ .../verify_student/_modal_editname.html | 27 +++++++++ .../verify_student/_verification_header.html | 15 +++++ .../verify_student/_verification_support.html | 21 +++++++ .../verify_student/photo_verification.html | 60 +------------------ .../verify_student/show_requirements.html | 34 +---------- lms/templates/verify_student/verified.html | 34 +---------- 9 files changed, 112 insertions(+), 186 deletions(-) create mode 100644 lms/templates/verify_student/_modal_editname.html create mode 100644 lms/templates/verify_student/_verification_header.html create mode 100644 lms/templates/verify_student/_verification_support.html diff --git a/common/templates/course_modes/_contribution.html b/common/templates/course_modes/_contribution.html index f63e3b2e4d..0294a842b2 100644 --- a/common/templates/course_modes/_contribution.html +++ b/common/templates/course_modes/_contribution.html @@ -1,32 +1,32 @@ - diff --git a/common/templates/course_modes/choose.html b/common/templates/course_modes/choose.html index 3188f250b0..6198a9ff4f 100644 --- a/common/templates/course_modes/choose.html +++ b/common/templates/course_modes/choose.html @@ -37,14 +37,7 @@ $(document).ready(function() {
-
-

- - ${_("You are registering for")} - ${course_id} - -

-
+ <%include file="/verify_student/_verification_header.html" />
@@ -153,10 +146,14 @@ $(document).ready(function() {

${_("Verified Registration Requirements")}

-

${_("To register for a Verified Certificate of Achievement option, you will need a webcam, a credit or debit card, and an ID.")} ${_("View requirements")}

+ +

${_("What is an ID Verified Certificate?")}

+
+

${_("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim.")}

+
% endif @@ -165,32 +162,7 @@ $(document).ready(function() {
-
- -
+ <%include file="/verify_student/_verification_support.html" />
diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index a1c663d90f..65f5eaea7f 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -1080,6 +1080,10 @@ // VIEW: select a track &.step-select-track { + .sts-track { + @extend .text-sr; + } + .form-register-choose { @include clearfix(); width: flex-grid(12,12); @@ -1214,6 +1218,7 @@ .title { @extend .hd-lv4; @extend .t-weight4; + margin-top: $baseline; margin-bottom: ($baseline/2); } diff --git a/lms/templates/verify_student/_modal_editname.html b/lms/templates/verify_student/_modal_editname.html new file mode 100644 index 0000000000..3a45573c23 --- /dev/null +++ b/lms/templates/verify_student/_modal_editname.html @@ -0,0 +1,27 @@ +<%! from django.utils.translation import ugettext as _ %> + + diff --git a/lms/templates/verify_student/_verification_header.html b/lms/templates/verify_student/_verification_header.html new file mode 100644 index 0000000000..5385555b2a --- /dev/null +++ b/lms/templates/verify_student/_verification_header.html @@ -0,0 +1,15 @@ +<%! from django.utils.translation import ugettext as _ %> + +
+

+ + ${_("You are registering for")} + ${course_id} + + + + ${_("Registering as: ")} ${_("ID Verified")} + + +

+
diff --git a/lms/templates/verify_student/_verification_support.html b/lms/templates/verify_student/_verification_support.html new file mode 100644 index 0000000000..d955f35a0b --- /dev/null +++ b/lms/templates/verify_student/_verification_support.html @@ -0,0 +1,21 @@ +<%! from django.utils.translation import ugettext as _ %> + +
+ +
diff --git a/lms/templates/verify_student/photo_verification.html b/lms/templates/verify_student/photo_verification.html index 845171b52d..b05d39a5a5 100644 --- a/lms/templates/verify_student/photo_verification.html +++ b/lms/templates/verify_student/photo_verification.html @@ -16,19 +16,7 @@
-
-

- - ${_("You are registering for")} - ${course_id} - - - - ${_("Registering as:")} ${_("ID Verified")} - - -

-
+ <%include file="_verification_header.html" />
@@ -359,51 +347,9 @@
-
- -
+ <%include file="_verification_support.html" />
- +<%include file="_modal_editname.html" /> diff --git a/lms/templates/verify_student/show_requirements.html b/lms/templates/verify_student/show_requirements.html index 49624194df..49aa443ebe 100644 --- a/lms/templates/verify_student/show_requirements.html +++ b/lms/templates/verify_student/show_requirements.html @@ -22,19 +22,7 @@
-
-

- - ${_("You are registering for")} - ${course_id} - - - - ${_("Registering as: ")} ${_("ID Verified")} - - -

-
+ <%include file="_verification_header.html" />
@@ -162,25 +150,7 @@
-
- -
+ <%include file="_verification_support.html" />
diff --git a/lms/templates/verify_student/verified.html b/lms/templates/verify_student/verified.html index cb51fdd69a..340e8186a0 100644 --- a/lms/templates/verify_student/verified.html +++ b/lms/templates/verify_student/verified.html @@ -40,19 +40,7 @@ $(document).ready(function() {
-
-

- - ${_("You are registering for")} - ${course_id} - - - - ${_("Registering as:")} ${_("ID Verified")} - - -

-
+ <%include file="_verification_header.html" />
@@ -112,25 +100,7 @@ $(document).ready(function() {
-
- -
+ <%include file="_verification_support.html" />