From 5119257f3e2ef7357b541ad18fa736f19b5e47f1 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 20 Dec 2012 12:24:31 -0500 Subject: [PATCH] test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip --- lms/static/sass/application.scss | 1 + lms/static/sass/multicourse/_dashboard.scss | 4 + lms/templates/test_center_register.html | 309 +++++++++----------- 3 files changed, 150 insertions(+), 164 deletions(-) diff --git a/lms/static/sass/application.scss b/lms/static/sass/application.scss index 944d3b2884..4e532cf30e 100644 --- a/lms/static/sass/application.scss +++ b/lms/static/sass/application.scss @@ -19,6 +19,7 @@ @import 'multicourse/home'; @import 'multicourse/dashboard'; +@import 'multicourse/testcenter-register'; @import 'multicourse/courses'; @import 'multicourse/course_about'; @import 'multicourse/jobs'; diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 249e8a0513..8383b01a54 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -418,6 +418,10 @@ font-size: 13px; margin: 0; + a { + font-family: $sans-serif; + } + .grade-value { font-size: 1.2rem; font-weight: bold; diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html index 8c99b4f8ef..f1b071d121 100644 --- a/lms/templates/test_center_register.html +++ b/lms/templates/test_center_register.html @@ -9,7 +9,7 @@ <%namespace name='static' file='static_content.html'/> -<%block name="title">Sign Up for Pearson VUE Test Center Proctoring +<%block name="title">Pearson VUE Test Center Proctoring - Sign Up <%block name="js_extra"> -
+
-
-
-
-

-
-
+ - +
+
+

+ % if course.has_ended(): + Course Completed - ${course.end_date_text} + % elif course.has_started(): + Course Started - ${course.start_date_text} + % else: # hasn't started yet + Course Starts - ${course.start_date_text} + % endif +

+

${get_course_about_section(course, 'university')}

+

${course.number} ${course.title}

+
-
-
-

- % if course.has_ended(): - Course Completed - ${course.end_date_text} - % elif course.has_started(): - Course Started - ${course.start_date_text} - % else: # hasn't started yet - Course Starts - ${course.start_date_text} - % endif -

-

${get_course_about_section(course, 'university')}

-

${course.number} ${course.title}

-
- - - <% - exam_info = course.testcenter_info - %> - % if exam_info is not None: -

Exam Series Code: ${exam_info.get('Exam_Series_Code')}

-

First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}

-

Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}

- % endif - -
+ + <% + exam_info = course.testcenter_info + %> + % if exam_info is not None: +

Exam Series Code: ${exam_info.get('Exam_Series_Code')}

+

First Eligible Appointment Date: ${exam_info.get('First_Eligible_Appointment_Date')}

+

Last Eligible Appointment Date: ${exam_info.get('Last_Eligible_Appointment_Date')}

+ % endif +
@@ -86,40 +78,41 @@ registration = registrations[0] %> -
Already Registered
-

Here is the current state of your registration, for debugging purposes:

- -
  • id: ${registration.id}
    • -
  • testcenter_user_id: ${registration.testcenter_user_id}
    • -
  • course_id: ${registration.course_id}
    • -
  • accommodation codes: ${registration.accommodation_code}
    • -
  • accommodation request: ${registration.accommodation_request}
    • -
  • created_at: ${registration.created_at}
    • -
  • updated_at: ${registration.updated_at}
    • -
  • user_updated_at: ${registration.user_updated_at}
    • -
  • upload_status: ${registration.upload_status}
    • -
  • upload_error_message: ${registration.upload_error_message}
    • -     +
    Already Registered
    +

    Here is the current state of your registration, for debugging purposes:

    + +
  • id: ${registration.id}
    • +
  • testcenter_user_id: ${registration.testcenter_user_id}
    • +
  • course_id: ${registration.course_id}
    • +
  • accommodation codes: ${registration.accommodation_code}
    • +
  • accommodation request: ${registration.accommodation_request}
    • +
  • created_at: ${registration.created_at}
    • +
  • updated_at: ${registration.updated_at}
    • +
  • user_updated_at: ${registration.user_updated_at}
    • +
  • upload_status: ${registration.upload_status}
    • +
  • upload_error_message: ${registration.upload_error_message}
    • +     + + + + <% + regstatus = "registration pending acknowledgement by Pearson" - - - <% - regstatus = "registration pending acknowledgement by Pearson" - - if registration.upload_status == 'Accepted': - regstatus = "registration approved by Pearson" - elif registration.upload_status == 'Error': - regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message - elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '': - regstatus = "pending approval of accommodation request" - %> -

    Current status: ${regstatus}

    - -

    The demographic information provided below was used to register - for the exam listed above. Changes to this information - may be submitted below.

    -
    + if registration.upload_status == 'Accepted': + regstatus = "registration approved by Pearson" + elif registration.upload_status == 'Error': + regstatus = "registration rejected by Pearson: %s" % registration.upload_error_message + elif len(registration.accommodation_request) > 0 and registration.accommodation_code == '': + regstatus = "pending approval of accommodation request" + %> +

    Current status: ${regstatus}

    + +

    The demographic information provided below was used to register + for the exam listed above. Changes to this information + may be submitted below.

    +
    + % else:

    The demographic information must be provided below in order to register for the exam listed above.

    @@ -127,106 +120,94 @@ % if message: -
    -

    ${message}

    -
    +
    +

    ${message}

    +
    % endif -
    -
    - - -
    - - - - - - -
    - - -
    - - -
    - - -
    - - -
    - - -
    -
    - -
    - - -
    - - -
    - - -
    - - - - - -
    - - - - -
    - -
    - - - - - - -
    - - - - -
    - - -
    -

    The following is included here just so it can be input within the form. But it - is not part of the demographics, and it is not something that can be changed once input.

    -
    -
    - - -
    - - % if len(registrations) > 0: -
    - -
    - % else: -
    - -
    - % endif + -
    + + + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    - + +
    + + +
    + + +
    + + +
    + + + + + +
    + + + + +
    + +
    + + + + + + +
    + + + + +
    + + +
    +
    + +

    The following is included here just so it can be input within the form. But it is not part of the demographics, and it is not something that can be changed once input.

    + +
    + +
    + +% if len(registrations) > 0: +
    + +
    + % else: +
    + +
    + % endif + +