[https://github.com/tracim/tracim/issues/787] moved admin link into specific dropdown

frontend/src/component/Header/MenuActionListItem/AdminLink.jsx

@@ -0,0 +1,29 @@
+import React from 'react'
+import { Link } from 'react-router-dom'
+import { PAGE } from '../../../helper.js'
+
+const AdminLink = props => {
+  return (
+    <li className='header__menu__rightside__adminlink'>
+      <div className='adminlink dropdown'>
+        <button className='adminlink__btn btn dropdown-toggle' type='button' data-toggle='dropdown'>
+          Administration
+        </button>
+
+        <div className='adminlink__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
+          <Link className='setting__link dropdown-item' to={PAGE.ADMIN.WORKSPACE}>
+            <i className='fa fa-fw fa-space-shuttle mr-2' />
+            {props.t('Admin workspace')}
+          </Link>
+
+          <Link className='setting__link dropdown-item' to={PAGE.ADMIN.USER}>
+            <i className='fa fa-fw fa-users mr-2' />
+            {props.t('Admin user')}
+          </Link>
+        </div>
+      </div>
+    </li>
+  )
+}
+
+export default AdminLink

frontend/src/component/Header/MenuActionListItem/MenuProfil.jsx

@@ -1,12 +1,13 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 import PropTypes from 'prop-types'
-import { PAGE, PROFILE } from '../../../helper.js'
+import { PAGE } from '../../../helper.js'
 import { translate } from 'react-i18next'
 
 const MenuProfil = props => {
-  return props.user.logged
-    ? (
+  if (!props.user.logged) return null
+
+  return (
       <li className='header__menu__rightside__itemprofil'>
         <div className='profilgroup dropdown'>
           <button className='profilgroup__name btn btn-outline-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
@@ -18,20 +19,6 @@ const MenuProfil = props => {
           </button>
 
           <div className='profilgroup__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
-            {props.user.profile === PROFILE.ADMINISTRATOR &&
-              <Link className='setting__link dropdown-item' to={PAGE.ADMIN.WORKSPACE}>
-                <i className='fa fa-fw fa-space-shuttle mr-2' />
-                {props.t('Admin workspace')}
-              </Link>
-            }
-
-            {props.user.profile === PROFILE.ADMINISTRATOR &&
-              <Link className='setting__link dropdown-item' to={PAGE.ADMIN.USER}>
-                <i className='fa fa-fw fa-users mr-2' />
-                {props.t('Admin user')}
-              </Link>
-            }
-
             <Link className='setting__link dropdown-item' to={PAGE.ACCOUNT}>
               <i className='fa fa-fw fa-user-o mr-2' />
               {props.t('My Account')}
@@ -46,7 +33,6 @@ const MenuProfil = props => {
         </div>
       </li>
     )
-    : ''
 }
 export default translate()(MenuProfil)
 

frontend/src/container/Header.jsx

@@ -13,6 +13,7 @@ import MenuActionListItemDropdownLang from '../component/Header/MenuActionListIt
 import MenuActionListItemHelp from '../component/Header/MenuActionListItem/Help.jsx'
 import MenuActionListItemMenuProfil from '../component/Header/MenuActionListItem/MenuProfil.jsx'
 import MenuActionListItemNotification from '../component/Header/MenuActionListItem/Notification.jsx'
+import MenuActionListAdminLink from '../component/Header/MenuActionListItem/AdminLink.jsx'
 import logoHeader from '../img/logo-tracim.png'
 import {
   newFlashMessage,
@@ -22,7 +23,7 @@ import {
 import {
   postUserLogout
 } from '../action-creator.async.js'
-import { COOKIE, PAGE } from '../helper.js'
+import { COOKIE, PAGE, PROFILE } from '../helper.js'
 
 class Header extends React.Component {
   handleClickLogo = () => {}
@@ -86,6 +87,10 @@ class Header extends React.Component {
                 onClickSubmit={this.handleClickSubmit}
               />
 
+              {user.profile === PROFILE.ADMINISTRATOR &&
+                <MenuActionListAdminLink t={this.props.t} />
+              }
+
               <MenuActionListItemDropdownLang
                 langList={lang}
                 idLangActive={user.lang}

frontend/src/css/Header.styl

@@ -69,6 +69,12 @@
           margin-right 30px
           .btnquestion__icon
             color darkGrey
+      &__adminlink
+        margin-right 15px
+        .adminlink__btn
+          border none
+          cursor pointer
+          background-color transparent
       &__itemprofil
         .profilgroup
           margin-right 30px