From 6e38e1a636371f362e3f1e42ca5552c1d1c99050 Mon Sep 17 00:00:00 2001 From: "willgearty@gmail.com" Date: Thu, 23 Aug 2018 22:45:08 -0700 Subject: [PATCH 01/11] First pass of Stanford template overrides --- .../modules/adminclass/manageclass.html | 6 ++--- .../adminclass/manageclass_class_info.html | 16 ++++++++++++- .../program/modules/admincore/returnlink.html | 4 ++-- .../availabilitymodule/availability_form.html | 2 +- .../classsearchmodule/class_detail.html | 13 ++++------- .../financialaidappmodule/application.html | 2 +- .../program/modules/nametagmodule/ids.html | 4 ++-- .../modules/studentregphasezero/status.html | 2 +- .../modules/studentregphasezero/submit.html | 4 ++++ .../teacherclassregmodule/coteachers.html | 11 ++++++++- .../listcopyclasses.html | 16 +++++++++++++ .../teachereventsmodule/event_row.html | 11 +++++---- .../teachereventsmodule/teacher_events.html | 23 +++++++++++++++++++ .../modules/teacherregcore/returnlink.html | 8 +++---- esp/templates/program/receipts/default.html | 4 ++-- esp/templates/qsd/qsd.html | 2 +- .../survey/questions/checkboxes.html | 2 +- .../survey/questions/multiple_choice.html | 2 +- esp/templates/survey/survey.html | 2 +- esp/templates/users/teacherbioedit.html | 2 +- esp/templates/users/userview.html | 15 +++++++++++- 21 files changed, 113 insertions(+), 38 deletions(-) diff --git a/esp/templates/program/modules/adminclass/manageclass.html b/esp/templates/program/modules/adminclass/manageclass.html index ba9dcfce32..f5d2b43113 100644 --- a/esp/templates/program/modules/adminclass/manageclass.html +++ b/esp/templates/program/modules/adminclass/manageclass.html @@ -1,6 +1,6 @@ {% extends "main.html" %} -{% block title %}Manage Class: {{ class.title }}{% endblock %} +{% block title %}Manage Class: {{ class.emailcode }}{% endblock %} {% block stylesheets %} {{ block.super }} @@ -16,7 +16,7 @@
-

Manage Class {{ class.id }}: {{ class.title }}

+

Manage Class {{ class.emailcode }}: {{ class.title }}

@@ -172,7 +172,7 @@

Manage Class {{ class.id }}: {{ class.title }}

None requested {% else %} {% for rr in form.sec.getResourceRequests %} - {{ rr.res_type.name }}
+ {{ rr.res_type.name }} ({{ rr.desired_value }})
{% endfor %} {% endif %} diff --git a/esp/templates/program/modules/adminclass/manageclass_class_info.html b/esp/templates/program/modules/adminclass/manageclass_class_info.html index 083541af58..3537ecdb16 100644 --- a/esp/templates/program/modules/adminclass/manageclass_class_info.html +++ b/esp/templates/program/modules/adminclass/manageclass_class_info.html @@ -1,6 +1,6 @@ Teachers: - {% for teacher in class.get_teachers %}{{ teacher.nonblank_name }}{% if not forloop.last %}, {% endif %}{% endfor %} + {% for teacher in class.get_teachers %}{{ teacher.nonblank_name }} ({{teacher.email}}){% if not forloop.last %}, {% endif %}{% endfor %}
Edit Teacher List @@ -32,6 +32,12 @@ {{ class.prereqs }} + + Class Format: + + {{ class.class_style }} + + Room Request: @@ -50,3 +56,11 @@ {{ class.message_for_directors }} + + Resource Requests: + + {% for r in class.sections.all.0.resourcerequest_set.all %} + {{ r.desired_value }}
+ {% endfor %} + + \ No newline at end of file diff --git a/esp/templates/program/modules/admincore/returnlink.html b/esp/templates/program/modules/admincore/returnlink.html index 959c0cccb3..61dc27ad69 100644 --- a/esp/templates/program/modules/admincore/returnlink.html +++ b/esp/templates/program/modules/admincore/returnlink.html @@ -2,10 +2,10 @@

