From 2a23757fbc12dbf266828184e9991ee4e5017a40 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Fri, 8 Apr 2016 15:45:10 -0400 Subject: [PATCH] Sending skip links to single main, making more relevant --- cms/templates/base.html | 10 +- cms/templates/course-create-rerun.html | 2 +- lms/static/js/fixtures/edxnotes/edxnotes.html | 4 +- lms/templates/ccx/coach_dashboard.html | 115 +++--- lms/templates/courseware/courses.html | 82 ++-- .../courseware/courseware-chromeless.html | 2 - lms/templates/courseware/courseware.html | 10 +- lms/templates/courseware/info.html | 103 ++--- lms/templates/courseware/progress.html | 352 +++++++++--------- lms/templates/courseware/static_tab.html | 12 +- lms/templates/dashboard.html | 217 +++++------ lms/templates/discussion/index.html | 12 +- lms/templates/edxnotes/edxnotes.html | 4 +- lms/templates/index.html | 78 ++-- .../instructor_dashboard_2.html | 64 ++-- lms/templates/learner_dashboard/programs.html | 11 +- lms/templates/main.html | 4 +- lms/templates/main_django.html | 4 +- lms/templates/static_templates/404.html | 18 +- lms/templates/static_templates/about.html | 10 +- lms/templates/static_templates/blog.html | 10 +- lms/templates/static_templates/contact.html | 10 +- lms/templates/static_templates/donate.html | 10 +- lms/templates/static_templates/embargo.html | 24 +- lms/templates/static_templates/faq.html | 10 +- lms/templates/static_templates/help.html | 10 +- lms/templates/static_templates/honor.html | 10 +- lms/templates/static_templates/jobs.html | 10 +- lms/templates/static_templates/media-kit.html | 10 +- lms/templates/static_templates/news.html | 10 +- lms/templates/static_templates/press.html | 10 +- lms/templates/static_templates/privacy.html | 10 +- .../static_templates/server-down.html | 28 +- .../static_templates/server-error.html | 30 +- .../static_templates/server-overloaded.html | 28 +- lms/templates/static_templates/tos.html | 10 +- .../student_account/account_settings.html | 3 +- .../account_settings.underscore | 2 + .../student_account/login_and_register.html | 4 +- .../student_profile/learner_profile.html | 11 +- lms/templates/wiki/article.html | 19 +- lms/templates/wiki/base.html | 4 +- themes/edx.org/lms/templates/dashboard.html | 5 +- 43 files changed, 723 insertions(+), 669 deletions(-) diff --git a/cms/templates/base.html b/cms/templates/base.html index 82e4100119..92e66608ba 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -54,7 +54,7 @@ from openedx.core.djangolib.js_utils import ( <%block name="view_notes"> - ${_("Skip to main content")} + ${_("Skip to main content")} @@ -37,188 +36,189 @@ from django.utils.http import urlquote_plus
-
- % if staff_access and studio_url is not None: -
- ${_("View Grading in studio")} -
- % endif - -
-

${_("Course Progress for Student '{username}' ({email})").format(username=student.username, email=student.email) | h}

-
- - %if show_generate_cert_btn: -
-
- %if passed: -
-
- <% post_url = reverse('generate_user_cert', args=[unicode(course.id)]) %> - % if is_downloadable: -
-

${_("Your certificate is available")}

-

- ${_("You can keep working for a higher grade, or request your certificate now.")} -

-
-
- %if show_cert_web_view and cert_web_view_url: - - ${_("View Certificate")} - - %elif download_url: - - ${_("Download Your Certificate")} - - %endif -
- %elif is_generating: -
- ## Translators: This message appears to users when the system is processessing course certificates, which can take a few hours. -

${_("We're working on it...")}

-

${_("We're creating your certificate. You can keep working in your courses and a link to it will appear here and on your Dashboard when it is ready.")}

-
-
- %else: -
-

${_("Congratulations, you qualified for a certificate!")}

-

${_("You can keep working for a higher grade, or request your certificate now.")}

-
-
- -
- %endif -
-
- %endif -
- %endif - - %if not course.disable_progress_graph: - - %endif - - % if credit_course_requirements: -
-
-
-

${_("Requirements for Course Credit")}

-
- %if credit_course_requirements['eligibility_status'] == 'not_eligible': - ${_("{student_name}, you are no longer eligible for credit in this course.").format(student_name=student.profile.name) | h} - %elif credit_course_requirements['eligibility_status'] == 'eligible': - ${_("{student_name}, you have met the requirements for credit in this course.").format(student_name=student.profile.name) | h} - ${_("{a_start}Go to your dashboard{a_end} to purchase course credit.").format( - a_start=u"".format(url=reverse('dashboard')), - a_end="" - )} - - %elif credit_course_requirements['eligibility_status'] == 'partial_eligible': - ${_("{student_name}, you have not yet met the requirements for credit.").format(student_name=student.profile.name) | h} - %endif - ${_("Information about course credit requirements")}
-
- %for requirement in credit_course_requirements['requirements']: -
-
- ${_(requirement['display_name']) | h} - %if requirement['namespace'] == 'grade': - ${int(requirement['criteria']['min_grade'] * 100) | h}% - %endif -
-
- %if requirement['status']: - %if requirement['status'] == 'submitted': - ${_("Verification Submitted")} - %elif requirement['status'] == 'failed': - - ${_("Verification Failed" )} - %elif requirement['status'] == 'declined': - - ${_("Verification Declined" )} - %elif requirement['status'] == 'satisfied': - - ${_("Completed by")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)} - %endif - %else: - ${_("Upcoming")} - %endif -
-
- %endfor -
- +
+
+ % if staff_access and studio_url is not None: +
+ ${_("View Grading in studio")}
-
- %endif + % endif -
- %for chapter in courseware_summary: - %if not chapter['display_name'] == "hidden": -
-

