-
Notifications
You must be signed in to change notification settings - Fork 168
First attempt at breadcrumbs. #2738
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.
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
Open
LukasMansour
wants to merge
10
commits into
e-valuation:main
Choose a base branch
from
LukasMansour:link-if-not-self-breadcrumbs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a97d89d
First attempt at breadcrumbs.
LukasMansour 1284806
Second attempt at breadcrumbs.
LukasMansour 9996ccf
URL resolving by block tag.
LukasMansour 28e8898
Two forgotten files
LukasMansour 33dd7b9
Fix small mistakes that fail tests
LukasMansour 3c3640a
Fix disabled breadcrumbs, remove redundant variable.
LukasMansour 5829859
Use breadcrumb block tag everywhere
LukasMansour 0961bbe
Merge remote-tracking branch 'upstream/main' into link-if-not-self-br…
LukasMansour e389c81
Fix djangofmt with custom breadcrumb tag.
LukasMansour 5933f3c
Small improvements to some html templates.
LukasMansour File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| {% extends 'grades_semester_base.html' %} | ||
| {% load staff_templatetags %} | ||
|
|
||
| {% block title %}{{ course.name }} - {{ block.super }}{% endblock %} | ||
|
|
||
| {% block breadcrumb %} | ||
| {{ block.super }} | ||
| {% if course %} | ||
| {% if disable_breadcrumb_course %} | ||
| <li class="breadcrumb-item">{{ course.name }}</li> | ||
| {% else %} | ||
| <li class="breadcrumb-item"><a href="{% url 'grades:course_view' course.id %}">{{ course.name }}</a></li> | ||
| {% endif %} | ||
| {% breadcrumb_item_url 'grades:course_view' course.id %} | ||
| {{ course.name }} | ||
| {% endbreadcrumb_item_url %} | ||
| {% endif %} | ||
| {% endblock %} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,21 @@ | ||
| {% extends 'grades_base.html' %} | ||
|
|
||
| {% load evaluation_filters %} | ||
| {% load staff_templatetags %} | ||
|
|
||
| {% block title %}{{ semester.name }} - {{ block.super }}{% endblock %} | ||
|
|
||
| {% block breadcrumb %} | ||
| {{ block.super }} | ||
| {% if semester %} | ||
| {% if disable_breadcrumb_semester or not user.is_grade_publisher %} | ||
| <li class="breadcrumb-item">{{ semester.name }}</li> | ||
| {% if not user.is_grade_publisher %} | ||
| {% breadcrumb_item %} | ||
| {{ semester.name }} | ||
| {% endbreadcrumb_item %} | ||
| {% else %} | ||
| <li class="breadcrumb-item"> | ||
| <a href="{% url 'grades:semester_view' semester.id %}">{{ semester.name }}</a> | ||
| </li> | ||
| {% breadcrumb_item_url 'grades:semester_view' semester.id %} | ||
| {{ semester.name }} | ||
| {% endbreadcrumb_item_url %} | ||
| {% endif %} | ||
| {% endif %} | ||
| {% endblock %} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 8 additions & 6 deletions
14
evap/rewards/templates/rewards_reward_point_redemption_event_form.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
evap/rewards/templates/rewards_reward_point_redemption_events.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 9 additions & 2 deletions
11
evap/staff/templates/staff_course_type_merge_selection.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.