{% if prog %} -Return to the main program management page +Return to the main program management page {% else %} {% if program %} -Return to the main program management page +Return to the main program management page {% endif %} {% endif %}

diff --git a/esp/templates/program/modules/availabilitymodule/availability_form.html b/esp/templates/program/modules/availabilitymodule/availability_form.html index 65b85d50f1..35761bf9ef 100644 --- a/esp/templates/program/modules/availabilitymodule/availability_form.html +++ b/esp/templates/program/modules/availabilitymodule/availability_form.html @@ -55,7 +55,7 @@ #program_form th { text-align: center; font-weight: bold; - background: #EFEFEF; + background: #CCCCCC; padding: 3px; height: 80px; width: 75px; diff --git a/esp/templates/program/modules/classsearchmodule/class_detail.html b/esp/templates/program/modules/classsearchmodule/class_detail.html index f7d1a157a7..8d46bd51a6 100644 --- a/esp/templates/program/modules/classsearchmodule/class_detail.html +++ b/esp/templates/program/modules/classsearchmodule/class_detail.html @@ -4,7 +4,6 @@ Sections: {{class.sections.count}} - ({% for section in class.get_sections %}{{section.duration}} hrs{% if not forloop.last %}, {% endif%}{% endfor %}) @@ -25,14 +24,10 @@ {% endif %} + + Duration: + {{class.prettyDuration}} + {% include "program/modules/adminclass/manageclass_class_info.html" %} - - Resource requests: - - {% for r in class.sections.all.0.resourcerequest_set.all %} - {{ r }}
- {% endfor %} - - diff --git a/esp/templates/program/modules/financialaidappmodule/application.html b/esp/templates/program/modules/financialaidappmodule/application.html index 22e01c9e95..96c16bb943 100644 --- a/esp/templates/program/modules/financialaidappmodule/application.html +++ b/esp/templates/program/modules/financialaidappmodule/application.html @@ -98,7 +98,7 @@

Introduction

{% else %} {% endif %} -    |    +        diff --git a/esp/templates/program/modules/nametagmodule/ids.html b/esp/templates/program/modules/nametagmodule/ids.html index ee5f00cb35..38e0faa4b7 100644 --- a/esp/templates/program/modules/nametagmodule/ids.html +++ b/esp/templates/program/modules/nametagmodule/ids.html @@ -45,7 +45,7 @@ .indicator { border: 1px solid black; border-width: 0 1px 0 1px; height: 0.85in;} - + @@ -99,7 +99,7 @@ {% endfor %} diff --git a/esp/templates/program/modules/studentregphasezero/status.html b/esp/templates/program/modules/studentregphasezero/status.html index 1fc8632a37..d26bce035a 100644 --- a/esp/templates/program/modules/studentregphasezero/status.html +++ b/esp/templates/program/modules/studentregphasezero/status.html @@ -92,7 +92,7 @@



I confirm that I would like to run the student lottery.

