Admin missing translations and tiny improvements. #2023
Conversation
This file contains 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
🧪 Review environmenthttps://cqf2wmzgzrikyse3gcfucku2mq0fjvmr.lambda-url.ca-central-1.on.aws/ |
amazingphilippe
commented
Dec 20, 2024
| <p class="mb-0 text-base text-gray-800">{{ message }}</p> | ||
| {% macro empty_list(heading, message=None, img="emptyFlower", link=None, linkText="", attributes="") %} | ||
| <div | ||
| class="flex items-center border-dashed border-1 border-gray-400 p-8 sm:bg-{{img}} sm:bg-right bg-empty-state min-h-emptyState" |
There was a problem hiding this comment.
I've only added a min-height. The rest is auto formatting.
amazingphilippe
commented
Dec 20, 2024
| <td class="table-empty-message p-6" colspan="10"> | ||
| {{ empty_message }} | ||
| <td class="table-empty-message h-10" colspan="10"> | ||
| {{ empty_list(heading=empty_message) }} |
There was a problem hiding this comment.
Why not use the empty component!
amazingphilippe
commented
Dec 20, 2024
| {% macro row_heading(cell_width=None) -%} | ||
| <th class="table-field {{ cell_width if cell_width}}" scope="row"> | ||
| {% macro row_heading(cell_width=None, rowspan="1") -%} | ||
| <th class="table-field {{ cell_width if cell_width}}" scope="row" rowspan="{{ rowspan }}"> |
There was a problem hiding this comment.
This lets us create <th> that span many rows, like we have on the admin panel for each service usage. Defaults to 1
amazingphilippe
commented
Dec 20, 2024
| <li> | ||
| <a href="{{ url_for('.organisation_dashboard', org_id=current_org.id) }}" {{ org_navigation.is_selected('dashboard') | ||
| }}> | ||
| {{ _("Usage") }} |
There was a problem hiding this comment.
This looks worse than it is, I simply added the _() calls and reformated the html.
amazingphilippe
commented
Dec 20, 2024
| @@ -103,7 +103,7 @@ | |||
| {{ nav_menu_item(url=url_for('main.contact', service_id=current_service.id),localised_txt=_('Contact us'), is_active=header_navigation.is_selected('contact')) }} | |||
| {% endif %} | |||
| {% else %} {# current_user.platform_admin #} | |||
| {% if not platform_admin_view_ind %} | |||
|
|
|||
There was a problem hiding this comment.
This fixes the empty main navigation in platform admin. ✨ No more layout shift ✨ 🎉
amazingphilippe
commented
Dec 20, 2024
| @@ -113,9 +113,10 @@ | |||
| {{ nav_menu_item(url=url_for('main.service_settings', service_id=current_service.id),localised_txt=_('Settings'), is_active=header_navigation.is_selected('settings')) }} | |||
| {% else %} {# not current_user.has_permissions, i.e. services not in context #} | |||
| {{ nav_menu_item(url=url_for('main.choose_account'),localised_txt=_('Your services'),css_classes='pl-0',id_key='choose_account', is_active=header_navigation.is_selected('choose_account')) }} | |||
| {{ nav_menu_item(url=url_for('main.live_services', service_id=current_service.id),localised_txt=_('Admin panel')) }} | |||
| {{ nav_menu_item(url=url_for('main.live_services', service_id=current_service.id),localised_txt=_('Admin panel'), | |||
| is_active=header_navigation) }} | |||
There was a problem hiding this comment.
Just adding the aria-current
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary | Résumé
This addresses cds-snc/notification-planning#998
Test instructions | Instructions pour tester la modification