${ chapter['display_name'] | h}

+
+

${_("Course Progress for Student '{username}' ({email})").format(username=student.username, email=student.email) | h}

+
-
- %for section in chapter['sections']: -
- <% - earned = section['section_total'].earned - total = section['section_total'].possible - percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 and total > 0 else "" - %> - -

- ${ section['display_name'] | h} - %if total > 0 or earned > 0: - - ${_("{earned} of {total} possible points").format(earned='{:.3n}'.format(float(earned)), total='{:.3n}'.format(float(total))) | h} - - %endif - - %if total > 0 or earned > 0: - ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString ) | h} - %endif -

-

- ${section['format'] | h} - - %if section.get('due') is not None: - <% - formatted_string = get_time_display(section['due'], course.due_date_display_format, coerce_tz=settings.TIME_ZONE_DISPLAYED_FOR_DEADLINES) - due_date = '' if len(formatted_string)==0 else _(u'due {date}').format(date=formatted_string) - %> - - ${due_date | h} - - %endif -

- -
- %if len(section['scores']) > 0: -

${ _("Problem Scores: ") if section['graded'] else _("Practice Scores: ")}

-
    - %for score in section['scores']: -
  1. ${"{0:.3n}/{1:.3n}".format(float(score.earned),float(score.possible)) | h}
    2. - %endfor -
- %else: -

${_("No problem scores in this section")}

- %endif + %if show_generate_cert_btn: +
+
+ %if passed: +
+
+ <% post_url = reverse('generate_user_cert', args=[unicode(course.id)]) %> + % if is_downloadable: +
+

${_("Your certificate is available")}

+

+ ${_("You can keep working for a higher grade, or request your certificate now.")} +

+
+
+ %if show_cert_web_view and cert_web_view_url: + + ${_("View Certificate")} + + %elif download_url: + + ${_("Download Your Certificate")} + + %endif +
+ %elif is_generating: +
+ ## Translators: This message appears to users when the system is processessing course certificates, which can take a few hours. +

${_("We're working on it...")}

+

${_("We're creating your certificate. You can keep working in your courses and a link to it will appear here and on your Dashboard when it is ready.")}

+
+
+ %else: +
+

${_("Congratulations, you qualified for a certificate!")}

+

${_("You can keep working for a higher grade, or request your certificate now.")}

+
+
+ +
+ %endif
+
+ %endif +
+ %endif + + %if not course.disable_progress_graph: + + %endif + + % if credit_course_requirements: +
+
+
+

