remove admin-markdown-setting DOM

src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -3,7 +3,10 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 const AdminNavigation = (props) => {
-  const { t, activeMenu } = props;
+  const { t } = props;
+
+  const pathname = window.location.pathname;
+  const activeMenu = pathname.split('/')[2];
 
   return (
     <ul className="nav nav-pills nav-stacked">
@@ -48,7 +51,6 @@ const AdminNavigation = (props) => {
 AdminNavigation.propTypes = {
   t: PropTypes.func.isRequired, // i18next
 
-  activeMenu: PropTypes.string.isRequired,
 };
 
 export default withTranslation()(AdminNavigation);

src/client/js/components/Admin/MarkdownSetting/MarkDownSetting.jsx

@@ -12,7 +12,6 @@ import LineBreakForm from './LineBreakForm';
 import PresentationForm from './PresentationForm';
 import XssForm from './XssForm';
 import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
-import AdminNavigation from '../Common/AdminNavigation';
 
 const logger = loggerFactory('growi:MarkDown');
 
@@ -37,33 +36,26 @@ class MarkdownSetting extends React.Component {
 
     return (
       <React.Fragment>
-        <div className="row">
-
-          <div className="col-md-9">
-            {/* Line Break Setting */}
-            <div className="row mb-5">
-              <h2 className="border-bottom">{t('admin:markdown_setting.lineBreak_header')}</h2>
-              <p className="well">{t('admin:markdown_setting.lineBreak_desc')}</p>
-              <LineBreakForm />
-            </div>
-
-            {/* Presentation Setting */}
-            <div className="row mb-5">
-              <h2 className="border-bottom">{t('admin:markdown_setting.presentation_header')}</h2>
-              <p className="well">{t('admin:markdown_setting.presentation_desc')}</p>
-              <PresentationForm />
-            </div>
-
-            {/* XSS Setting */}
-            <div className="row mb-5">
-              <h2 className="border-bottom">{t('admin:markdown_setting.xss_header')}</h2>
-              <p className="well">{t('admin:markdown_setting.xss_desc')}</p>
-              <XssForm />
-            </div>
-          </div>
+        {/* Line Break Setting */}
+        <div className="row mb-5">
+          <h2 className="border-bottom">{t('admin:markdown_setting.lineBreak_header')}</h2>
+          <p className="well">{t('admin:markdown_setting.lineBreak_desc')}</p>
+          <LineBreakForm />
+        </div>
 
+        {/* Presentation Setting */}
+        <div className="row mb-5">
+          <h2 className="border-bottom">{t('admin:markdown_setting.presentation_header')}</h2>
+          <p className="well">{t('admin:markdown_setting.presentation_desc')}</p>
+          <PresentationForm />
         </div>
 
+        {/* XSS Setting */}
+        <div className="row mb-5">
+          <h2 className="border-bottom">{t('admin:markdown_setting.xss_header')}</h2>
+          <p className="well">{t('admin:markdown_setting.xss_desc')}</p>
+          <XssForm />
+        </div>
       </React.Fragment>
     );
   }

src/server/views/admin/markdown.html

@@ -11,8 +11,8 @@
 </div>
 {% endblock %}
 
-{% block content_main %}
-<div class="content-main" id="admin-markdown-setting"></div>
+{% block content_main_after %}
+<div class="content-main col-md-9" id="admin-markdown-setting"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/layout/admin.html

@@ -8,6 +8,10 @@
 <script src="{{ webpack_asset('js/admin.js') }}" defer></script>
 {% endblock %}
 
+{% block content_main %}
+  <div class="col-md-3" id="admin-navigation"></div>
+{% endblock content_main %}
+
 {# disable custom script in admin page #}
 {% block custom_script %}
 {% endblock %}