diff --git a/comprehensive/lms/templates/navigation.html b/comprehensive/lms/templates/navigation.html index f49b1a2..981678d 100644 --- a/comprehensive/lms/templates/navigation.html +++ b/comprehensive/lms/templates/navigation.html @@ -65,112 +65,115 @@ site_status_msg = get_site_status_msg(course_id) % if not enable_account_linking: - % if course: -

${course.display_org_with_default}: - ${course.display_number_with_default} - <% - display_name = course.display_name_with_default - if settings.FEATURES.get('CUSTOM_COURSES_EDX', False): - ccx = get_current_ccx(course.id) - if ccx: - display_name = ccx.display_name - %> - ${display_name}

- % endif - - % if user.is_authenticated(): -
    - <%block name="navigation_global_links_authenticated"> - % if settings.FEATURES.get('COURSES_ARE_BROWSABLE') and not show_program_listing: -
  1. - ${_('Explore courses')} -
    2. + % if course: +

    ${course.display_org_with_default}: + ${course.display_number_with_default} + <% + display_name = course.display_name_with_default + if settings.FEATURES.get('CUSTOM_COURSES_EDX', False): + ccx = get_current_ccx(course.id) + if ccx: + display_name = ccx.display_name + %> + ${display_name}

    % endif - % if show_program_listing: -
  2. - - ${_("Courses")} - -
    3. -
  3. - - ${_("Programs")} - -
    4. - % endif - %if settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD','') and user.is_staff: -
  4. - ## Translators: This is short for "System administration". - ${_("System Admin")} -
    5. - %endif - -
- <%include file="user_dropdown.html"/> - - % if should_display_shopping_cart_func() and not (course and static.is_request_in_themed_site()): # see shoppingcart.context_processor.user_has_cart_context_processor -
    -
  1. - - ${_("Shopping Cart")} - -
    2. -
- % endif - % else: -
    - <%block name="navigation_global_links"> - % if static.get_value('ENABLE_MKTG_SITE', settings.FEATURES.get('ENABLE_MKTG_SITE', False)): -
  1. - ${_("How it Works")} -
    2. - % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): -
  2. - ${_("Courses")} -
    3. - % endif -
  3. - ${_("Schools")} -
    4. - % endif - - - <%block name="navigation_other_global_links"> - % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']: - % if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY') or course: -
  4. - ${_("Explore Courses")} -
    5. - % endif - % endif - -
- -
    - <%block name="navigation_sign_in"> - % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']: - % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain: -
  1. - ${_("Register Now")} -
    2. - % else: -
  2. - ${_("Register Now")} -
    3. - % endif - % endif -
  3. - % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']: - % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain: - ${_("Sign in")} - % else: - ${_("Sign in")} + % if user.is_authenticated(): +
      + <%block name="navigation_global_links_authenticated"> + % if settings.FEATURES.get('COURSES_ARE_BROWSABLE') and not show_program_listing: +
    1. + ${_('Explore courses')} +
      2. % endif + % if show_program_listing: +
    2. + + ${_("Courses")} + +
      3. +
    3. + + ${_("Programs")} + +
      4. + % endif + %if settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD','') and user.is_staff: +
    4. + ## Translators: This is short for "System administration". + ${_("System Admin")} +
      5. + %endif + +
    + + <%include file="user_dropdown.html"/> + + % if should_display_shopping_cart_func() and not (course and static.is_request_in_themed_site()): # see shoppingcart.context_processor.user_has_cart_context_processor +
      +
    1. + + ${_("Shopping Cart")} + +
      2. +
    + % endif + % else: +
      + <%block name="navigation_global_links"> + % if static.get_value('ENABLE_MKTG_SITE', settings.FEATURES.get('ENABLE_MKTG_SITE', False)): +
    1. + ${_("How it Works")} +
      2. + % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): +
    2. + ${_("Courses")} +
      3. + % endif +
    3. + ${_("Schools")} +
      4. + % endif + + + <%block name="navigation_other_global_links"> + % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']: + % if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY') or course: +
    4. + ${_("Explore Courses")} +
      5. + % endif + % endif + +
    + +
      + <%block name="navigation_sign_in"> + % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']: + % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain: +
    1. + ${_("Register Now")} +
      2. + % else: +
    2. + ${_("Register Now")} +
      3. + % endif % endif - - -
    +
  4. + % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']: + % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain: + ${_("Sign in")} + % else: + ${_("Sign in")} + % endif + % endif +
    5. + +
+ % endif + % else: + <%include file="user_dropdown.html"/> % endif % if static.show_language_selector(): <% languages = static.get_released_languages() %> @@ -200,7 +203,6 @@ site_status_msg = get_site_status_msg(course_id) % endif % endif - % endif % if course: diff --git a/comprehensive/lms/templates/user_dropdown.html b/comprehensive/lms/templates/user_dropdown.html index f3b581e..18cda55 100644 --- a/comprehensive/lms/templates/user_dropdown.html +++ b/comprehensive/lms/templates/user_dropdown.html @@ -28,7 +28,7 @@ from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_ ${_("Usermenu dropdown")} -