${_("Requirements for Course Credit")}

+
+ %if credit_course_requirements['eligibility_status'] == 'not_eligible': + ${_("{student_name}, you are no longer eligible for credit in this course.").format(student_name=student.profile.name) | h} + %elif credit_course_requirements['eligibility_status'] == 'eligible': + ${_("{student_name}, you have met the requirements for credit in this course.").format(student_name=student.profile.name) | h} + ${_("{a_start}Go to your dashboard{a_end} to purchase course credit.").format( + a_start=u"".format(url=reverse('dashboard')), + a_end="" + )} + + %elif credit_course_requirements['eligibility_status'] == 'partial_eligible': + ${_("{student_name}, you have not yet met the requirements for credit.").format(student_name=student.profile.name) | h} + %endif + ${_("Information about course credit requirements")}
+
+ %for requirement in credit_course_requirements['requirements']: +
+
+ ${_(requirement['display_name']) | h} + %if requirement['namespace'] == 'grade': + ${int(requirement['criteria']['min_grade'] * 100) | h}% + %endif +
+
+ %if requirement['status']: + %if requirement['status'] == 'submitted': + ${_("Verification Submitted")} + %elif requirement['status'] == 'failed': + + ${_("Verification Failed" )} + %elif requirement['status'] == 'declined': + + ${_("Verification Declined" )} + %elif requirement['status'] == 'satisfied': + + ${_("Completed by")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)} + %endif + %else: + ${_("Upcoming")} + %endif +
+
+ %endfor +
+ +
+
+ %endif + +
+ %for chapter in courseware_summary: + %if not chapter['display_name'] == "hidden": +
+

${ chapter['display_name'] | h}

+ +
+ %for section in chapter['sections']: +
+ <% + earned = section['section_total'].earned + total = section['section_total'].possible + percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 and total > 0 else "" + %> + +

+ ${ section['display_name'] | h} + %if total > 0 or earned > 0: + + ${_("{earned} of {total} possible points").format(earned='{:.3n}'.format(float(earned)), total='{:.3n}'.format(float(total))) | h} + + %endif + + %if total > 0 or earned > 0: + ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString ) | h} + %endif +

+

+ ${section['format'] | h} + + %if section.get('due') is not None: + <% + formatted_string = get_time_display(section['due'], course.due_date_display_format, coerce_tz=settings.TIME_ZONE_DISPLAYED_FOR_DEADLINES) + due_date = '' if len(formatted_string)==0 else _(u'due {date}').format(date=formatted_string) + %> + + ${due_date | h} + + %endif +

+ +
+ %if len(section['scores']) > 0: +

${ _("Problem Scores: ") if section['graded'] else _("Practice Scores: ")}

+
    + %for score in section['scores']: +
  1. ${"{0:.3n}/{1:.3n}".format(float(score.earned),float(score.possible)) | h}
    2. + %endfor +
+ %else: +

${_("No problem scores in this section")}

+ %endif +
-
+
+ %endfor +
+
+ %endif %endfor -
- - %endif - %endfor -
+
-
+ + - diff --git a/lms/templates/courseware/static_tab.html b/lms/templates/courseware/static_tab.html index 01ebd2fde7..56310061d0 100644 --- a/lms/templates/courseware/static_tab.html +++ b/lms/templates/courseware/static_tab.html @@ -16,8 +16,10 @@ <%include file="/courseware/course_navigation.html" args="active_page='static_tab_{0}'.format(tab['url_slug'])" /> -
-
- ${tab_contents} -
-
+
+
+
+ ${tab_contents} +
+
+
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index be5a13baa9..ecb8447cca 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -19,7 +19,6 @@ from openedx.core.djangolib.markup import Text, HTML <%block name="pagetitle">${_("Dashboard")} <%block name="bodyclass">view-dashboard is-authenticated -<%block name="nav_skip">#my-courses <%block name="header_extras"> % for template_name in ["donation"]: @@ -75,120 +74,122 @@ from openedx.core.djangolib.markup import Text, HTML %endif -
-
-
-

${_("My Courses")}

-
+
+
+
+
+

${_("My Courses")}

