From 7406e6be2596b710fe51bfd79c5b5a6bf988f107 Mon Sep 17 00:00:00 2001 From: Hullen Gonzales Date: Thu, 26 Mar 2020 21:00:36 -0300 Subject: [PATCH 1/7] Added new variable to sidebar light item active --- app/theme/client/imports/general/variables.css | 1 + private/client/imports/general/variables.css | 1 + 2 files changed, 2 insertions(+) diff --git a/app/theme/client/imports/general/variables.css b/app/theme/client/imports/general/variables.css index c5aaaeecf7ef..dd18c3d4594c 100644 --- a/app/theme/client/imports/general/variables.css +++ b/app/theme/client/imports/general/variables.css @@ -180,6 +180,7 @@ --sidebar-background-hover: var(--rc-color-primary-dark); --sidebar-background-light: var(--rc-color-primary-lightest); --sidebar-background-light-hover: var(--rc-color-primary-light); + --sidebar-background-light-active: var(--rc-color-primary-light-medium); --sidebar-default-padding: 24px; --sidebar-small-default-padding: 16px; --sidebar-extra-small-default-padding: 12px; diff --git a/private/client/imports/general/variables.css b/private/client/imports/general/variables.css index c5aaaeecf7ef..dd18c3d4594c 100644 --- a/private/client/imports/general/variables.css +++ b/private/client/imports/general/variables.css @@ -180,6 +180,7 @@ --sidebar-background-hover: var(--rc-color-primary-dark); --sidebar-background-light: var(--rc-color-primary-lightest); --sidebar-background-light-hover: var(--rc-color-primary-light); + --sidebar-background-light-active: var(--rc-color-primary-light-medium); --sidebar-default-padding: 24px; --sidebar-small-default-padding: 16px; --sidebar-extra-small-default-padding: 12px; From 8bd886df247175e8aeac71ad9b037089233aef6b Mon Sep 17 00:00:00 2001 From: Hullen Gonzales Date: Thu, 26 Mar 2020 21:01:52 -0300 Subject: [PATCH 2/7] Added active class item to the sidebar light --- app/theme/client/imports/components/sidebar/sidebar-item.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/theme/client/imports/components/sidebar/sidebar-item.css b/app/theme/client/imports/components/sidebar/sidebar-item.css index b74a84800690..125ed7283f45 100644 --- a/app/theme/client/imports/components/sidebar/sidebar-item.css +++ b/app/theme/client/imports/components/sidebar/sidebar-item.css @@ -5,6 +5,10 @@ background-color: var(--sidebar-background-light-hover); } + &--active { + background-color: var(--sidebar-background-light-active); + } + &__picture { color: inherit; } From e91953c25c5f7dec044ab890bde99ea0d0553bc8 Mon Sep 17 00:00:00 2001 From: Hullen Gonzales Date: Thu, 26 Mar 2020 21:43:19 -0300 Subject: [PATCH 3/7] Added active item by route name and param on admin and account sidebar --- app/ui-account/client/accountFlex.js | 3 +++ app/ui-admin/client/adminFlex.js | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/app/ui-account/client/accountFlex.js b/app/ui-account/client/accountFlex.js index 56187884ed67..fe118a1c0d2a 100644 --- a/app/ui-account/client/accountFlex.js +++ b/app/ui-account/client/accountFlex.js @@ -1,4 +1,5 @@ import { Template } from 'meteor/templating'; +import { FlowRouter } from 'meteor/kadira:flow-router'; import { settings } from '../../settings'; import { hasAllPermission } from '../../authorization'; @@ -32,12 +33,14 @@ Template.accountFlex.helpers({ return settings.get('Webdav_Integration_Enabled'); }, menuItem(name, icon, section, group) { + const routeParam = FlowRouter.getParam('group'); return { name: t(name), icon, pathSection: section, pathGroup: group, darken: true, + active: group === routeParam, }; }, embeddedVersion() { diff --git a/app/ui-admin/client/adminFlex.js b/app/ui-admin/client/adminFlex.js index ce744b2c63ad..03e1015ac2a0 100644 --- a/app/ui-admin/client/adminFlex.js +++ b/app/ui-admin/client/adminFlex.js @@ -3,6 +3,7 @@ import s from 'underscore.string'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/rocketchat:tap-i18n'; +import { FlowRouter } from 'meteor/kadira:flow-router'; import { settings } from '../../settings'; import { menu, SideNav, AdminBox, Layout } from '../../ui-utils/client'; @@ -68,6 +69,9 @@ Template.adminFlex.helpers({ return AdminBox.getOptions(); }, menuItem(name, icon, section, group) { + const routeParam = FlowRouter.getParam('group'); + const routeName = FlowRouter.getRouteName(); + return { name: t(name), icon, @@ -75,6 +79,7 @@ Template.adminFlex.helpers({ pathGroup: group, darken: true, isLightSidebar: true, + active: (routeParam && routeParam === group) || (routeName !== 'admin' && routeName === section), }; }, embeddedVersion() { From 2abaffe3e7fe0ac19a5e593103e385c0efaf300a Mon Sep 17 00:00:00 2001 From: Hullen Gonzales Date: Fri, 27 Mar 2020 14:00:11 -0300 Subject: [PATCH 4/7] Added active sidebar menu item on omnichannel --- app/livechat/client/views/sideNav/livechatFlex.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/livechat/client/views/sideNav/livechatFlex.js b/app/livechat/client/views/sideNav/livechatFlex.js index a7dc9cb909d9..f57b76c313df 100644 --- a/app/livechat/client/views/sideNav/livechatFlex.js +++ b/app/livechat/client/views/sideNav/livechatFlex.js @@ -1,4 +1,5 @@ import { Template } from 'meteor/templating'; +import { FlowRouter } from 'meteor/kadira:flow-router'; import { SideNav, Layout } from '../../../../ui-utils'; import { t } from '../../../../utils'; @@ -8,11 +9,13 @@ import { sidebarItems } from './livechatSideNavItems'; Template.livechatFlex.helpers({ menuItem(name, icon, section) { + const routeName = FlowRouter.getRouteName(); return { name: t(name), icon, pathSection: section, darken: true, + active: section === routeName, }; }, embeddedVersion() { From 38409e601e5f771697bd632f8a661d8327db6ca2 Mon Sep 17 00:00:00 2001 From: Hullen Gonzales Date: Fri, 27 Mar 2020 15:21:55 -0300 Subject: [PATCH 5/7] Changed route href on some pages to show menu active Tks @rodrigok fot the tips! :rocket: :punch: This changes made current active menu item highlight on the pages bellow - Connectivity Services - Federation Dashboard --- app/cloud/client/index.js | 4 ++-- app/federation/client/admin/dashboard.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/cloud/client/index.js b/app/cloud/client/index.js index 0165b0a25011..128da02fc879 100644 --- a/app/cloud/client/index.js +++ b/app/cloud/client/index.js @@ -9,7 +9,7 @@ import { AdminBox } from '../../ui-utils'; import { hasAtLeastOnePermission } from '../../authorization'; FlowRouter.route('/admin/cloud', { - name: 'cloud-config', + name: 'cloud', async action() { await import('./admin'); BlazeLayout.render('main', { center: 'cloud', old: true }); @@ -26,7 +26,7 @@ FlowRouter.route('/admin/cloud/oauth-callback', { AdminBox.addOption({ icon: 'cloud-plus', - href: 'admin/cloud', + href: 'cloud', i18nLabel: 'Connectivity_Services', permissionGranted() { return hasAtLeastOnePermission(['manage-cloud']); diff --git a/app/federation/client/admin/dashboard.js b/app/federation/client/admin/dashboard.js index e53325264d23..c6f59f7dc86b 100644 --- a/app/federation/client/admin/dashboard.js +++ b/app/federation/client/admin/dashboard.js @@ -78,7 +78,7 @@ FlowRouter.route('/admin/federation-dashboard', { AdminBox.addOption({ icon: 'discover', - href: 'admin/federation-dashboard', + href: 'federation-dashboard', i18nLabel: 'Federation Dashboard', permissionGranted() { return hasRole(Meteor.userId(), 'admin'); From 1a79813b4731855eb0a7ffe97e7e7c7ecdf0e827 Mon Sep 17 00:00:00 2001 From: Hullen Gonzales Date: Fri, 27 Mar 2020 15:44:52 -0300 Subject: [PATCH 6/7] Fix affected routes by name changes (cloud route) --- app/apps/client/admin/helpers.js | 2 +- app/apps/client/admin/marketplace.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/apps/client/admin/helpers.js b/app/apps/client/admin/helpers.js index ca04c715fbc5..f78b4c661599 100644 --- a/app/apps/client/admin/helpers.js +++ b/app/apps/client/admin/helpers.js @@ -47,7 +47,7 @@ const promptCloudLogin = () => { html: false, }, (confirmed) => { if (confirmed) { - FlowRouter.go('cloud-config'); + FlowRouter.go('cloud'); } }); }; diff --git a/app/apps/client/admin/marketplace.js b/app/apps/client/admin/marketplace.js index 0907080453d2..495bda2a90ac 100644 --- a/app/apps/client/admin/marketplace.js +++ b/app/apps/client/admin/marketplace.js @@ -254,7 +254,7 @@ Template.marketplace.helpers({ Template.marketplace.events({ 'click .js-cloud-login'() { - FlowRouter.go('cloud-config'); + FlowRouter.go('cloud'); }, 'submit .js-search-form'(event) { event.stopPropagation(); From c8dd1d284516c735972957621e446f8dfd61f7d8 Mon Sep 17 00:00:00 2001 From: Hullen Gonzales Date: Sat, 18 Apr 2020 23:47:14 -0300 Subject: [PATCH 7/7] Fix admin menu info param prop --- app/ui-admin/client/adminFlex.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ui-admin/client/adminFlex.html b/app/ui-admin/client/adminFlex.html index 140889c1fab2..35ef735fee26 100644 --- a/app/ui-admin/client/adminFlex.html +++ b/app/ui-admin/client/adminFlex.html @@ -8,7 +8,7 @@

{{_ "Administration"}}

    - {{> sidebarItem menuItem "Info" "info-circled" "admin" "info" }} + {{> sidebarItem menuItem "Info" "info-circled" "admin-info" "" }} {{#if hasPermission 'run-import'}} {{> sidebarItem menuItem "Import" "import" "admin-import" "" }}