From 96bd0a55b2fd79f123a6d9fb85a7ffa1c389277f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 21 Jun 2019 14:12:19 +0100 Subject: [PATCH] Move the breadcrumb inside the link Putting the background image on the preceding breadcrumb item will allow us to replace it with a pseudo element in a subsequent commit. --- .../stylesheets/components/navigation.scss | 17 ++++++----------- app/templates/org_template.html | 7 +++---- .../views/organisations/add-organisation.html | 4 +--- app/templates/withnav_template.html | 3 +-- tests/app/main/views/test_dashboard.py | 15 ++++++++++----- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss index 108e3d5f1..294f1fa90 100644 --- a/app/assets/stylesheets/components/navigation.scss +++ b/app/assets/stylesheets/components/navigation.scss @@ -4,7 +4,6 @@ &-service { - padding: 11px 0 9px 0; border-bottom: 1px solid $border-colour; margin: 0 0 10px; position: relative; @@ -41,16 +40,6 @@ } - &-breadcrumb { - display: inline-block; - width: 6px; - height: 11px; - margin: 0 5px; - background-image: file-url("separator-2x.png"); - background-size: 6px 11px; - background-repeat: no-repeat; - } - &-organisation-link { @include core-19; display: inline-block; @@ -60,6 +49,12 @@ text-overflow: ellipsis; font-weight: normal; text-decoration: none; + background-image: file-url("separator-2x.png"); + background-size: 6px 11px; + background-repeat: no-repeat; + background-position: right 10px top 5px; + padding-right: 25px; + box-sizing: border-box; } li { diff --git a/app/templates/org_template.html b/app/templates/org_template.html index 4056094c4..3d2eb417f 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -7,11 +7,10 @@ {% block fullwidth_content %}
+ {% if current_user.platform_admin %} + All organisations + {% endif %}
- {% if current_user.platform_admin %} - Organisations - - {% endif %} {{ current_org.name }}
Switch service diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html index 1f72072b6..8d2a28077 100644 --- a/app/templates/views/organisations/add-organisation.html +++ b/app/templates/views/organisations/add-organisation.html @@ -12,9 +12,7 @@ {% block fullwidth_content %}
-
- All organisations -
+ All organisations Switch service
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index b3af8dbe0..523a17a08 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -10,8 +10,7 @@ {% if current_service.organisation_id %} {% if current_user.platform_admin or (current_user.belongs_to_organisation(current_service.organisation_id) and current_service.live) %} - {{ current_service.organisation.name }} - + {{ current_service.organisation.name }} {% endif %} {% endif %}
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 6b3b4b649..cee7165fd 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -1346,7 +1346,7 @@ def test_org_breadcrumbs_do_not_show_if_service_has_no_org( ): page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID) - assert not page.select('.navigation-breadcrumb') + assert not page.select('.navigation-organisation-link') def test_org_breadcrumbs_do_not_show_if_user_is_not_an_org_member( @@ -1369,7 +1369,7 @@ def test_org_breadcrumbs_do_not_show_if_user_is_not_an_org_member( client_request.login(active_caseworking_user, service=service_one_json) page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID, _follow_redirects=True) - assert not page.select('.navigation-breadcrumb') + assert not page.select('.navigation-organisation-link') def test_org_breadcrumbs_show_if_user_is_a_member_of_the_services_org( @@ -1391,8 +1391,10 @@ def test_org_breadcrumbs_show_if_user_is_a_member_of_the_services_org( mocker.patch('app.models.service.Organisation') page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID) - - assert page.select('.navigation-breadcrumb') + assert page.select_one('.navigation-organisation-link')['href'] == url_for( + 'main.organisation_dashboard', + org_id=ORGANISATION_ID, + ) def test_org_breadcrumbs_do_not_show_if_user_is_a_member_of_the_services_org_but_service_is_in_trial_mode( @@ -1435,4 +1437,7 @@ def test_org_breadcrumbs_show_if_user_is_platform_admin( response = logged_in_platform_admin_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID)) page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') - assert page.select('.navigation-breadcrumb') + assert page.select_one('.navigation-organisation-link')['href'] == url_for( + 'main.organisation_dashboard', + org_id=ORGANISATION_ID, + )