+
- % if len(course_enrollments) > 0: -
    - <% share_settings = getattr(settings, 'SOCIAL_SHARING_SETTINGS', {}) %> - % for dashboard_index, enrollment in enumerate(course_enrollments): - <% show_courseware_link = (enrollment.course_id in show_courseware_links_for) %> - <% cert_status = cert_statuses.get(enrollment.course_id) %> - <% can_unenroll = (not cert_status) or cert_status.get('can_unenroll') %> - <% credit_status = credit_statuses.get(enrollment.course_id) %> - <% show_email_settings = (enrollment.course_id in show_email_settings_for) %> - <% course_mode_info = all_course_modes.get(enrollment.course_id) %> - <% show_refund_option = (enrollment.course_id in show_refund_option_for) %> - <% is_paid_course = (enrollment.course_id in enrolled_courses_either_paid) %> - <% is_course_blocked = (enrollment.course_id in block_courses) %> - <% course_verification_status = verification_status_by_course.get(enrollment.course_id, {}) %> - <% course_requirements = courses_requirements_not_met.get(enrollment.course_id) %> - <% course_program_info = course_programs.get(unicode(enrollment.course_id)) %> - <%include file = 'dashboard/_dashboard_course_listing.html' args="course_overview=enrollment.course_overview, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, can_unenroll=can_unenroll, credit_status=credit_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, show_refund_option=show_refund_option, is_paid_course=is_paid_course, is_course_blocked=is_course_blocked, verification_status=course_verification_status, course_requirements=course_requirements, dashboard_index=dashboard_index, share_settings=share_settings, user=user, course_program_info=course_program_info" /> - % endfor - -
- % else: -
-

${_("You are not enrolled in any courses yet.")}

- - % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): - - ${_("Explore courses")} - - - %endif -
- % endif - - % if staff_access and len(errored_courses) > 0: -
-

${_("Course-loading errors")}

- - % for course_dir, errors in errored_courses.items(): -

${course_dir}

-
    - % for (msg, err) in errors: -
  • ${msg} - 
    • ${err}
    -
    • - % endfor -
- % endfor -
- % endif -
- - % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): - - % endif - - % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): -
- % endif - -
-
- -
- + + % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): + + % endif + + % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): +
+ % endif + +
+
+ +
+ +
+ % if xseries_credentials: +
+

${_("XSeries Program Certificates")}

+

${_("You have received a certificate for the following XSeries programs:")}

+ +
+ % endif
-
- % if xseries_credentials: -
-

${_("XSeries Program Certificates")}

-

${_("You have received a certificate for the following XSeries programs:")}

- -
- % endif -
+ diff --git a/lms/templates/edxnotes/edxnotes.html b/lms/templates/edxnotes/edxnotes.html index 04a08dacbe..37146f4a4b 100644 --- a/lms/templates/edxnotes/edxnotes.html +++ b/lms/templates/edxnotes/edxnotes.html @@ -20,7 +20,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
- +

@@ -93,7 +93,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str

% endif
- + diff --git a/lms/templates/index.html b/lms/templates/index.html index ddb0d66603..ea3ad096ef 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -5,48 +5,50 @@ from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse %> -
-
-
-
-
- % if homepage_overlay_html: - ${homepage_overlay_html} - % else: - ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information. -

${_("Welcome to Open edX!")}

- ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information. -

${_("It works! This is the default homepage for this Open edX instance.")}

+
+
+
+
+
+
+ % if homepage_overlay_html: + ${homepage_overlay_html} + % else: + ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information. +

${_("Welcome to Open edX!")}

+ ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information. +

${_("It works! This is the default homepage for this Open edX instance.")}

+ % endif +
+ % if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'): +
+
+ + +
+
+ % endif + +
+ + % if show_homepage_promo_video: + +
+
+
+ % endif
- % if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'): -
-
- - -
-
- % endif -
+
+ <%include file="${courses_list}" /> - % if show_homepage_promo_video: - -
-
-
- - % endif - - - - <%include file="${courses_list}" /> - -
+ + % if show_homepage_promo_video:
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html index 1e2a248080..8a60cc1a04 100644 --- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html +++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html @@ -20,7 +20,6 @@ from django.core.urlresolvers import reverse ## 6. And tests go in lms/djangoapps/instructor/tests/ <%block name="pagetitle">${_("Instructor Dashboard")} -<%block name="nav_skip">#content <%block name="headextra"> <%static:css group='style-course-vendor'/> @@ -86,41 +85,42 @@ from django.core.urlresolvers import reverse
-
-
- %if studio_url: - ${_("View Course in Studio")} - %endif -
+
+
+
+ %if studio_url: + ${_("View Course in Studio")} + %endif +
-