- +
diff --git a/esp/templates/program/modules/studentregphasezero/submit.html b/esp/templates/program/modules/studentregphasezero/submit.html index f897d0bcb7..63b96ca39c 100644 --- a/esp/templates/program/modules/studentregphasezero/submit.html +++ b/esp/templates/program/modules/studentregphasezero/submit.html @@ -35,6 +35,10 @@ .option:hover { background-color: #edf3ff; } + +.button { + float: none !important; +} {% endblock %} diff --git a/esp/templates/program/modules/teacherclassregmodule/coteachers.html b/esp/templates/program/modules/teacherclassregmodule/coteachers.html index 0463530879..acae13c882 100644 --- a/esp/templates/program/modules/teacherclassregmodule/coteachers.html +++ b/esp/templates/program/modules/teacherclassregmodule/coteachers.html @@ -22,7 +22,16 @@

Setting Coteachers for "{{ class|escape }}"

-

Please list all others that will be helping you teach this class. They will need to create accounts and mark their available times through the teacher registration page (for scheduling purposes).

+

To add a co-teacher, please follow these steps:

+
    +
  1. Have your co-teacher register a teacher account on our website (if they do not have one already).
    2. + +
  2. Have your co-teacher update their teacher profile at this page.
    3. + +
  3. Have your co-teacher update their availability for the weekend of Splash at this page. Please make sure that your co-teacher and you share an overlapping schedule that is able to cover the entire duration of your class(es) that you are co-teaching.
    4. + +
  4. Finally, return to this co-teachers page and add your co-teacher using the tool below.
    5. +
{% if conflict %}

diff --git a/esp/templates/program/modules/teacherclassregmodule/listcopyclasses.html b/esp/templates/program/modules/teacherclassregmodule/listcopyclasses.html index b58740a13e..acb074c0ec 100644 --- a/esp/templates/program/modules/teacherclassregmodule/listcopyclasses.html +++ b/esp/templates/program/modules/teacherclassregmodule/listcopyclasses.html @@ -8,6 +8,14 @@ {% endblock %} {% block content %} + + + Go back to the main teacher registration page

@@ -37,6 +45,14 @@ {% load class_render_row %} {% for cls in all_class_list %} {% render_class_copy_row cls %} + {% if not forloop.last %} + + + + + + + {% endif %} {% endfor %} diff --git a/esp/templates/program/modules/teachereventsmodule/event_row.html b/esp/templates/program/modules/teachereventsmodule/event_row.html index 96f84ff45e..bbcff71784 100644 --- a/esp/templates/program/modules/teachereventsmodule/event_row.html +++ b/esp/templates/program/modules/teachereventsmodule/event_row.html @@ -1,15 +1,16 @@ {% for timeslot in timeslots %} - - {{ timeslot.start|date:"D, M j f A" }} - {{ timeslot.end|date:"f A" }} - + + {{ timeslot.description }} + {{ timeslot.start|date:"D, M j f A" }} + {{ timeslot.end|date:"f A" }} + {% if timeslot.teachers %} {{ timeslot.teachers|join:",
" }} {% else %} (None) {% endif %} - +

diff --git a/esp/templates/program/modules/teachereventsmodule/teacher_events.html b/esp/templates/program/modules/teachereventsmodule/teacher_events.html index 3fe4d21f48..fef3a2ff12 100644 --- a/esp/templates/program/modules/teachereventsmodule/teacher_events.html +++ b/esp/templates/program/modules/teachereventsmodule/teacher_events.html @@ -5,6 +5,29 @@ {% block stylesheets %} {{ block.super }} + {% endblock %} {% block content %} diff --git a/esp/templates/program/modules/teacherregcore/returnlink.html b/esp/templates/program/modules/teacherregcore/returnlink.html index ca9ed9ac2e..43c97f521a 100644 --- a/esp/templates/program/modules/teacherregcore/returnlink.html +++ b/esp/templates/program/modules/teacherregcore/returnlink.html @@ -1,9 +1,9 @@ -

+

{% if prog %} -Click here to return to the main teacher registration page. +Return to the main teacher registration page {% else %} {% if program %} -Click here to return to the main teacher registration page. +Return to the main teacher registration page {% endif %} {% endif %} -

+

\ No newline at end of file diff --git a/esp/templates/program/receipts/default.html b/esp/templates/program/receipts/default.html index ce134cfb41..b2c1eca3bf 100644 --- a/esp/templates/program/receipts/default.html +++ b/esp/templates/program/receipts/default.html @@ -2,7 +2,7 @@ {% block title %}Registration Receipt for {{ program.niceName }}{% endblock %} {% block body %} -Your class selections and any other information you entered have been saved. Be on the lookout for emails from the organizers for more details about {{ program.niceName }}. We will also post any updates on our Web site! +Your class selections and any other information you entered have been saved. Be on the lookout for emails from the organizers for more details about {{ program.niceName }}. We will also post any updates on our website!
@@ -50,7 +50,7 @@ {% if not forloop.last %}
{% endif %} {% endfor %} {% if timeslot.1|length_is:0 %} - No classes + No classes selected {% endif %} diff --git a/esp/templates/qsd/qsd.html b/esp/templates/qsd/qsd.html index d0178c5b66..deb01b2932 100644 --- a/esp/templates/qsd/qsd.html +++ b/esp/templates/qsd/qsd.html @@ -21,6 +21,6 @@ {% autoescape off %}{% render_qsd qsdrec %}{% endautoescape %} {% endblock %} diff --git a/esp/templates/survey/questions/checkboxes.html b/esp/templates/survey/questions/checkboxes.html index 7a4944ff86..ddd8e941de 100644 --- a/esp/templates/survey/questions/checkboxes.html +++ b/esp/templates/survey/questions/checkboxes.html @@ -8,7 +8,7 @@
- +
{% endfor %} diff --git a/esp/templates/survey/questions/multiple_choice.html b/esp/templates/survey/questions/multiple_choice.html index 362605e895..53e5e74b31 100644 --- a/esp/templates/survey/questions/multiple_choice.html +++ b/esp/templates/survey/questions/multiple_choice.html @@ -8,7 +8,7 @@
- +
{% endfor %} diff --git a/esp/templates/survey/survey.html b/esp/templates/survey/survey.html index 6ccc6f2986..6b6c722ba8 100644 --- a/esp/templates/survey/survey.html +++ b/esp/templates/survey/survey.html @@ -100,7 +100,7 @@

Survey for {{ program.niceName }}

{% for sec in sections %} - +
Questions for {{ sec.emailcode }}: {{ sec.title }}Questions for {{ sec.emailcode }}: {{ sec.title }} ({% for tm in sec.friendly_times %}{% if forloop.counter > 1 %},{% endif %}{{ tm }}{% endfor %})
{% for question in perclass_questions %} diff --git a/esp/templates/users/teacherbioedit.html b/esp/templates/users/teacherbioedit.html index 7ec5dc71b6..ceefd49319 100644 --- a/esp/templates/users/teacherbioedit.html +++ b/esp/templates/users/teacherbioedit.html @@ -34,7 +34,7 @@

Please fix the error{{ form.errors|pluralize }} in the for
- +
diff --git a/esp/templates/users/userview.html b/esp/templates/users/userview.html index 0272e114ff..29c7c131ba 100644 --- a/esp/templates/users/userview.html +++ b/esp/templates/users/userview.html @@ -30,6 +30,9 @@

User Information

{% endfor %} + {% if profile.teacher_info %} + Go to teacher bio + {% endif %} Morph into this user {% if program %} Onsite for {{program.niceName}} @@ -44,6 +47,16 @@

User Information

Check availability for {{program.niceName}} {% endif %} +

User Type(s):

+ {% with user.getUserTypes as types %} + {% if types %} + {% for type in user.getUserTypes %} + {{ type }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% else %} + None + {% endif %} + {% endwith %} {% if profile.student_info %} {% if program and program|hasModule:"AccountingModule" %} View accounting info @@ -108,7 +121,7 @@

{% if profile.contact_user %} - + From 60a1387e4d3589edbb93d0d5eaffd7f2c09339cf Mon Sep 17 00:00:00 2001 From: "willgearty@gmail.com" Date: Fri, 24 Aug 2018 08:57:58 -0700 Subject: [PATCH 02/11] teacherbio changes --- esp/templates/users/teacherbio.html | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/esp/templates/users/teacherbio.html b/esp/templates/users/teacherbio.html index d4fa219f38..091fd82de0 100644 --- a/esp/templates/users/teacherbio.html +++ b/esp/templates/users/teacherbio.html @@ -23,9 +23,12 @@ {% block content %}

ESP Biography

{% if biouser.id == request.user.id or request.user.isAdministrator %} - - Edit this biography! - +Edit this biography +{% endif %} +{% if request.user.isAdministrator %} + Go to teacher profile + Morph into teacher + View on admin panel {% endif %}

{{biouser.name|upper}}, {{bio.slugbio}}

@@ -56,9 +59,7 @@

Brief Biographical Sketch:



Past Classes

  - (Look at the class archive for more.) - -
+ (Clicking a class title will bring you to the course's section of the corresponding course catalog)

{% if classes|length_is:0 %}{% if recent_classes|length_is:0 %} @@ -68,7 +69,7 @@

Past Classes

  {# Archive Classes get auto-HTML-ized quite nicely; but we have to render regular classes on our own #} {% for cls in recent_classes %} - {{ cls.title }} in {{ cls.parent_program.niceName }} ({{ cls.parent_program.date_range }}) + {{cls.emailcode}}: {{ cls.title }} in {{ cls.parent_program.niceName }} ({{ cls.parent_program.date_range }})
{{ cls.class_info }} @@ -80,9 +81,6 @@

Past Classes

  {% autoescape off %} {{ classes|join:"

" }} {% endautoescape %} - -



- From 0fdb85093c2dc951068e6bf5bf62e1bd87395dff Mon Sep 17 00:00:00 2001 From: "willgearty@gmail.com" Date: Fri, 24 Aug 2018 09:13:53 -0700 Subject: [PATCH 03/11] userview_class_entry changes --- esp/templates/users/userview_class_entry.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/esp/templates/users/userview_class_entry.html b/esp/templates/users/userview_class_entry.html index eb0cba2c96..7261d15f44 100644 --- a/esp/templates/users/userview_class_entry.html +++ b/esp/templates/users/userview_class_entry.html @@ -1,8 +1,10 @@ -
  • +
  • + {% if not class.isReviewed %}(Unreviewed){% endif %} {% if class.isRejected %}(Rejected){% endif %} {% if class.isCancelled %}(Cancelled){% endif %} -{{ class.emailcode }}: {{ class.title }} + +{{class.emailcode}}: {{ class.title }} (manage | edit) {% if show_class_details %} {% if class.get_sections %} @@ -10,11 +12,15 @@ {% for sec in class.get_sections %}
    {{ sec.emailcode }} ({{ sec.num_students }}/{{ sec.capacity }}): - {% if sec.friendly_times|length_is:0 %} + + {% if sec.isRejected or sec.isCancelled %} + Cancelled + {% elif sec.friendly_times|length_is:0 %} Not scheduled {% else %} {% for time in sec.friendly_times %}{{ time }}{% if not forloop.last %}, {% endif %}{% endfor %} in {% for room in sec.prettyrooms %}{{ room }}{% if not forloop.last %} and{% endif %}{% endfor %} {% endif %} + {% endfor %} {% else %} {# This is a ClassSection #} From 549b00948c6bfe451b59d3e1c484b5788eaf2ad0 Mon Sep 17 00:00:00 2001 From: "willgearty@gmail.com" Date: Fri, 24 Aug 2018 09:49:40 -0700 Subject: [PATCH 04/11] student_schedule changes --- esp/templates/users/student_schedule.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/esp/templates/users/student_schedule.html b/esp/templates/users/student_schedule.html index c94cb14733..8c1af5926f 100644 --- a/esp/templates/users/student_schedule.html +++ b/esp/templates/users/student_schedule.html @@ -88,18 +88,18 @@
    {% endif %} -
    • Your Teacher Biography
    Username{{ user.username }}
    User ID{{ user.id }}
    E-mail{{ profile.contact_user.e_mail }}
    E-mail{{ profile.contact_user.e_mail }}
    Day Phone{{ profile.contact_user.phone_day }}
    Cell Phone{{ profile.contact_user.phone_cell }}
    Address{{ profile.contact_user.address_street }}
    {{ profile.contact_user.address_city }}, {{ profile.contact_user.address_state }} {{ profile.contact_user.address_zip }}{% if profile.contact_user.undeliverable %}
    Mail has bounced!{% endif %}
    - +
    + {% for timeslot in timeslots %} {% ifchanged timeslot.0.start.day %} - + {% endifchanged %} {% ifchanged timeslot.2 %} - + {% endifchanged %} {% ifequal timeslot.0.event_type.description "Compulsory" %} @@ -137,7 +137,9 @@
    Or: {% endcomment %} {% for cls in timeslot.1 %} {% if cls.first_meeting_time %} - [remove] + [remove]
    [view other classes] + {% else %} + [view other classes] {% endif %}
    {% endfor %} From 79e91c7d6fd331f52aec68fc56beeb74824402e4 Mon Sep 17 00:00:00 2001 From: "willgearty@gmail.com" Date: Fri, 24 Aug 2018 15:10:53 -0700 Subject: [PATCH 05/11] https fix --- .../program/modules/resourcemodule/resource_types.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp/templates/program/modules/resourcemodule/resource_types.html b/esp/templates/program/modules/resourcemodule/resource_types.html index 5eab995435..26406a704f 100644 --- a/esp/templates/program/modules/resourcemodule/resource_types.html +++ b/esp/templates/program/modules/resourcemodule/resource_types.html @@ -88,7 +88,7 @@

    Step 2: Resource Types


    - + + +{% endblock %} + +{% block content %}

    Teacher Preparation Events for {{ prog.niceName }}

    @@ -17,12 +165,20 @@

    Teacher Preparation Events for {{ prog.niceName }}

    {% load render_qsd %} {% render_inline_program_qsd prog "teach:eventsignupheader" %} +
    +
    +
    +
    + +{% render_inline_program_qsd prog "teach:eventsignupheader2" %} + +
    +
    -
    Classes for {{request.user.first_name}} {{request.user.last_name}} - ID: {{request.user.id}}
    Classes beginning on {{ timeslot.0.pretty_date }}
    Classes beginning on {{ timeslot.0.pretty_date }}
    Block {{ timeslot.2 }}
    Block {{ timeslot.2 }}
    {{ timeslot.0.short_description }}
    +
    +

    +
    {{ form }} - - - From 35c17740466a533e2c44063a7584c612207f21c3 Mon Sep 17 00:00:00 2001 From: "willgearty@gmail.com" Date: Sat, 25 Aug 2018 11:04:27 -0700 Subject: [PATCH 07/11] profiles changes --- esp/templates/users/profile.html | 12 +++++++++++- esp/templates/users/profiles/educatorinfo.html | 2 +- esp/templates/users/profiles/emergencycontact.html | 2 +- esp/templates/users/profiles/guardianinfo.html | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/esp/templates/users/profile.html b/esp/templates/users/profile.html index c9d4633b25..4292aa699c 100644 --- a/esp/templates/users/profile.html +++ b/esp/templates/users/profile.html @@ -19,9 +19,14 @@

    Your Profile Information

    {% load render_qsd %} {% inline_qsd_block "account_creation_basic_info" %} -

    First, please tell us a bit about yourself! The fields in red boxes are required. After you have filled out everything, click the "update" button at the bottom of the page to continue.

    + +

    First, please tell us a bit about yourself! The fields with red asterisks are required. After you have filled out everything, click the "update" button at the bottom of the page to continue.

    E-mail addresses have a tendency to change regularly, so we are asking that you re-enter your e-mail address each time you visit this form. Please take the time to also correct any other information that may be old or incorrect. Thanks!

    + + + + {% end_inline_qsd_block %}
    @@ -68,6 +73,10 @@

    Please fix the following error{{ form.errors|pluralize }} {% include "users/profiles/usercontact.html" %} {% include "users/profiles/guardianinfo.html" %} {% else %} + + {% ifequal profiletype "Volunteer" %} + {% include "users/profiles/usercontact.html" %} + {% else %} {% include "../templates/themes/bs_form.html" %} @@ -75,6 +84,7 @@

    Please fix the following error{{ form.errors|pluralize }} {% endifequal %} {% endifequal %} {% endifequal %} + {% endifequal %}
    diff --git a/esp/templates/users/profiles/educatorinfo.html b/esp/templates/users/profiles/educatorinfo.html index ec7b6ff452..31de487508 100644 --- a/esp/templates/users/profiles/educatorinfo.html +++ b/esp/templates/users/profiles/educatorinfo.html @@ -30,7 +30,7 @@

    Educator Information

    - +
    {{ form.school }} {% if form.school.errors %}
    {{ form.school.errors|join:", " }} diff --git a/esp/templates/users/profiles/emergencycontact.html b/esp/templates/users/profiles/emergencycontact.html index a1ead5553d..d2486febb8 100644 --- a/esp/templates/users/profiles/emergencycontact.html +++ b/esp/templates/users/profiles/emergencycontact.html @@ -8,7 +8,7 @@

    Emergency Contact

    this might be a family friend or nearby relative.

    Please either click below to copy your home address and your parents' contact information into this form, or give contact information for someone else that you know and trust. -

    +

    - -{% endblock %} - {% block content %} + +

    Teacher Preparation Events for {{ prog.niceName }}

    @@ -165,20 +17,12 @@

    Teacher Preparation Events for {{ prog.niceName }}

    {% load render_qsd %} {% render_inline_program_qsd prog "teach:eventsignupheader" %} -
    -
    -
    -
    - -{% render_inline_program_qsd prog "teach:eventsignupheader2" %} - -
    -
    -
    -

    - + {{ form }} + + +
    From 0884825f48a641d557889ecf5b17a8a2b8efdc0d Mon Sep 17 00:00:00 2001 From: Will Gearty Date: Sat, 23 Mar 2019 13:20:20 -0700 Subject: [PATCH 11/11] Changes for review --- .../program/modules/adminclass/manageclass_class_info.html | 2 ++ .../program/modules/teacherclassregmodule/coteachers.html | 2 +- esp/templates/users/profile.html | 6 ------ esp/templates/users/student_schedule.html | 6 +++--- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/esp/templates/program/modules/adminclass/manageclass_class_info.html b/esp/templates/program/modules/adminclass/manageclass_class_info.html index 9db795d7d5..29063f7535 100644 --- a/esp/templates/program/modules/adminclass/manageclass_class_info.html +++ b/esp/templates/program/modules/adminclass/manageclass_class_info.html @@ -32,12 +32,14 @@ {{ class.prereqs }} +{% if class.class_style %} Class Format: {{ class.class_style }} +{% endif %} Room Request: diff --git a/esp/templates/program/modules/teacherclassregmodule/coteachers.html b/esp/templates/program/modules/teacherclassregmodule/coteachers.html index acae13c882..c12a6b264b 100644 --- a/esp/templates/program/modules/teacherclassregmodule/coteachers.html +++ b/esp/templates/program/modules/teacherclassregmodule/coteachers.html @@ -28,7 +28,7 @@

    To add a co-teacher, please follow these steps:

  • Have your co-teacher update their teacher profile at this page.
    • -
  • Have your co-teacher update their availability for the weekend of Splash at this page. Please make sure that your co-teacher and you share an overlapping schedule that is able to cover the entire duration of your class(es) that you are co-teaching.
    • +
  • Have your co-teacher update their availability for {{ program.name }} at this page. Please make sure that your co-teacher and you share an overlapping schedule that is able to cover the entire duration of your class(es) that you are co-teaching.
  • Finally, return to this co-teachers page and add your co-teacher using the tool below.
    • diff --git a/esp/templates/users/profile.html b/esp/templates/users/profile.html index 4292aa699c..6ae99ddd5c 100644 --- a/esp/templates/users/profile.html +++ b/esp/templates/users/profile.html @@ -19,14 +19,9 @@

    Your Profile Information

    {% load render_qsd %} {% inline_qsd_block "account_creation_basic_info" %} -

    First, please tell us a bit about yourself! The fields with red asterisks are required. After you have filled out everything, click the "update" button at the bottom of the page to continue.

    E-mail addresses have a tendency to change regularly, so we are asking that you re-enter your e-mail address each time you visit this form. Please take the time to also correct any other information that may be old or incorrect. Thanks!

    - - - - {% end_inline_qsd_block %}
    @@ -50,7 +45,6 @@

    Please fix the following error{{ form.errors|pluralize }} - {% ifequal profiletype "student" %} {% include "users/profiles/usercontact.html" %} {% include "users/profiles/studentinfo.html" %} diff --git a/esp/templates/users/student_schedule.html b/esp/templates/users/student_schedule.html index 8c1af5926f..53dfbe8d3c 100644 --- a/esp/templates/users/student_schedule.html +++ b/esp/templates/users/student_schedule.html @@ -137,10 +137,10 @@
    Or: {% endcomment %} {% for cls in timeslot.1 %} {% if cls.first_meeting_time %} - [remove]
    [view other classes] - {% else %} - [view other classes] + [remove] +
    {% endif %} + [view other classes]
    {% endfor %} {% if timeslot.3 %}