remove PageCreateButton

src/client/js/base.jsx

@@ -10,7 +10,6 @@ import StaffCredit from './components/StaffCredit/StaffCredit';
 
 import AppContainer from './services/AppContainer';
 import WebsocketContainer from './services/WebsocketContainer';
-import PageCreateButton from './components/Navbar/PageCreateButton';
 import PageCreateModal from './components/PageCreateModal';
 
 const logger = loggerFactory('growi:cli:app');
@@ -41,7 +40,6 @@ const componentMappings = {
   'grw-navbar': <GrowiNavbar />,
   'grw-navbar-bottom-container': <GrowiNavbarBottom />,
 
-  'create-page-button-icon': <PageCreateButton isIcon />,
   'page-create-modal': <PageCreateModal />,
 
   'grw-sidebar-wrapper': <Sidebar />,

src/client/js/components/Navbar/GrowiNavbar.jsx

@@ -9,14 +9,13 @@ import AppContainer from '../../services/AppContainer';
 
 import GrowiLogo from '../GrowiLogo';
 
-import PageCreateButton from './PageCreateButton';
 import PersonalDropdown from './PersonalDropdown';
 import GlobalSearch from './GlobalSearch';
 
 class GrowiNavbar extends React.Component {
 
   renderNavbarRight() {
-    const { appContainer } = this.props;
+    const { t, appContainer, navigationContainer } = this.props;
     const { currentUser } = appContainer;
 
     // render login button
@@ -27,7 +26,10 @@ class GrowiNavbar extends React.Component {
     return (
       <>
         <li className="nav-item d-none d-md-block">
-          <PageCreateButton />
+          <button className="px-md-2 nav-link btn-create-page border-0 bg-transparent" type="button" onClick={navigationContainer.openPageCreateModal}>
+            <i className="icon-pencil mr-2"></i>
+            <span className="d-none d-lg-block">{ t('New') }</span>
+          </button>
         </li>
 
         <li className="grw-personal-dropdown nav-item dropdown dropdown-toggle dropdown-toggle-no-caret">

src/client/js/components/Navbar/PageCreateButton.jsx

@@ -1,41 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { withTranslation } from 'react-i18next';
-
-import { withUnstatedContainers } from '../UnstatedUtils';
-import NavigationContainer from '../../services/NavigationContainer';
-
-const PageCreateButton = (props) => {
-  const { t, navigationContainer, isIcon } = props;
-
-  if (isIcon) {
-    return (
-      <button className="btn btn-lg btn-primary rounded-circle waves-effect waves-light" type="button" onClick={navigationContainer.openPageCreateModal}>
-        <i className="icon-pencil"></i>
-      </button>
-    );
-  }
-
-  return (
-    <button className="px-md-2 nav-link create-page border-0 bg-transparent" type="button" onClick={navigationContainer.openPageCreateModal}>
-      <i className="icon-pencil mr-2"></i>
-      <span className="d-none d-lg-block">{ t('New') }</span>
-    </button>
-  );
-};
-
-/**
- * Wrapper component for using unstated
- */
-const PageCreateButtonWrapper = withUnstatedContainers(PageCreateButton, [NavigationContainer]);
-
-
-PageCreateButton.propTypes = {
-  t: PropTypes.func.isRequired, //  i18next
-  navigationContainer: PropTypes.instanceOf(NavigationContainer).isRequired,
-
-  isIcon: PropTypes.bool,
-};
-
-export default withTranslation()(PageCreateButtonWrapper);

src/client/styles/scss/_navbar_kibela.scss

@@ -20,7 +20,8 @@
         }
       }
     }
-    .create-page {
+
+    .btn-create-page {
       background: #5584e1;
       border-radius: 0.35em;
       &:hover {

src/server/views/layout/layout.html

@@ -93,13 +93,9 @@
 
 </div><!-- /#wrapper -->
 
-{% if user %}
-  <div class="grw-fixed-controls-container d-md-none d-edit-none animated fadeInUp faster">
-    <div class="grw-fixed-controls-button-container rounded-circle">
-      <div id='create-page-button-icon'></div>
-    </div>
-  </div>
-{% endif %}
+{% block fixed-controls %}
+<div id="grw-fixed-controls-container"></div>
+{% endblock %}
 
 <!-- /#staff-credit -->
 <div id="staff-credit"></div>