${_("Instructor Dashboard")}

+

${_("Instructor Dashboard")}

- %if analytics_dashboard_message: -
-

${analytics_dashboard_message}

-
- %endif + %if analytics_dashboard_message: +
+

${analytics_dashboard_message}

+
+ %endif - ## links which are tied to idash-sections below. - ## the links are activated and handled in instructor_dashboard.coffee - ## when the javascript loads, it clicks on the first section -
    - % for section_data in sections: - ## This is necessary so we don't scrape 'section_display_name' as a string. - <% dname = section_data['section_display_name'] %> -
  • ${_(dname)}
    • - % endfor -
+ ## links which are tied to idash-sections below. + ## the links are activated and handled in instructor_dashboard.coffee + ## when the javascript loads, it clicks on the first section +
    + % for section_data in sections: + ## This is necessary so we don't scrape 'section_display_name' as a string. + <% dname = section_data['section_display_name'] %> +
  • ${_(dname)}
    • + % endfor +
- ## each section corresponds to a section_data sub-dictionary provided by the view - ## to keep this short, sections can be pulled out into their own files + ## each section corresponds to a section_data sub-dictionary provided by the view + ## to keep this short, sections can be pulled out into their own files - % for section_data in sections: -
- <%include file="${ section_data['section_key'] }.html" args="section_data=section_data" /> -
- % endfor -
+ % for section_data in sections: +
+ <%include file="${ section_data['section_key'] }.html" args="section_data=section_data" /> +
+ % endfor +
+
- diff --git a/lms/templates/learner_dashboard/programs.html b/lms/templates/learner_dashboard/programs.html index d563522aa2..bff1cecade 100644 --- a/lms/templates/learner_dashboard/programs.html +++ b/lms/templates/learner_dashboard/programs.html @@ -18,8 +18,9 @@ ProgramListFactory({ <%block name="pagetitle">${_("Programs")} - -
-
-
-
+
+
+
+
+
+
diff --git a/lms/templates/main.html b/lms/templates/main.html index b7baaea2fc..808394e8cd 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -120,13 +120,13 @@ from pipeline_mako import render_require_js_path_overrides % if not disable_window_wrap:
% endif - #content">${_("Skip to main content")} + ${_("Skip to main content")} % if not disable_header: <%include file="${static.get_template_path('header.html')}" /> % endif -
+
${self.body()} <%block name="bodyextra"/>
diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html index f31f791bf5..80dafdf974 100644 --- a/lms/templates/main_django.html +++ b/lms/templates/main_django.html @@ -24,11 +24,11 @@
- {% trans "Skip to main content" %} + {% trans "Skip to main content" %} {% with course=request.course %} {% include "header.html"|microsite_template_path %} {% endwith %} -
+
{% block body %}{% endblock %} {% block bodyextra %}{% endblock %}
diff --git a/lms/templates/static_templates/404.html b/lms/templates/static_templates/404.html index 5929f6910b..5e37c3881e 100644 --- a/lms/templates/static_templates/404.html +++ b/lms/templates/static_templates/404.html @@ -8,11 +8,13 @@ from openedx.core.djangolib.markup import Text, HTML <%block name="pagetitle">${_("Page Not Found")} -
-

${_("Page not found")}

-

${Text(_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} or let us know about any pages that may have been moved at {email}.')).format( - link_start=HTML(''), - link_end=HTML(''), - email=HTML('{email}').format(email=Text(static.get_tech_support_email_address())) - )}

-
+
+
+

${_("Page not found")}

+

${Text(_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} or let us know about any pages that may have been moved at {email}.')).format( + link_start=HTML(''), + link_end=HTML(''), + email=HTML('{email}').format(email=Text(static.get_tech_support_email_address())) + )}

+
+
diff --git a/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html index 33dc300327..fb9f67cf3f 100644 --- a/lms/templates/static_templates/about.html +++ b/lms/templates/static_templates/about.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("About")} -
-

${_("About")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("About")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/blog.html b/lms/templates/static_templates/blog.html index d5b64246c1..35256fc055 100644 --- a/lms/templates/static_templates/blog.html +++ b/lms/templates/static_templates/blog.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Blog")} -
-

${_("Blog")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Blog")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html index 2306938322..63546766aa 100644 --- a/lms/templates/static_templates/contact.html +++ b/lms/templates/static_templates/contact.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Contact")} -
-

${_("Contact")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Contact")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/donate.html b/lms/templates/static_templates/donate.html index 7f807557b0..141e6b52f8 100644 --- a/lms/templates/static_templates/donate.html +++ b/lms/templates/static_templates/donate.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Donate")} -
-

${_("Donate")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Donate")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/embargo.html b/lms/templates/static_templates/embargo.html index 7eb4ecb302..faa89a9570 100644 --- a/lms/templates/static_templates/embargo.html +++ b/lms/templates/static_templates/embargo.html @@ -7,14 +7,16 @@ from openedx.core.djangolib.markup import Text, HTML <%block name="pagetitle">${_("This Course Unavailable In Your Country")} -
-

-${Text(_("Our system indicates that you are trying to access this {platform_name} " - "course from a country or region currently subject to U.S. economic and trade " - "sanctions. Unfortunately, at this time {platform_name} must comply with " - "export controls, and we cannot allow you to access this course." - )).format( - platform_name=Text(settings.PLATFORM_NAME), - )} -

-
+
+
+

+ ${Text(_("Our system indicates that you are trying to access this {platform_name} " + "course from a country or region currently subject to U.S. economic and trade " + "sanctions. Unfortunately, at this time {platform_name} must comply with " + "export controls, and we cannot allow you to access this course." + )).format( + platform_name=Text(settings.PLATFORM_NAME), + )} +

+
+
diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html index 8bc016092e..77091bbeb2 100644 --- a/lms/templates/static_templates/faq.html +++ b/lms/templates/static_templates/faq.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("FAQ")} -
-

${_("FAQ")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("FAQ")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html index 49c27fd86a..46a11109d3 100644 --- a/lms/templates/static_templates/help.html +++ b/lms/templates/static_templates/help.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Help")} -
-

${_("Help")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Help")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/honor.html b/lms/templates/static_templates/honor.html index 8659528eb5..4ddb37d76a 100644 --- a/lms/templates/static_templates/honor.html +++ b/lms/templates/static_templates/honor.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Honor Code")} -
-

${_("Honor Code")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Honor Code")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/jobs.html b/lms/templates/static_templates/jobs.html index 0b1c9f1e28..0b0e6bb2ea 100644 --- a/lms/templates/static_templates/jobs.html +++ b/lms/templates/static_templates/jobs.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Jobs")} -
-

${_("Jobs")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Jobs")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/media-kit.html b/lms/templates/static_templates/media-kit.html index 3fd01e0e0d..e772e6b643 100644 --- a/lms/templates/static_templates/media-kit.html +++ b/lms/templates/static_templates/media-kit.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Media Kit")} -
-

