From d096c13f9a58097d90a47ac066e5b80ef93a2fca Mon Sep 17 00:00:00 2001 From: Julie Allinson Date: Thu, 4 Oct 2018 08:51:01 +0000 Subject: [PATCH] harmonize dashboard with current hyrax code --- app/views/hyrax/dashboard/_sidebar.html.erb | 152 ++---------------- .../dashboard/sidebar/_activity.html.erb | 49 ++++++ .../dashboard/sidebar/_configuration.html.erb | 41 +++++ .../hyrax/dashboard/sidebar/_tasks.html.erb | 28 ++++ config/locales/de.yml | 8 +- config/locales/en.yml | 12 +- config/locales/es.yml | 8 +- config/locales/it.yml | 6 - config/locales/pt-BR.yml | 6 - config/locales/zh.yml | 6 - spec/features/admin_dashboard_spec.rb | 9 +- 11 files changed, 145 insertions(+), 180 deletions(-) create mode 100644 app/views/hyrax/dashboard/sidebar/_activity.html.erb create mode 100644 app/views/hyrax/dashboard/sidebar/_configuration.html.erb create mode 100644 app/views/hyrax/dashboard/sidebar/_tasks.html.erb diff --git a/app/views/hyrax/dashboard/_sidebar.html.erb b/app/views/hyrax/dashboard/_sidebar.html.erb index c49c85c413..ebcdbfb7c9 100644 --- a/app/views/hyrax/dashboard/_sidebar.html.erb +++ b/app/views/hyrax/dashboard/_sidebar.html.erb @@ -1,139 +1,21 @@ <% menu = Hyku::MenuPresenter.new(self) %>
- + diff --git a/app/views/hyrax/dashboard/sidebar/_activity.html.erb b/app/views/hyrax/dashboard/sidebar/_activity.html.erb new file mode 100644 index 0000000000..1c642df1f4 --- /dev/null +++ b/app/views/hyrax/dashboard/sidebar/_activity.html.erb @@ -0,0 +1,49 @@ +
  • <%= t('hyrax.admin.sidebar.activity') %>
    • + +
  • + <%= menu.collapsable_section t('hyrax.admin.sidebar.repository_activity'), + icon_class: "fa fa-line-chart", + id: 'collapseRepositoryActivity', + open: menu.repository_activity_section? do %> + <%= menu.nav_link(hyrax.dashboard_path) do %> + <%= t('hyrax.admin.sidebar.activity_summary') %> + <% end %> + <% if menu.show_admin_menu_items? %> + <%= menu.nav_link(main_app.status_path) do %> + <%= t('hyrax.admin.sidebar.system_status') %> + <% end %> + <% end %> + <% end %> +
    • + +
  • + <%= menu.collapsable_section t('hyrax.admin.sidebar.user_activity'), + icon_class: "fa fa-line-chart", + id: 'collapseUserActivity', + open: menu.user_activity_section? do %> + <%= menu.nav_link(hyrax.dashboard_profile_path(current_user), + also_active_for: hyrax.edit_dashboard_profile_path(current_user)) do %> + <%= t('hyrax.admin.sidebar.profile') %> + <% end %> + + <%= menu.nav_link(hyrax.notifications_path) do %> + <%= t('hyrax.admin.sidebar.notifications') %> + <% end %> + + <%= menu.nav_link(hyrax.transfers_path) do %> + <%= t('hyrax.admin.sidebar.transfers') %> + <% end %> + + <% if Flipflop.proxy_deposit? %> + <%= menu.nav_link(hyrax.depositors_path) do %> + <%= t('hyrax.dashboard.manage_proxies') %> + <% end %> + <% end %> + <% end %> +
    • + + <% if can? :read, :admin_dashboard %> + <%= menu.nav_link(hyrax.admin_stats_path) do %> + <%= t('hyrax.admin.sidebar.statistics') %> + <% end %> + <% end %> diff --git a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb new file mode 100644 index 0000000000..1ad46ebf6c --- /dev/null +++ b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb @@ -0,0 +1,41 @@ + <% if menu.show_configuration? %> +
  • <%= t('hyrax.admin.sidebar.configuration') %>
    • + <% if can? :manage, Site %> +
  • + <%= menu.collapsable_section t('hyrax.admin.sidebar.settings'), + icon_class: "fa fa-cog", + id: 'collapseSettings', + open: menu.settings_section? do %> + <%= menu.nav_link(main_app.edit_site_labels_path) do %> + <%= t('hyrax.admin.sidebar.labels') %> + <% end %> + <% if can?(:update, :appearance) %> + <%= menu.nav_link(hyrax.admin_appearance_path) do %> + <%= t('hyrax.admin.sidebar.appearance') %> + <% end %> + <% end %> + <% if can?(:manage, :collection_types) %> + <%= menu.nav_link(hyrax.admin_collection_types_path) do %> + <%= t('hyrax.admin.sidebar.collection_types') %> + <% end %> + <% end %> + <% if can?(:manage, Hyrax::Feature) %> + <%= menu.nav_link(hyrax.edit_pages_path) do %> + <%= t('hyrax.admin.sidebar.pages') %> + <% end %> + <%= menu.nav_link(hyrax.edit_content_blocks_path) do %> + <%= t('hyrax.admin.sidebar.content_blocks') %> + <% end %> + <%= menu.nav_link(hyrax.admin_features_path) do %> + <%= t('hyrax.admin.sidebar.technical') %> + <% end %> + <% end %> + <% end %> +
    • + <% end %> + <% if can?(:manage, Sipity::WorkflowResponsibility) %> + <%= menu.nav_link(hyrax.admin_workflow_roles_path) do %> + <%= t('hyrax.admin.sidebar.workflow_roles') %> + <% end %> + <% end # end of configuration block %> + <% end %> diff --git a/app/views/hyrax/dashboard/sidebar/_tasks.html.erb b/app/views/hyrax/dashboard/sidebar/_tasks.html.erb new file mode 100644 index 0000000000..5a6f32677f --- /dev/null +++ b/app/views/hyrax/dashboard/sidebar/_tasks.html.erb @@ -0,0 +1,28 @@ + <% if can? :review, :submissions %> +
  • <%= t('hyrax.admin.sidebar.tasks') %>
    • + <%= menu.nav_link(hyrax.admin_workflows_path) do %> + <%= t('hyrax.admin.sidebar.workflow_review') %> + <% end %> + <% end %> + + <% if can? :manage, User %> + <%= menu.nav_link(hyrax.admin_users_path) do %> + <%= t('hyrax.admin.sidebar.users') %> + <% end %> + <% end %> + + <% if can? :manage, Hyku::Group %> + <%= menu.nav_link(main_app.admin_groups_path) do %> + <%= t('hyrax.admin.sidebar.manage_groups') %> + <% end %> + <% end %> + + <% if can? :read, :admin_dashboard %> + <%= menu.nav_link(hyrax.embargoes_path) do %> + <%= t('hyrax.embargoes.index.manage_embargoes') %> + <% end %> + + <%= menu.nav_link(hyrax.leases_path) do %> + <%= t('hyrax.leases.index.manage_leases') %> + <% end %> + <% end %> diff --git a/config/locales/de.yml b/config/locales/de.yml index 8bcf36220f..3a13eef01b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -108,15 +108,9 @@ de: sidebar: accounts: Konten activity_summary: Aktivitätsübersicht - content_blocks: Inhaltsblöcke labels: Etiketten - manage_groups: Gruppen verwalten - manage_roles_and_permissions: Rollen und Berechtigungen definieren - manage_users: Benutzer verwalten - repository_activity: Repository-Aktivität - roles_and_permissions: Benutzer und Gruppen + manage_groups: Gruppen Verwalten system_status: Systemstatus - technical: Technisch users: destroy: confirmation: Möchten Sie den Benutzer "%{user}" wirklich löschen? Diese Aktion ist irreversibel. diff --git a/config/locales/en.yml b/config/locales/en.yml index 114630e273..abf7b69520 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -106,16 +106,10 @@ en: colors: Colors sidebar: accounts: Accounts - activity_summary: Activity summary - content_blocks: Content Blocks + activity_summary: Activity Summary labels: Labels - manage_groups: Manage groups - manage_roles_and_permissions: Define roles and permissions - manage_users: Manage users - repository_activity: Repository activity - roles_and_permissions: Users and groups - system_status: System status - technical: Technical + manage_groups: Manage Groups + system_status: System Status users: destroy: confirmation: Are you sure you wish to delete the user "%{user}"? This action is irreversible. diff --git a/config/locales/es.yml b/config/locales/es.yml index 942ce49ab6..3478a77a06 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -108,15 +108,9 @@ es: sidebar: accounts: Cuentas activity_summary: Resumen de la actividad - content_blocks: Bloques de contenido labels: Etiquetas - manage_groups: Administrar grupos - manage_roles_and_permissions: Defina roles y permisos - manage_users: Administrar usuarios - repository_activity: Actividad de repositorio - roles_and_permissions: Usarios y grupos + manage_groups: Administrar Grupos system_status: Estado del sistema - technical: Técnico users: destroy: confirmation: ¿Estás seguro de que deseas eliminar el usuario "%{user}"? Esta acción es irreversible. diff --git a/config/locales/it.yml b/config/locales/it.yml index 6c47693c10..20db0f7286 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -108,15 +108,9 @@ it: sidebar: accounts: conti activity_summary: Riepilogo attività - content_blocks: Blocchi di contenuti labels: etichette manage_groups: Gestisci gruppi - manage_roles_and_permissions: Definire ruoli e autorizzazioni - manage_users: Gestire gli utenti - repository_activity: Attività di repository - roles_and_permissions: Utenti e gruppi system_status: Stato del sistema - technical: Tecnico users: destroy: confirmation: Sei sicuro di voler cancellare l'utente "%{user}"? Questa azione è irreversibile. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 7bf8690f24..0de55e4d7a 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -108,15 +108,9 @@ pt-BR: sidebar: accounts: Contas activity_summary: Resumo da atividade - content_blocks: Blocos de conteúdo labels: Etiquetas manage_groups: Gerenciar grupos - manage_roles_and_permissions: Definir funções e permissões - manage_users: Gerenciar usuários - repository_activity: Atividade do depósito - roles_and_permissions: Usuários e grupos system_status: Status do sistema - technical: Técnico users: destroy: confirmation: Tem certeza de que deseja excluir o usuário "%{user}"? Esta ação é irreversível. diff --git a/config/locales/zh.yml b/config/locales/zh.yml index fd32107e5d..d54701b80a 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -108,15 +108,9 @@ zh: sidebar: accounts: 帐号 activity_summary: 活动摘要 - content_blocks: 内容块 labels: 标签 manage_groups: 管理组 - manage_roles_and_permissions: 定义角色和权限 - manage_users: 管理用户 - repository_activity: 存储库活动 - roles_and_permissions: 用户和组 system_status: 系统状态 - technical: 技术 users: destroy: confirmation: 您确定要删除用户“%{user}”吗？这一行动是不可逆转的。 diff --git a/spec/features/admin_dashboard_spec.rb b/spec/features/admin_dashboard_spec.rb index 1f4182f4a0..af7afd5b94 100644 --- a/spec/features/admin_dashboard_spec.rb +++ b/spec/features/admin_dashboard_spec.rb @@ -10,16 +10,17 @@ it 'shows the admin page' do visit Hyrax::Engine.routes.url_helpers.dashboard_path within '.sidebar' do - expect(page).to have_link('Activity summary') + expect(page).to have_link('Activity Summary') + expect(page).to have_link('System Status') expect(page).to have_link('Profile') expect(page).to have_link('Notifications') expect(page).to have_link('Transfers') expect(page).to have_link('Labels') expect(page).to have_link('Appearance') expect(page).to have_link('Content Blocks') - expect(page).to have_link('Technical') - expect(page).to have_link('Manage groups') - expect(page).to have_link('Manage users') + expect(page).to have_link('Features') + expect(page).to have_link('Manage Groups') + expect(page).to have_link('Manage Users') expect(page).to have_link('Reports') end end