Skip to content

Handle None in course breadcrumbs #27900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mbasaglia wants to merge 2 commits into from
Closed

Handle None in course breadcrumbs #27900

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
588881a
fix: Handle None in course breadcrumbs
Jun 9, 2021
9d80f4e
Merge remote-tracking branch 'origin/master' into mattia/BB-4305
Jun 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions lms/templates/courseware/courseware.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,21 +181,29 @@
<span class="nav-item nav-item-course">
<a href="${course_url}">${course_home_page_title(course)}</a>
</span>
<span class="icon fa fa-angle-right" aria-hidden="true"></span>
% if chapter or section or sequence_title:
<span class="icon fa fa-angle-right" aria-hidden="true"></span>
% endif
Comment on lines +184 to +186

@Agrendalath Agrendalath Jun 13, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbasaglia, what's the point of having these checks? Why don't we just move these arrows to the next items, like I've suggested to you before?

We'll also need to move the fa-angle-right arrows to be displayed before the text to avoid having a trailing arrow when the unit's name is unavailable.

Instead of duplicating conditions, we could simply do something like:

% if sequence_title:
    <span class="icon fa fa-angle-right" aria-hidden="true"></span>
    <span class="nav-item nav-item-sequence">${sequence_title}</span>
% endif</span>

@mbasaglia mbasaglia Jun 13, 2021

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's to also avoid extra leading icons, since you can't assume you have a previous item

@Agrendalath Agrendalath Jun 13, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbasaglia, in this case, we can completely remove these spans and rely on the CSS instead of adding extra logic to templates.
We can remove this and add the following as the last rule of the .nav-item class:

&:not(:last-child)::after {
    content: '\f105';
    font-family: FontAwesome;

    @include margin-left($baseline/4);

    display: inline-block;
    color: $body-color;

    @include rtl {
      @include transform(rotateY(180deg));
    }
}

Note: I've intentionally skipped media-breakpoint-down here, as it's broken on mobile resolutions.

% endif
% if chapter:
<span class="nav-item nav-item-chapter" data-course-position="${course.position}" data-chapter-position="${chapter.position}">
<a href="${course_url}#${six.text_type(chapter.location)}">${chapter.display_name_with_default}</a>
</span>
<span class="icon fa fa-angle-right" aria-hidden="true"></span>
% if section or sequence_title:
<span class="icon fa fa-angle-right" aria-hidden="true"></span>
% endif
% endif
% if section:
<span class="nav-item nav-item-section">
<a href="${course_url}#${six.text_type(section.location)}">${section.display_name_with_default}</a>
</span>
<span class="icon fa fa-angle-right" aria-hidden="true"></span>
% if sequence_title:
<span class="icon fa fa-angle-right" aria-hidden="true"></span>
% endif
% endif
% if sequence_title:
<span class="nav-item nav-item-sequence">${sequence_title}</span>
% endif
<span class="nav-item nav-item-sequence">${sequence_title}</span>
</div>
</div>
</nav>
Expand Down