${_("Media Kit")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Media Kit")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/news.html b/lms/templates/static_templates/news.html index 7b5737783e..b755678218 100644 --- a/lms/templates/static_templates/news.html +++ b/lms/templates/static_templates/news.html @@ -5,7 +5,9 @@ <%block name="pagetitle">${_("In the Press")} -
-

${_("In the Press")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("In the Press")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/press.html b/lms/templates/static_templates/press.html index 7b5737783e..b755678218 100644 --- a/lms/templates/static_templates/press.html +++ b/lms/templates/static_templates/press.html @@ -5,7 +5,9 @@ <%block name="pagetitle">${_("In the Press")} -
-

${_("In the Press")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("In the Press")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/privacy.html b/lms/templates/static_templates/privacy.html index 1eb1d5aba3..36943d6ea5 100644 --- a/lms/templates/static_templates/privacy.html +++ b/lms/templates/static_templates/privacy.html @@ -5,7 +5,9 @@ <%block name="pagetitle">${_("Privacy Policy")} -
-

${_("Privacy Policy")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Privacy Policy")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/static_templates/server-down.html b/lms/templates/static_templates/server-down.html index cb546b826a..8b4f5efbf1 100644 --- a/lms/templates/static_templates/server-down.html +++ b/lms/templates/static_templates/server-down.html @@ -1,19 +1,21 @@ <%page expression_filter="h"/> <%! -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext as _ from openedx.core.djangolib.markup import Text, HTML %> <%inherit file="../main.html" /> -
-

- ${Text(_("Currently the {platform_name} servers are down")).format( - platform_name=HTML(u"{}").format(Text(settings.PLATFORM_NAME)) - )} -

-

- ${Text(_("Our staff is currently working to get the site back up as soon as possible. " - "Please email us at {tech_support_email} to report any problems or downtime.")).format( - tech_support_email=HTML('{0}').format(Text(settings.TECH_SUPPORT_EMAIL)) - )}

-
+
+
+

+ ${Text(_("Currently the {platform_name} servers are down")).format( + platform_name=HTML(u"{}").format(Text(settings.PLATFORM_NAME)) + )} +

+

+ ${Text(_("Our staff is currently working to get the site back up as soon as possible. " + "Please email us at {tech_support_email} to report any problems or downtime.")).format( + tech_support_email=HTML('{0}').format(Text(settings.TECH_SUPPORT_EMAIL)) + )}

+
+
diff --git a/lms/templates/static_templates/server-error.html b/lms/templates/static_templates/server-error.html index 69fb62cc25..4993a6033b 100644 --- a/lms/templates/static_templates/server-error.html +++ b/lms/templates/static_templates/server-error.html @@ -6,17 +6,19 @@ from openedx.core.djangolib.markup import Text, HTML %> <%inherit file="../main.html" /> -
-

- ${Text(_(u"There has been a 500 error on the {platform_name} servers")).format( - platform_name=HTML("{platform_name}").format(platform_name=Text(static.get_platform_name())) - )} -

-

- ${Text(_('Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.')).format( - email=HTML('{email}').format( - email=Text(static.get_tech_support_email_address()) - ) - )} -

-
+
+
+

+ ${Text(_(u"There has been a 500 error on the {platform_name} servers")).format( + platform_name=HTML("{platform_name}").format(platform_name=Text(static.get_platform_name())) + )} +

+

+ ${Text(_('Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.')).format( + email=HTML('{email}').format( + email=Text(static.get_tech_support_email_address()) + ) + )} +

+
+
diff --git a/lms/templates/static_templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html index 00daab5217..09fe1a11de 100644 --- a/lms/templates/static_templates/server-overloaded.html +++ b/lms/templates/static_templates/server-overloaded.html @@ -5,16 +5,18 @@ from openedx.core.djangolib.markup import Text, HTML %> <%inherit file="../main.html" /> -
-

- ${Text(_("Currently the {platform_name} servers are overloaded")).format( - platform_name=HTML("{}").format(platform_name=Text(settings.PLATFORM_NAME)) - )} -

-

- ${Text(_("Our staff is currently working to get the site back up as soon as possible. " - "Please email us at {tech_support_email} to report any problems or downtime.")).format( - tech_support_email=HTML('{0}').format(tech_support_email=Text(settings.TECH_SUPPORT_EMAIL)) - )} -

-
+
+
+

+ ${Text(_("Currently the {platform_name} servers are overloaded")).format( + platform_name=HTML("{}").format(platform_name=Text(settings.PLATFORM_NAME)) + )} +

+

+ ${Text(_("Our staff is currently working to get the site back up as soon as possible. " + "Please email us at {tech_support_email} to report any problems or downtime.")).format( + tech_support_email=HTML('{0}').format(tech_support_email=Text(settings.TECH_SUPPORT_EMAIL)) + )} +

+
+
diff --git a/lms/templates/static_templates/tos.html b/lms/templates/static_templates/tos.html index 74f786b552..87edbad6ef 100644 --- a/lms/templates/static_templates/tos.html +++ b/lms/templates/static_templates/tos.html @@ -4,7 +4,9 @@ <%block name="pagetitle">${_("Terms of Service")} -
-

${_("Terms of Service")}

-

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

-
+
+
+

${_("Terms of Service")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

+
+
diff --git a/lms/templates/student_account/account_settings.html b/lms/templates/student_account/account_settings.html index 61d465a9c6..723a6d4c92 100644 --- a/lms/templates/student_account/account_settings.html +++ b/lms/templates/student_account/account_settings.html @@ -16,7 +16,6 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str <%namespace name='static' file='/static_content.html'/> <%block name="pagetitle">${_("Account Settings")} -<%block name="nav_skip">#content % if duplicate_provider:
@@ -37,7 +36,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str var platformName = '${ static.get_platform_name() | n, js_escaped_string }'; AccountSettingsFactory( - fieldsData, + fieldsData, authData, '${ user_accounts_api_url | n, js_escaped_string }', '${ user_preferences_api_url | n, js_escaped_string }', diff --git a/lms/templates/student_account/account_settings.underscore b/lms/templates/student_account/account_settings.underscore index 58207d1206..6292dbdb91 100644 --- a/lms/templates/student_account/account_settings.underscore +++ b/lms/templates/student_account/account_settings.underscore @@ -1,3 +1,4 @@ +
+
diff --git a/lms/templates/student_account/login_and_register.html b/lms/templates/student_account/login_and_register.html index dc01423f01..0279fa9895 100644 --- a/lms/templates/student_account/login_and_register.html +++ b/lms/templates/student_account/login_and_register.html @@ -33,5 +33,7 @@
- diff --git a/lms/templates/student_profile/learner_profile.html b/lms/templates/student_profile/learner_profile.html index 7ba3b89ab9..8f97435700 100644 --- a/lms/templates/student_profile/learner_profile.html +++ b/lms/templates/student_profile/learner_profile.html @@ -9,16 +9,17 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json %> <%block name="pagetitle">${_("Learner Profile")} -<%block name="nav_skip">#content <%block name="bodyclass">view-profile
-
-
-

${_("Loading")}

+
+
+
+

${_("Loading")}

+
-
+ <%block name="headextra"> <%static:css group='style-course'/> diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html index f06d93ea44..0a4d1d659f 100644 --- a/lms/templates/wiki/article.html +++ b/lms/templates/wiki/article.html @@ -7,22 +7,23 @@ {% block wiki_breadcrumbs %} {% include "wiki/includes/breadcrumbs.html" %} {% endblock %} -{% block nav_skip %}#main-article{% endblock %} {% block wiki_contents %}
-
- {% if selected_tab != "edit" %} -

{{ article.current_revision.title }}

+
+
+ {% if selected_tab != "edit" %} +

{{ article.current_revision.title }}

- {% endif %} + {% endif %} - {% block wiki_contents_tab %} - {% wiki_render article %} - {% endblock %} -
+ {% block wiki_contents_tab %} + {% wiki_render article %} + {% endblock %} +
+
    diff --git a/lms/templates/wiki/base.html b/lms/templates/wiki/base.html index 6223193d50..c8f5eadf29 100644 --- a/lms/templates/wiki/base.html +++ b/lms/templates/wiki/base.html @@ -47,8 +47,6 @@ {% endblock %} -{% block nav_skip %}#wiki-content{% endblock %} - {% block body %} {% if request.course %} {% with course=request.course %} @@ -56,6 +54,7 @@ {% endwith %} {% endif %} +
    {% block wiki_body %} @@ -77,5 +76,6 @@
    +
    {% endblock %} diff --git a/themes/edx.org/lms/templates/dashboard.html b/themes/edx.org/lms/templates/dashboard.html index 51476bc934..afe2874655 100644 --- a/themes/edx.org/lms/templates/dashboard.html +++ b/themes/edx.org/lms/templates/dashboard.html @@ -20,7 +20,6 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str <%block name="pagetitle">${_("Dashboard")} <%block name="bodyclass">view-dashboard is-authenticated -<%block name="nav_skip">#my-courses <%block name="header_extras"> % for template_name in ["donation"]: @@ -77,7 +76,8 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
-
+
+

${_("My Courses")}

@@ -132,6 +132,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
% endif
+ % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'):