From 4f2b8d39c26ef2ab45606db2c0d6e64d24f97313 Mon Sep 17 00:00:00 2001 From: Henriette Darge Date: Wed, 5 Jun 2024 13:56:37 +0200 Subject: [PATCH] Replace old icons with Octicons inside the main menu --- app/views/admin/index.html.erb | 2 +- config/initializers/menus.rb | 92 +++++++++---------- .../global_styles/common/header/app-help.sass | 12 --- .../global_styles/common/header/index.sass | 1 - .../src/global_styles/common/menu/menu.sass | 8 +- .../content/menus/_menu_blocks.sass | 4 +- lib/redmine/menu_manager/menu_helper.rb | 20 +++- .../menu_manager/top_menu/help_menu.rb | 2 +- lib/redmine/menu_manager/wiki_menu_helper.rb | 2 +- .../lib/open_project/avatars/engine.rb | 2 +- .../lib/open_project/backlogs/engine.rb | 2 +- modules/bim/lib/open_project/bim/engine.rb | 2 +- .../boards/lib/open_project/boards/engine.rb | 6 +- modules/budgets/lib/budgets/engine.rb | 2 +- modules/dashboards/lib/dashboards/engine.rb | 2 +- .../lib/open_project/documents/engine.rb | 2 +- .../gantt/lib/open_project/gantt/engine.rb | 6 +- .../open_project/github_integration/engine.rb | 4 +- .../lib/open_project/meeting/engine.rb | 6 +- modules/overviews/lib/overviews/engine.rb | 2 +- .../lib/open_project/reporting/engine.rb | 6 +- .../lib/open_project/storages/engine.rb | 6 +- .../lib/open_project/team_planner/engine.rb | 6 +- .../two_factor_authentication/engine.rb | 2 +- spec/controllers/admin_controller_spec.rb | 2 +- 25 files changed, 98 insertions(+), 103 deletions(-) delete mode 100644 frontend/src/global_styles/common/header/app-help.sass diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb index 9f67f397c8da..030d95237521 100644 --- a/app/views/admin/index.html.erb +++ b/app/views/admin/index.html.erb @@ -34,7 +34,7 @@ See COPYRIGHT and LICENSE files for more details.
<% @menu_nodes.each do |menu_node| -%> <%= link_to menu_node.url, { class: 'menu-block', 'data-test-selector': 'menu-block' } do %> - <%= spot_icon("#{(menu_node.icon || '')}", classnames: "menu-block--icon icon3") %> + <%= render(Primer::Beta::Octicon.new(icon: menu_node.icon, height: 32, classes: "menu-block--icon", "aria-label": menu_node.caption)) %> <%= menu_node.caption %> <% end %> <% end %> diff --git a/config/initializers/menus.rb b/config/initializers/menus.rb index 160e294296d9..86a096fffee9 100644 --- a/config/initializers/menus.rb +++ b/config/initializers/menus.rb @@ -35,7 +35,7 @@ { controller: "/projects", project_id: nil, action: "index" }, context: :modules, caption: I18n.t("label_projects_menu"), - icon: "projects", + icon: "project", if: Proc.new { User.current.logged? || !Setting.login_required? } @@ -43,13 +43,13 @@ menu.push :activity, { controller: "/activities", action: "index" }, context: :modules, - icon: "checkmark" + icon: "history" menu.push :work_packages, { controller: "/work_packages", project_id: nil, state: nil, action: "index" }, context: :modules, caption: I18n.t("label_work_package_plural"), - icon: "work-packages", + icon: "op-work-packages", if: Proc.new { (User.current.logged? || !Setting.login_required?) && User.current.allowed_in_any_work_package?(:view_work_packages) @@ -58,7 +58,7 @@ { controller: "/news", project_id: nil, action: "index" }, context: :modules, caption: I18n.t("label_news_plural"), - icon: "news", + icon: "megaphone", if: Proc.new { (User.current.logged? || !Setting.login_required?) && User.current.allowed_in_any_project?(:view_news) @@ -68,7 +68,7 @@ OpenProject::Static::Links.help_link, last: true, caption: "", - icon: "help op-app-help--icon", + icon: "question", html: { accesskey: OpenProject::AccessKeys.key_for(:help), title: I18n.t("label_help"), target: "_blank" } @@ -80,7 +80,7 @@ { controller: "/projects", action: :new, project_id: nil, parent_id: project&.id } }, caption: ->(*) { Project.model_name.human }, - icon: "add", + icon: "plus", html: { aria: { label: I18n.t(:label_project_new) }, title: I18n.t(:label_project_new) @@ -93,7 +93,7 @@ menu.push :invite_user, nil, caption: :label_invite_user, - icon: "user-plus", + icon: "person-add", html: { "invite-user-modal-augment": "invite-user-modal-augment" }, @@ -136,7 +136,7 @@ menu.push :projects, { controller: "/projects", project_id: nil, action: "index" }, caption: I18n.t("label_projects_menu"), - icon: "projects", + icon: "project", after: :home, if: Proc.new { User.current.logged? || !Setting.login_required? @@ -150,7 +150,7 @@ # Activity menu.push :activity, { controller: "/activities", action: "index" }, - icon: "checkmark", + icon: "history", after: :projects menu.push :activity_filters, @@ -162,7 +162,7 @@ menu.push :work_packages, { controller: "/work_packages", action: "index" }, caption: :label_work_package_plural, - icon: "view-list", + icon: "op-view-list", after: :activity menu.push :work_packages_query_select, @@ -174,7 +174,7 @@ menu.push :news, { controller: "/news", project_id: nil, action: "index" }, caption: I18n.t("label_news_plural"), - icon: "news", + icon: "megaphone", after: :boards, if: Proc.new { (User.current.logged? || !Setting.login_required?) && @@ -192,16 +192,16 @@ menu.push :account, { controller: "/my", action: "account" }, caption: :label_profile, - icon: "user" + icon: "person-fill" menu.push :settings, { controller: "/my", action: "settings" }, caption: :label_setting_plural, - icon: "settings2" + icon: "gear" menu.push :password, { controller: "/my", action: "password" }, caption: :button_change_password, if: Proc.new { User.current.change_password_allowed? }, - icon: "locked" + icon: "lock" menu.push :access_token, { controller: "/my", action: "access_token" }, caption: I18n.t("my_account.access_tokens.access_tokens"), @@ -209,7 +209,7 @@ menu.push :sessions, { controller: "/my/sessions", action: :index }, caption: :"users.sessions.title", - icon: "installation-services" + icon: "op-installation-services" menu.push :notifications, { controller: "/my", action: "notifications" }, caption: I18n.t("js.notifications.settings.title"), @@ -217,14 +217,14 @@ menu.push :reminders, { controller: "/my", action: "reminders" }, caption: I18n.t("js.reminders.settings.title"), - icon: "email-alert" + icon: "unread" menu.push :delete_account, :delete_my_account_info_path, caption: I18n.t("account.delete"), param: :user_id, if: Proc.new { Setting.users_deletable_by_self? }, last: :delete_account, - icon: "delete" + icon: "trash" end Redmine::MenuManager.map :admin_menu do |menu| @@ -242,19 +242,19 @@ (User.current.allowed_globally?(:manage_user) || User.current.allowed_globally?(:create_user)) }, caption: :label_user_plural, - icon: "group" + icon: "people" menu.push :placeholder_users, { controller: "/placeholder_users" }, if: Proc.new { !User.current.admin? && User.current.allowed_globally?(:manage_placeholder_user) }, caption: :label_placeholder_user_plural, - icon: "group" + icon: "people" menu.push :users_and_permissions, { controller: "/users" }, if: Proc.new { User.current.admin? }, caption: :label_user_and_permission, - icon: "group" + icon: "people" menu.push :user_settings, { controller: "/admin/settings/users_settings", action: :show }, @@ -303,7 +303,7 @@ { controller: "/admin/settings/work_packages_settings", action: :show }, if: Proc.new { User.current.admin? }, caption: :label_work_package_plural, - icon: "view-list" + icon: "op-view-list" menu.push :work_packages_setting, { controller: "/admin/settings/work_packages_settings", action: :show }, @@ -334,7 +334,7 @@ { controller: "/admin/settings/project_custom_fields", action: :index }, if: Proc.new { User.current.admin? }, caption: :label_project_plural, - icon: "projects" + icon: "project" menu.push :project_custom_fields_settings, { controller: "/admin/settings/project_custom_fields", action: :index }, @@ -358,7 +358,7 @@ { controller: "/custom_fields" }, if: Proc.new { User.current.admin? }, caption: :label_custom_field_plural, - icon: "custom-fields", + icon: "op-custom-fields", html: { class: "custom_fields" } menu.push :custom_actions, @@ -371,13 +371,13 @@ menu.push :attribute_help_texts, { controller: "/attribute_help_texts" }, caption: :"attribute_help_texts.label_plural", - icon: "help2", + icon: "question", if: Proc.new { User.current.allowed_globally?(:edit_attribute_help_texts) } menu.push :enumerations, { controller: "/enumerations" }, if: Proc.new { User.current.admin? }, - icon: "enumerations" + icon: "multi-select" menu.push :calendars_and_dates, { controller: "/admin/settings/working_days_and_hours_settings", action: :show }, @@ -407,7 +407,7 @@ { controller: "/admin/settings/general_settings", action: :show }, if: Proc.new { User.current.admin? }, caption: :label_system_settings, - icon: "settings2" + icon: "gear" SettingsHelper.system_settings_tabs.each do |node| menu.push :"settings_#{node[:name]}", @@ -421,7 +421,7 @@ { controller: "/admin/settings/aggregation_settings", action: :show }, if: Proc.new { User.current.admin? }, caption: :"menus.admin.mails_and_notifications", - icon: "mail1" + icon: "mail" menu.push :notification_settings, { controller: "/admin/settings/aggregation_settings", action: :show }, @@ -445,7 +445,7 @@ { controller: "/admin/settings/api_settings", action: :show }, if: Proc.new { User.current.admin? }, caption: :"menus.admin.api_and_webhooks", - icon: "relations" + icon: "op-relations" menu.push :api, { controller: "/admin/settings/api_settings", action: :show }, @@ -457,7 +457,7 @@ { controller: "/admin/settings/authentication_settings", action: :show }, if: Proc.new { User.current.admin? }, caption: :label_authentication, - icon: "two-factor-authentication" + icon: "shield-lock" menu.push :authentication_settings, { controller: "/admin/settings/authentication_settings", action: :show }, @@ -484,52 +484,52 @@ { controller: "/announcements", action: "edit" }, if: Proc.new { User.current.admin? }, caption: :label_announcement, - icon: "news" + icon: "megaphone" menu.push :plugins, { controller: "/admin", action: "plugins" }, if: Proc.new { User.current.admin? }, last: true, - icon: "plugins" + icon: "plug" menu.push :backups, { controller: "/admin/backups", action: "show" }, if: Proc.new { OpenProject::Configuration.backup_enabled? && User.current.allowed_globally?(Backup.permission) }, caption: :label_backup, last: true, - icon: "save" + icon: "op-save" menu.push :info, { controller: "/admin", action: "info" }, if: Proc.new { User.current.admin? }, caption: :label_information_plural, last: true, - icon: "info1" + icon: "info" menu.push :custom_style, { controller: "/custom_styles", action: :show }, if: Proc.new { User.current.admin? }, caption: :label_custom_style, - icon: "design", + icon: "paintbrush", enterprise_feature: "define_custom_style" menu.push :colors, { controller: "/colors", action: "index" }, if: Proc.new { User.current.admin? }, caption: :label_color_plural, - icon: "status" + icon: "meter" menu.push :enterprise, { controller: "/enterprises", action: :show }, caption: :label_enterprise_edition, - icon: "enterprise-addons", + icon: "op-enterprise-addons", if: proc { User.current.admin? && OpenProject::Configuration.ee_manager_visible? } menu.push :admin_costs, { controller: "/admin/settings", action: "show_plugin", id: :costs }, if: Proc.new { User.current.admin? }, caption: :project_module_costs, - icon: "budget" + icon: "op-budget" menu.push :costs_setting, { controller: "/admin/settings", action: "show_plugin", id: :costs }, @@ -541,7 +541,7 @@ { controller: "/backlogs_settings", action: :show }, if: Proc.new { User.current.admin? }, caption: :label_backlogs, - icon: "backlogs" + icon: "op-backlogs" menu.push :backlogs_settings, { controller: "/backlogs_settings", action: :show }, @@ -554,7 +554,7 @@ menu.push :activity, { controller: "/activities", action: "index" }, if: Proc.new { |p| p.module_enabled?("activity") }, - icon: "checkmark" + icon: "history" menu.push :activity_filters, { controller: "/activities", action: "index" }, @@ -565,13 +565,13 @@ menu.push :roadmap, { controller: "/versions", action: "index" }, if: Proc.new { |p| p.shared_versions.any? }, - icon: "roadmap" + icon: "project-roadmap" menu.push :work_packages, { controller: "/work_packages", action: "index" }, caption: :label_work_package_plural, if: Proc.new { |p| p.module_enabled?("work_package_tracking") }, - icon: "view-list", + icon: "op-view-list", html: { id: "main-menu-work-packages", "wp-query-menu": "wp-query-menu" @@ -587,17 +587,17 @@ menu.push :news, { controller: "/news", action: "index" }, caption: :label_news_plural, - icon: "news" + icon: "megaphone" menu.push :forums, { controller: "/forums", action: "index", id: nil }, caption: :label_forum_plural, - icon: "ticket-note" + icon: "op-file-comment" menu.push :repository, { controller: "/repositories", action: :show }, if: Proc.new { |p| p.repository && !p.repository.new_record? }, - icon: "folder-open" + icon: "file-directory-open-fill" # Wiki menu items are added by WikiMenuItemHelper @@ -605,7 +605,7 @@ { controller: "/members", action: "index" }, caption: :label_member_plural, before: :settings, - icon: "group" + icon: "people" menu.push :members_menu, { controller: "/members", action: "index" }, @@ -617,7 +617,7 @@ { controller: "/projects/settings/general", action: :show }, caption: :label_project_settings, last: true, - icon: "settings2", + icon: "gear", allow_deeplink: true project_menu_items = { diff --git a/frontend/src/global_styles/common/header/app-help.sass b/frontend/src/global_styles/common/header/app-help.sass deleted file mode 100644 index 57acde51d631..000000000000 --- a/frontend/src/global_styles/common/header/app-help.sass +++ /dev/null @@ -1,12 +0,0 @@ -.op-app-help - // For the higher specificity we switch to this nested class notation - .op-app-help--icon - &::before - display: flex - justify-content: center - align-items: center - border: 2px solid var(--header-item-font-color) - border-radius: 50% - width: 26px - height: 26px - padding: 1px 8px 0 8px diff --git a/frontend/src/global_styles/common/header/index.sass b/frontend/src/global_styles/common/header/index.sass index 15954465af4d..e8ad716c6ce8 100644 --- a/frontend/src/global_styles/common/header/index.sass +++ b/frontend/src/global_styles/common/header/index.sass @@ -2,6 +2,5 @@ @import './logo' @import './app-menu' @import './app-search' -@import './app-help' @import './quick-add-menu' @import './main-menu-toggle' diff --git a/frontend/src/global_styles/common/menu/menu.sass b/frontend/src/global_styles/common/menu/menu.sass index c168b66a5ccb..a9eaf5b74e97 100644 --- a/frontend/src/global_styles/common/menu/menu.sass +++ b/frontend/src/global_styles/common/menu/menu.sass @@ -23,12 +23,8 @@ color: var(--context-menu-unselected-font-color) border: 1px solid transparent - .spot-icon - &.trailing-icon - margin-left: auto - - &:first-child - margin-right: 0.75rem + .trailing-icon + margin-left: auto &:focus background-color: #f0f0f0 diff --git a/frontend/src/global_styles/content/menus/_menu_blocks.sass b/frontend/src/global_styles/content/menus/_menu_blocks.sass index f7e85ce98b0f..e3cacc71eef5 100644 --- a/frontend/src/global_styles/content/menus/_menu_blocks.sass +++ b/frontend/src/global_styles/content/menus/_menu_blocks.sass @@ -8,8 +8,8 @@ .menu-block border-radius: 3px display: grid - grid-template: 94px 1fr / 1fr - grid-row-gap: 5px + grid-template: 80px 1fr / 1fr + grid-row-gap: 1rem padding: 1rem justify-items: center text-align: center diff --git a/lib/redmine/menu_manager/menu_helper.rb b/lib/redmine/menu_manager/menu_helper.rb index 8ad50794d7a3..6776e41d8526 100644 --- a/lib/redmine/menu_manager/menu_helper.rb +++ b/lib/redmine/menu_manager/menu_helper.rb @@ -224,29 +224,41 @@ def render_children_back_up_link(node) # rubocop:disable Metrics/AbcSize def render_single_menu_node(item, project = nil, menu_class = "op-menu") caption, url, selected = extract_node_details(item, project) + shown_in_main_menu = menu_class == "op-menu" link_text = "".html_safe - link_text << spot_icon(item.icon, size: "1_25") if item.icon(project).present? + + if item.icon(project).present? + link_text << render(Primer::Beta::Octicon.new( + icon: item.icon, + mr: shown_in_main_menu ? 3 : 0, + size: shown_in_main_menu ? :small : :medium + )) + end + badge_class = item.badge(project).present? ? " #{menu_class}--item-title_has-badge" : "" + link_text << content_tag(:span, class: "#{menu_class}--item-title#{badge_class}", lang: menu_item_locale(item)) do title_text = "".html_safe + content_tag(:span, caption, class: "ellipsis") + badge_for(item) if item.enterprise_feature.present? && !EnterpriseToken.allows_to?(item.enterprise_feature) - title_text << ("".html_safe + spot_icon("enterprise-addons", size: "1_25", classnames: "upsale-colored")) + title_text << ("".html_safe + render(Primer::Beta::Octicon.new(icon: "op-enterprise-addons", + classes: "upsale-colored", + ml: 2))) end title_text end if item.icon_after.present? - link_text << ("".html_safe + spot_icon(item.icon_after, size: "1_25", classnames: "trailing-icon")) + link_text << ("".html_safe + render(Primer::Beta::Octicon.new(icon: item.icon_after, classes: "trailing-icon"))) end html_options = item.html_options(selected:) html_options[:title] ||= selected ? t(:description_current_position) + caption : caption html_options[:class] = "#{html_options[:class]} #{menu_class}--item-action" html_options["data-test-selector"] = "#{menu_class}--item-action" - html_options["target"] = "_blank" if item.icon_after.present? && item.icon_after == "external-link" + html_options["target"] = "_blank" if item.icon_after.present? && item.icon_after == "link-external" link_to link_text, url, html_options end diff --git a/lib/redmine/menu_manager/top_menu/help_menu.rb b/lib/redmine/menu_manager/top_menu/help_menu.rb index 61368f1ffc15..68be6dcbd0ee 100644 --- a/lib/redmine/menu_manager/top_menu/help_menu.rb +++ b/lib/redmine/menu_manager/top_menu/help_menu.rb @@ -49,7 +49,7 @@ def render_help_dropdown title: I18n.t(:label_help), class: "op-app-menu--item-action", aria: { haspopup: "true" } do - spot_icon("help", size: "1_25", classnames: "op-app-help--icon") + render(Primer::Beta::Octicon.new(icon: "question", size: :medium)) end render_menu_dropdown( diff --git a/lib/redmine/menu_manager/wiki_menu_helper.rb b/lib/redmine/menu_manager/wiki_menu_helper.rb index 221dd8e5bd48..3bf5df86d691 100644 --- a/lib/redmine/menu_manager/wiki_menu_helper.rb +++ b/lib/redmine/menu_manager/wiki_menu_helper.rb @@ -49,7 +49,7 @@ def push_wiki_main_menu(menu, main_item, project) { controller: "/wiki", action: "show", id: main_item.slug }, caption: main_item.title, after: :meetings, - icon: "wiki", + icon: "book", html: { class: "wiki-menu--main-item" } if project.wiki.pages.any? diff --git a/modules/avatars/lib/open_project/avatars/engine.rb b/modules/avatars/lib/open_project/avatars/engine.rb index f171db497fcc..6d166d07f1e0 100644 --- a/modules/avatars/lib/open_project/avatars/engine.rb +++ b/modules/avatars/lib/open_project/avatars/engine.rb @@ -37,7 +37,7 @@ class Engine < ::Rails::Engine { controller: "/avatars/my_avatar", action: "show" }, caption: ->(*) { I18n.t("avatars.label_avatar") }, if: ->(*) { ::OpenProject::Avatars::AvatarManager::avatars_enabled? }, - icon: "image1" + icon: "image" end add_api_endpoint "API::V3::Users::UsersAPI", :id do diff --git a/modules/backlogs/lib/open_project/backlogs/engine.rb b/modules/backlogs/lib/open_project/backlogs/engine.rb index 50f1d865d864..f769c3f7635c 100644 --- a/modules/backlogs/lib/open_project/backlogs/engine.rb +++ b/modules/backlogs/lib/open_project/backlogs/engine.rb @@ -114,7 +114,7 @@ def self.settings { controller: "/rb_master_backlogs", action: :index }, caption: :project_module_backlogs, after: :work_packages, - icon: "backlogs" + icon: "op-backlogs" menu :project_menu, :settings_backlogs, diff --git a/modules/bim/lib/open_project/bim/engine.rb b/modules/bim/lib/open_project/bim/engine.rb index 6a7422c6e528..5d20fb118ee1 100644 --- a/modules/bim/lib/open_project/bim/engine.rb +++ b/modules/bim/lib/open_project/bim/engine.rb @@ -99,7 +99,7 @@ class Engine < ::Rails::Engine { controller: "/bim/ifc_models/ifc_models", action: "defaults" }, caption: :"bcf.label_bcf", after: :work_packages, - icon: "bcf", + icon: "op-bcf", badge: :label_new) menu.push :ifc_viewer_panels, diff --git a/modules/boards/lib/open_project/boards/engine.rb b/modules/boards/lib/open_project/boards/engine.rb index cf55f642ba1e..5c3126ae6c81 100644 --- a/modules/boards/lib/open_project/boards/engine.rb +++ b/modules/boards/lib/open_project/boards/engine.rb @@ -44,7 +44,7 @@ class Engine < ::Rails::Engine { controller: "/boards/boards", action: :index }, caption: :"boards.label_boards", after: :work_packages, - icon: "boards" + icon: "op-boards" menu :project_menu, :board_menu, @@ -66,7 +66,7 @@ class Engine < ::Rails::Engine caption: :project_module_board_view, before: :news, after: :team_planners, - icon: "boards", + icon: "op-boards", if: should_render_global_menu_item menu :global_menu, @@ -75,7 +75,7 @@ class Engine < ::Rails::Engine caption: :project_module_board_view, before: :news, after: :team_planners, - icon: "boards", + icon: "op-boards", if: should_render_global_menu_item end diff --git a/modules/budgets/lib/budgets/engine.rb b/modules/budgets/lib/budgets/engine.rb index 9efab0dbdb5e..00572f3ee9c1 100644 --- a/modules/budgets/lib/budgets/engine.rb +++ b/modules/budgets/lib/budgets/engine.rb @@ -20,7 +20,7 @@ class Engine < ::Rails::Engine if: ->(project) { project.module_enabled?(:budgets) }, after: :costs, caption: :budgets_title, - icon: "budget" + icon: "op-budget" end add_api_path :budget do |id| diff --git a/modules/dashboards/lib/dashboards/engine.rb b/modules/dashboards/lib/dashboards/engine.rb index c516b2039dcf..b2882ccd3f5e 100644 --- a/modules/dashboards/lib/dashboards/engine.rb +++ b/modules/dashboards/lib/dashboards/engine.rb @@ -14,7 +14,7 @@ class Engine < ::Rails::Engine { controller: "/dashboards/dashboards", action: "show" }, caption: :"dashboards.label", after: :work_packages, - icon: "status", + icon: "meter", badge: "label_menu_badge.alpha") end end diff --git a/modules/documents/lib/open_project/documents/engine.rb b/modules/documents/lib/open_project/documents/engine.rb index c6a248ca2bb4..b2088e225966 100644 --- a/modules/documents/lib/open_project/documents/engine.rb +++ b/modules/documents/lib/open_project/documents/engine.rb @@ -40,7 +40,7 @@ class Engine < ::Rails::Engine { controller: "/documents", action: "index" }, caption: :label_document_plural, before: :members, - icon: "notes" + icon: "note" project_module :documents do |_map| permission :view_documents, diff --git a/modules/gantt/lib/open_project/gantt/engine.rb b/modules/gantt/lib/open_project/gantt/engine.rb index e3b223cdae26..e7e0e3f5b621 100644 --- a/modules/gantt/lib/open_project/gantt/engine.rb +++ b/modules/gantt/lib/open_project/gantt/engine.rb @@ -62,7 +62,7 @@ class Engine < ::Rails::Engine { controller: "/gantt/gantt", action: "index", project_id: nil }, caption: :label_gantt_chart_plural, after: :work_packages, - icon: "view-timeline", + icon: "op-view-timeline", if: should_render_global_menu_item menu :global_menu, @@ -80,7 +80,7 @@ class Engine < ::Rails::Engine caption: :label_gantt_chart_plural, after: :work_packages, if: ->(project) { should_render_project_menu.call(project) }, - icon: "view-timeline", + icon: "op-view-timeline", html: { id: "main-menu-gantt" } @@ -99,7 +99,7 @@ class Engine < ::Rails::Engine { controller: "/gantt/gantt", action: "index", project_id: nil }, caption: :label_gantt_chart_plural, after: :work_packages, - icon: "view-timeline", + icon: "op-view-timeline", if: should_render_global_menu_item end diff --git a/modules/github_integration/lib/open_project/github_integration/engine.rb b/modules/github_integration/lib/open_project/github_integration/engine.rb index 5e176ba798f6..c8c8ff1cb138 100644 --- a/modules/github_integration/lib/open_project/github_integration/engine.rb +++ b/modules/github_integration/lib/open_project/github_integration/engine.rb @@ -58,7 +58,7 @@ def self.settings { controller: "/deploy_targets", action: "index" }, if: Proc.new { OpenProject::FeatureDecisions.deploy_targets_active? && User.current.admin? }, caption: :label_github_integration, - icon: "github_logo" + icon: "mark-github" end project_module(:github, dependencies: :work_package_tracking) do @@ -81,7 +81,7 @@ def self.settings if: ->(*) { OpenProject::FeatureDecisions.deploy_targets_active? && User.current.admin? }, parent: :admin_github_integration, caption: :label_deploy_target_plural, - icon: "hosting" + icon: "cloud" end initializer "github.register_hook" do diff --git a/modules/meeting/lib/open_project/meeting/engine.rb b/modules/meeting/lib/open_project/meeting/engine.rb index ca96c171ed11..d2a26c53b74c 100644 --- a/modules/meeting/lib/open_project/meeting/engine.rb +++ b/modules/meeting/lib/open_project/meeting/engine.rb @@ -115,7 +115,7 @@ class Engine < ::Rails::Engine caption: :project_module_meetings, after: :wiki, before: :members, - icon: "meetings" + icon: "comment-discussion" menu :project_menu, :meetings_query_select, { controller: "/meetings", action: "index" }, @@ -132,14 +132,14 @@ class Engine < ::Rails::Engine context: :modules, caption: :label_meeting_plural, last: true, - icon: "meetings", + icon: "comment-discussion", if: should_render_global_menu_item menu :global_menu, :meetings, { controller: "/meetings", action: "index", project_id: nil }, caption: :label_meeting_plural, last: true, - icon: "meetings", + icon: "comment-discussion", if: should_render_global_menu_item menu :global_menu, diff --git a/modules/overviews/lib/overviews/engine.rb b/modules/overviews/lib/overviews/engine.rb index dbc9f9392e45..df7946956caf 100644 --- a/modules/overviews/lib/overviews/engine.rb +++ b/modules/overviews/lib/overviews/engine.rb @@ -38,7 +38,7 @@ class Engine < ::Rails::Engine { controller: "/overviews/overviews", action: "show" }, caption: :"overviews.label", first: true, - icon: "info1") + icon: "info") end end diff --git a/modules/reporting/lib/open_project/reporting/engine.rb b/modules/reporting/lib/open_project/reporting/engine.rb index 024020461241..fca3ae6f8bac 100644 --- a/modules/reporting/lib/open_project/reporting/engine.rb +++ b/modules/reporting/lib/open_project/reporting/engine.rb @@ -75,7 +75,7 @@ class Engine < ::Rails::Engine :cost_reports_global, { controller: "/cost_reports", action: "index", project_id: nil }, caption: :cost_reports_title, - icon: "cost-reports", + icon: "op-cost-reports", if: should_render menu :global_menu, @@ -83,7 +83,7 @@ class Engine < ::Rails::Engine { controller: "/cost_reports", action: "index", project_id: nil }, after: :news, caption: :cost_reports_title, - icon: "cost-reports", + icon: "op-cost-reports", if: should_render menu :global_menu, @@ -99,7 +99,7 @@ class Engine < ::Rails::Engine after: :news, caption: :cost_reports_title, if: Proc.new { |project| project.module_enabled?(:costs) }, - icon: "cost-reports" + icon: "op-cost-reports" menu :project_menu, :costs_menu, diff --git a/modules/storages/lib/open_project/storages/engine.rb b/modules/storages/lib/open_project/storages/engine.rb index 489da74187af..084745249fdf 100644 --- a/modules/storages/lib/open_project/storages/engine.rb +++ b/modules/storages/lib/open_project/storages/engine.rb @@ -168,7 +168,7 @@ def self.permissions { controller: "/storages/admin/storages", action: :index }, if: Proc.new { User.current.admin? }, caption: :project_module_storages, - icon: "hosting" + icon: "file-directory" menu :admin_menu, :external_file_storages, @@ -203,14 +203,14 @@ def self.permissions (prj_storage.project_folder_automatic? && !u.allowed_in_project?(:read_files, prj)) next if hide_from_menu - icon = storage.provider_type_nextcloud? ? "nextcloud-circle" : "hosting" + icon = storage.provider_type_nextcloud? ? "op-mark-nextcloud" : "file-directory" menu.push( :"storage_#{storage.id}", prj_storage.open_with_connection_ensured, caption: storage.name, before: :members, icon:, - icon_after: "external-link", + icon_after: "link-external", skip_permissions_check: true ) end diff --git a/modules/team_planner/lib/open_project/team_planner/engine.rb b/modules/team_planner/lib/open_project/team_planner/engine.rb index c60fdf5fbc57..2a853694ae21 100644 --- a/modules/team_planner/lib/open_project/team_planner/engine.rb +++ b/modules/team_planner/lib/open_project/team_planner/engine.rb @@ -64,7 +64,7 @@ class Engine < ::Rails::Engine caption: :"team_planner.label_team_planner_plural", before: :boards, after: :calendar_view, - icon: "team-planner", + icon: "op-team-planner", if: should_render_global_menu_item, enterprise_feature: "team_planner_view" @@ -73,7 +73,7 @@ class Engine < ::Rails::Engine { controller: "/team_planner/team_planner", action: :index }, caption: :"team_planner.label_team_planner_plural", after: :work_packages, - icon: "team-planner", + icon: "op-team-planner", enterprise_feature: "team_planner_view" menu :project_menu, @@ -90,7 +90,7 @@ class Engine < ::Rails::Engine caption: :"team_planner.label_team_planner_plural", before: :boards, after: :calendar_view, - icon: "team-planner", + icon: "op-team-planner", if: should_render_global_menu_item, enterprise_feature: "team_planner_view" end diff --git a/modules/two_factor_authentication/lib/open_project/two_factor_authentication/engine.rb b/modules/two_factor_authentication/lib/open_project/two_factor_authentication/engine.rb index becd5206b7d0..744767772f2c 100644 --- a/modules/two_factor_authentication/lib/open_project/two_factor_authentication/engine.rb +++ b/modules/two_factor_authentication/lib/open_project/two_factor_authentication/engine.rb @@ -28,7 +28,7 @@ class Engine < ::Rails::Engine caption: ->(*) { I18n.t("two_factor_authentication.label_two_factor_authentication") }, after: :password, if: ->(*) { ::OpenProject::TwoFactorAuthentication::TokenStrategyManager.enabled? }, - icon: "two-factor-authentication" + icon: "shield-lock" menu :admin_menu, :two_factor_authentication, diff --git a/spec/controllers/admin_controller_spec.rb b/spec/controllers/admin_controller_spec.rb index 275e764b6795..496ca8c50b68 100644 --- a/spec/controllers/admin_controller_spec.rb +++ b/spec/controllers/admin_controller_spec.rb @@ -58,7 +58,7 @@ :"#{name}_settings", { controller: "/admin/settings", action: :show_plugin, id: :"openproject_#{name}" }, caption: name.capitalize, - icon: "arrow", + icon: "book", if: ->(*) { show } end