From 344e55745945c226b03f4b0f2984587d63ea036d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Mon, 16 May 2022 22:16:30 +0200 Subject: [PATCH 1/2] Fix alignment for settings cards --- app/assets/stylesheets/_global.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/_global.scss b/app/assets/stylesheets/_global.scss index 54cfc11ff..8aa32847a 100644 --- a/app/assets/stylesheets/_global.scss +++ b/app/assets/stylesheets/_global.scss @@ -43,6 +43,8 @@ hr { } .centered { text-align: center; + display: flex; + justify-content: center; } .absolute-right { position: absolute; @@ -117,6 +119,7 @@ a[title="Back"] { .box { background: $white; padding: 25px; + width: 100%; &.small { padding: 10px; From 457992ee207ceaa483e2373d89d4567062e0d345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Mon, 16 May 2022 22:16:50 +0200 Subject: [PATCH 2/2] Move items from main nav to settings page --- app/views/home/settings.html.haml | 28 ++++++++++++++++++++++++++++ app/views/shared/_header_nav.haml | 24 +++++------------------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app/views/home/settings.html.haml b/app/views/home/settings.html.haml index fca6deda9..fb89748ab 100644 --- a/app/views/home/settings.html.haml +++ b/app/views/home/settings.html.haml @@ -26,3 +26,31 @@ = setting_card title: pluralize(@policies_count, "Policy"), href: policies_path, icon: 'icon-outline-sharing-request xx-large' do |c| - c.body do Share test results with health organization + + - if has_access_to_users_index? + -# Devise clears the controller param for users index + = setting_card title: "Users", href: users_path, icon: 'icon-outline-user xx-large' do |c| + - c.body do + Manage users on your team + +.row.center + - if has_access_to_devices_index? + = setting_card title: "Devices", href: devices_path, icon: 'icon-outline-device xx-large' do |c| + - c.body do + Manage test devices in your inventory + + - if has_access?(Device, Policy::Actions::SUPPORT_DEVICE) + = setting_card title: "Device Logs", href: device_messages_path, icon: 'icon-outline-report xx-large' do |c| + - c.body do + Investigate device logs + + - if has_access_to_device_models_index? + = setting_card title: "Device Models", href: device_models_path, icon: 'icon-outline-model xx-large' do |c| + - c.body do + Configure device models + +.row.center + - if has_access_to_sites_index? + = setting_card title: "Sites", href: sites_path, icon: 'icon-outline-site xx-large' do |c| + - c.body do + Manage sites of your institution diff --git a/app/views/shared/_header_nav.haml b/app/views/shared/_header_nav.haml index 898b64749..dd9717426 100644 --- a/app/views/shared/_header_nav.haml +++ b/app/views/shared/_header_nav.haml @@ -32,25 +32,11 @@ - if has_access_to_test_results_index? %li{:class => ["test_results", "encounters"].include?(params[:controller]) && "active"} = link_to "Tests", test_results_path - - if has_access_to_sites_index? - %li{:class => params[:controller] == "sites" && "active"} - = link_to "Sites", sites_path - - if has_access_to_devices_index? - %li{:class => params[:controller] == "devices" && "active"} - = link_to "Devices", devices_path - - if has_access?(Device, Policy::Actions::SUPPORT_DEVICE) - %li{:class => params[:controller] == "device_messages" && "active"} - = link_to "Logs", device_messages_path - - if has_access_to_device_models_index? - %li{:class => params[:controller] == "device_models" && "active"} - = link_to "Models", device_models_path - - if has_access_to_users_index? - -# Devise clears the controller param for users index - %li{:class => (params[:controller] == "users" || !params[:controller]) && "active"} - = link_to "Users", users_path - - if has_access_to_settings? - %li{:class => (["roles", "policies", "alerts", "incidents", "alert_messages"].include?(params[:controller]) || params[:action] == "settings") && "active"} - = link_to "Settings", settings_path + + - if has_access_to_settings? + = link_to settings_path do + .icon-gray-light.medium{title: "Settings"} + = ''.html_safe .user{:tabindex => "0"} - if current_user