itizawa 6 лет назад
Родитель
Сommit
9a80de1845

+ 2 - 2
src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -13,8 +13,8 @@ const AdminNavigation = (props) => {
 
 
   return (
   return (
     <ul className="nav nav-pills nav-stacked">
     <ul className="nav nav-pills nav-stacked">
-      <li className={`${isActiveMenu('/') && 'active'}`}>
-        <a href="/admin"><i className="icon-fw icon-home"></i> { t('Management Wiki Home') }</a>
+      <li className={`${isActiveMenu('/home') && 'active'}`}>
+        <a href="/admin/home"><i className="icon-fw icon-home"></i> { t('Management Wiki Home') }</a>
       </li>
       </li>
       <li className={`${isActiveMenu('/app') && 'active'}`}>
       <li className={`${isActiveMenu('/app') && 'active'}`}>
         <a href="/admin/app"><i className="icon-fw icon-settings"></i> { t('App Settings') }</a>
         <a href="/admin/app"><i className="icon-fw icon-settings"></i> { t('App Settings') }</a>

+ 1 - 1
src/server/routes/index.js

@@ -57,7 +57,7 @@ module.exports = function(crowi, app) {
   app.get('/register'                , middlewares.applicationInstalled    , login.register);
   app.get('/register'                , middlewares.applicationInstalled    , login.register);
   app.get('/logout'                  , logout.logout);
   app.get('/logout'                  , logout.logout);
 
 
-  app.get('/admin'                          , loginRequiredStrictly , adminRequired , admin.index);
+  app.get('/admin/home'                          , loginRequiredStrictly , adminRequired , admin.index);
   app.get('/admin/app'                      , loginRequiredStrictly , adminRequired , admin.app.index);
   app.get('/admin/app'                      , loginRequiredStrictly , adminRequired , admin.app.index);
 
 
   // security admin
   // security admin

+ 3 - 1
src/server/views/admin/markdown.html

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

+ 1 - 1
src/server/views/layout/layout.html

@@ -124,7 +124,7 @@
       <ul class="nav navbar-top-links navbar-right pull-right">
       <ul class="nav navbar-top-links navbar-right pull-right">
         {% if user and user.admin %}
         {% if user and user.admin %}
         <li class="nav-item-admin">
         <li class="nav-item-admin">
-          <a href="/admin">
+          <a href="/admin/home">
             <i class="icon-settings"></i><span>{{ t('Admin') }}</span>
             <i class="icon-settings"></i><span>{{ t('Admin') }}</span>
           </a>
           </a>
         </li>
         </li>