Merge pull request #8358 from RocketChat/remove-accountBox

[FIX] remove accountBox from admin menu
RocketChat · Oct 3, 2017 · 47ed90a · 47ed90a
1 parent 36fa795
commit 47ed90a
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 49 deletions.
diff --git a/packages/rocketchat-authorization/client/startup.js b/packages/rocketchat-authorization/client/startup.js
@@ -3,6 +3,7 @@ Meteor.subscribe('roles');
 RocketChat.AdminBox.addOption({
 	href: 'admin-permissions',
 	i18nLabel: 'Permissions',
+	icon: 'lock',
 	permissionGranted() {
 		return RocketChat.authz.hasAllPermission('access-permissions');
 	}

diff --git a/packages/rocketchat-custom-sounds/client/admin/startup.js b/packages/rocketchat-custom-sounds/client/admin/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'custom-sounds',
 	i18nLabel: 'Custom_Sounds',
+	icon: 'volume',
 	permissionGranted() {
 		return RocketChat.authz.hasAtLeastOnePermission(['manage-sounds']);
 	}

diff --git a/packages/rocketchat-emoji-custom/admin/startup.js b/packages/rocketchat-emoji-custom/admin/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'emoji-custom',
 	i18nLabel: 'Custom_Emoji',
+	icon: 'emoji',
 	permissionGranted() {
 		return RocketChat.authz.hasAtLeastOnePermission(['manage-emoji']);
 	}

diff --git a/packages/rocketchat-integrations/client/startup.js b/packages/rocketchat-integrations/client/startup.js
@@ -1,5 +1,6 @@
 RocketChat.AdminBox.addOption({
 	href: 'admin-integrations',
 	i18nLabel: 'Integrations',
+	icon: 'code',
 	permissionGranted: () => RocketChat.authz.hasAtLeastOnePermission(['manage-integrations', 'manage-own-integrations'])
 });
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
@@ -1,14 +1,13 @@
 <template name="livechatFlex">
 	<aside class="sidebar-light" role="navigation">
-		{{#unless embeddedVersion}}
-			<header class="sidebar__header">
-				{{> accountBox lighten=true modifier="--livechat"}}
-				<button class="sidebar-flex__back-button" data-action="back">
-					{{> icon block="sidebar-flex__back-icon" icon="back"}}
-					<span>{{_ "Back_to_chat"}}</span>
+		<header class="sidebar-flex__header">
+			<h1 class="sidebar-flex__title">{{_ "Livechat"}}</h1>
+			{{#unless embeddedVersion}}
+				<button class="sidebar-flex__close-button" data-action="close">
+					{{> icon block="sidebar-flex__close-icon" icon="cross"}}
 				</button>
-			</header>
-		{{/unless}}
+			{{/unless}}
+		</header>
 		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}">
 			<ul class="rooms-list__list">
 				{{> sidebarItem menuItem "Current_Chats" false "livechat-current-chats" }}

diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
@@ -13,7 +13,7 @@ Template.livechatFlex.helpers({
 });
 
 Template.livechatFlex.events({
-	'click [data-action="back"]'() {
+	'click [data-action="close"]'() {
 		SideNav.closeFlex();
 	}
 });
diff --git a/packages/rocketchat-logger/client/viewLogs.js b/packages/rocketchat-logger/client/viewLogs.js
@@ -2,9 +2,10 @@
 this.stdout = new Mongo.Collection('stdout');
 
 Meteor.startup(function() {
-	return RocketChat.AdminBox.addOption({
+	RocketChat.AdminBox.addOption({
 		href: 'admin-view-logs',
 		i18nLabel: 'View_Logs',
+		icon: 'post',
 		permissionGranted() {
 			return RocketChat.authz.hasAllPermission('view-logs');
 		}

diff --git a/packages/rocketchat-mailer/client/startup.js b/packages/rocketchat-mailer/client/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'mailer',
 	i18nLabel: 'Mailer',
+	icon: 'mail',
 	permissionGranted() {
 		return RocketChat.authz.hasAllPermission('access-mailer');
 	}

diff --git a/packages/rocketchat-oauth2-server-config/admin/client/startup.js b/packages/rocketchat-oauth2-server-config/admin/client/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'admin-oauth-apps',
 	i18nLabel: 'OAuth Apps',
+	icon: 'discover',
 	permissionGranted() {
 		return RocketChat.authz.hasAllPermission('manage-oauth-apps');
 	}

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
@@ -1,16 +1,19 @@
 .sidebar-flex {
-	&__back-button {
-		margin-left: 0.25rem;
+	&__header {
+		padding: var(--sidebar-default-padding);
 
-		padding: 1rem var(--sidebar-default-padding) 1.5rem;
-
-		color: var(--sidebar-flex-back-button-color);
+		display: flex;
+	}
 
+	&__title {
 		font-size: 1rem;
+		font-weight: 400;
+
+		flex: 1;
 	}
 
-	&__back-icon {
-		font-size: 1.25rem;
+	&__close-button {
+		font-size: 18px;
 	}
 
 	&__search {

diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html
@@ -1,14 +1,13 @@
 <template name="accountFlex">
 	<aside class="sidebar-light" role="navigation">
-		{{#unless embeddedVersion}}
-			<header class="sidebar__header">
-				{{> accountBox lighten=true modifier="--account" }}
-				<button class="sidebar-flex__back-button" data-action="back">
-					{{> icon block="sidebar-flex__back-icon" icon="back"}}
-					<span>{{_ "Back_to_chat"}}</span>
+		<header class="sidebar-flex__header">
+			<h1 class="sidebar-flex__title">{{_ "My_Account"}}</h1>
+			{{#unless embeddedVersion}}
+				<button class="sidebar-flex__close-button" data-action="close">
+					{{> icon block="sidebar-flex__close-icon" icon="cross"}}
 				</button>
-			</header>
-		{{/unless}}
+			{{/unless}}
+		</header>
 		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}">
 			<ul class="rooms-list__list">
 				{{> sidebarItem menuItem "Preferences" "customize" "account" "preferences" }}

diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js
@@ -1,5 +1,5 @@
 Template.accountFlex.events({
-	'click [data-action="back"]'() {
+	'click [data-action="close"]'() {
 		SideNav.closeFlex();
 	}
 });

diff --git a/packages/rocketchat-ui-admin/client/adminFlex.html b/packages/rocketchat-ui-admin/client/adminFlex.html
@@ -1,34 +1,32 @@
 <template name="adminFlex">
 	<aside class="sidebar-light" role="navigation">
-		{{#unless embeddedVersion}}
-			<header class="sidebar__header">
-				{{> accountBox lighten=true modifier="--admin"}}
-				<button class="sidebar-flex__back-button" data-action="back">
-					{{> icon block="sidebar-flex__back-icon" icon="back"}}
-					<span>{{_ "Back_to_chat"}}</span>
+		<header class="sidebar-flex__header">
+			<h1 class="sidebar-flex__title">{{_ "Administration"}}</h1>
+			{{#unless embeddedVersion}}
+				<button class="sidebar-flex__close-button" data-action="close">
+					{{> icon block="sidebar-flex__close-icon" icon="cross"}}
 				</button>
-			</header>
-		{{/unless}}
+			{{/unless}}
+		</header>
 		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}" aria-label="{{_ "Administration"}}">
-			<h3 class="rooms-list__type">{{_ "Administration"}}</h3>
 			<ul class="rooms-list__list">
-				{{> sidebarItem menuItem "Info" false "admin-info" "" }}
+				{{> sidebarItem menuItem "Info" "info-circled" "admin-info" "" }}
 
 				{{#if hasPermission 'run-import'}}
-					{{> sidebarItem menuItem "Import" false "admin-import" "" }}
+					{{> sidebarItem menuItem "Import" "import" "admin-import" "" }}
 				{{/if}}
 
 				{{#if hasPermission 'view-room-administration'}}
-					{{> sidebarItem menuItem "Rooms" false "admin-rooms" "" }}
+					{{> sidebarItem menuItem "Rooms" "hashtag" "admin-rooms" "" }}
 				{{/if}}
 
 				{{#if hasPermission 'view-user-administration'}}
-					{{> sidebarItem menuItem "Users" false "admin-users" "" }}
+					{{> sidebarItem menuItem "Users" "team" "admin-users" "" }}
 				{{/if}}
 
 				{{#each adminBoxOptions}}
 					{{#if permissionGranted}}
-						{{> sidebarItem menuItem label false href "" }}
+						{{> sidebarItem menuItem label icon href "" }}
 					{{/if}}
 				{{/each}}
 			</ul>

diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js
@@ -70,7 +70,7 @@ Template.adminFlex.helpers({
 });
 
 Template.adminFlex.events({
-	'click [data-action="back"]'() {
+	'click [data-action="close"]'() {
 		SideNav.closeFlex();
 	},
 	'keyup [name=settings-search]'(e, t) {

diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -4,17 +4,19 @@
 			<div class="sidebar-item__user-status sidebar-item__user-status--{{statusClass}}"></div>
 		{{/if}}
 		<a class="sidebar-item__link" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
-			<div class="sidebar-item__picture">
-				{{#if icon}}
+			{{#if icon}}
+				<div class="sidebar-item__picture">
 					{{> icon block="sidebar-item__icon" icon=icon}}
-				{{else}}
-					{{#if avatar}}
+				</div>
+			{{else}}
+				{{#if avatar}}
+					<div class="sidebar-item__picture">
 						<div class="sidebar-item__user-thumb">
 							{{> avatar username=username}}
 						</div>
-					{{/if}}
+					</div>
 				{{/if}}
-			</div>
+			{{/if}}
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
 			{{#if unread}}
 				<span class="badge badge--unread">{{#if userMentions}}@ {{/if}}{{unread}}</span>

diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
@@ -37,7 +37,7 @@ class SideNav extends Page {
 	get preferences() { return browser.element('[href="/account/preferences"]'); }
 	get profile() { return browser.element('[href="/account/profile"]'); }
 	get avatar() { return browser.element('[href="/changeavatar"]'); }
-	get preferencesClose() { return browser.element('.sidebar-flex__back-button[data-action="back"]'); }
+	get preferencesClose() { return browser.element('.sidebar-flex__close-button[data-action="close"]'); }
 
 	get burgerBtn() { return browser.element('.burger'); }