Skip to content
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

standardize clr rounds display to uppercase #8004

Merged
merged 2 commits into from
Dec 3, 2020
Merged

standardize clr rounds display to uppercase #8004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
114897c
clr rounds display texts to uppercase
chibie Dec 2, 2020
3a4e150
fix in landing page
chibie Dec 2, 2020
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
6 changes: 3 additions & 3 deletions app/grants/templates/grants/shared/active_clr_round.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
</div>
<h5 class="font-weight-bold my-auto">
{% if active_round.display_text %}
{{ active_round.display_text }}
{{ active_round.display_text|upper }}
{% elif active_round.customer_name %}
{{ active_round.customer_name }} - {{ active_round.round_num }}
{{ active_round.customer_name|upper }} - {{ active_round.round_num }}
{% elif active_round.sub_round_slug %}
{{ active_round.sub_round_slug|title }} - {{ active_round.round_num }}
{{ active_round.sub_round_slug|upper }} - {{ active_round.round_num }}
{% else %}
{{ active_round.round_num }}
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions app/grants/templates/grants/shared/sidebar_search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<a href="/grants/clr{% if active_round.customer_name %}/{{ active_round.customer_name }}{% endif %}{% if active_round.round_num %}/{{ active_round.round_num }}{% endif %}{% if active_round.sub_round_slug %}/{{ active_round.sub_round_slug }}{% endif %}"
:class="`btn btn-link font-smaller-1 text-decoration-none text-left ml-0 pl-0 ${ idle_grants ? 'gc-text-blue' : 'text-black'}`">
{% if active_round.display_text %}
{{ active_round.display_text }}
{{ active_round.display_text|upper }}
{% elif active_round.customer_name %}
{{ active_round.customer_name }} - {{ active_round.round_num }}
{{ active_round.customer_name|upper }} - {{ active_round.round_num }}
{% elif active_round.sub_round_slug %}
{{ active_round.sub_round_slug|title }} - {{ active_round.round_num }}
{{ active_round.sub_round_slug|upper }} - {{ active_round.round_num }}
{% else %}
{{ active_round.round_num }}
{% endif %}
Expand Down