Sfoglia il codice sorgente

add PersonalDropdown

itizawa 5 anni fa
parent
commit
77f2c738f1
2 ha cambiato i file con 11 aggiunte e 8 eliminazioni
  1. 0 2
      src/client/js/base.jsx
  2. 11 6
      src/client/js/components/Navbar/GrowiNavbar.jsx

+ 0 - 2
src/client/js/base.jsx

@@ -44,9 +44,7 @@ const componentMappings = {
   'grw-navbar-toggler': <NavbarToggler />,
 
   'grw-search-top': <SearchTop />,
-  'personal-dropdown': <PersonalDropdown />,
 
-  'create-page-button': <PageCreateButton />,
   'create-page-button-icon': <PageCreateButton isIcon />,
   'page-create-modal': <PageCreateModal />,
 

+ 11 - 6
src/client/js/components/Navbar/GrowiNavbar.jsx

@@ -8,25 +8,30 @@ import NavigationContainer from '../../services/NavigationContainer';
 import AppContainer from '../../services/AppContainer';
 
 import PageCreateButton from './PageCreateButton';
+import PersonalDropdown from './PersonalDropdown';
 
 class GrowiNavbar extends React.Component {
 
   renderNavbarRight() {
     return (
-      <li className="nav-item d-none d-md-block">
-        <PageCreateButton />
-      </li>
+      <>
+        <li className="nav-item d-none d-md-block">
+          <PageCreateButton />
+        </li>
 
-    //   {% if isSearchServiceConfigured() %}
+        {/* //   {% if isSearchServiceConfigured() %}
     //     <li class="nav-item d-md-none">
     //       <a type="button" class="nav-link px-4" data-target="#grw-search-top-collapse" data-toggle="collapse">
     //         <i class="icon-magnifier mr-2"></i>
     //       </a>
     //     </li>
     //   {% endif %}
-    //   <li id="personal-dropdown" class="grw-personal-dropdown nav-item dropdown dropdown-toggle dropdown-toggle-no-caret"></li>
     // {% else %}
-    //   <li id="login-user" class="nav-item"><a class="nav-link" href="/login">Login</a></li>
+    //   <li id="login-user" class="nav-item"><a class="nav-link" href="/login">Login</a></li> */}
+        <li className="grw-personal-dropdown nav-item dropdown dropdown-toggle dropdown-toggle-no-caret">
+          <PersonalDropdown />
+        </li>
+      </>
     );
   }