except home

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

@@ -5,15 +5,15 @@ import urljoin from 'url-join';
 
 const AdminNavigation = (props) => {
   const { t } = props;
+  const pathname = window.location.pathname;
 
   const isActiveMenu = (path) => {
-    const pathname = window.location.pathname;
     return (pathname.startsWith(urljoin('/admin', path)));
   };
 
   return (
     <ul className="nav nav-pills nav-stacked">
-      <li className={`${isActiveMenu('/home') && 'active'}`}>
+      <li className={`${pathname === '/' && 'active'}`}>
         <a href="/admin/home"><i className="icon-fw icon-home"></i> { t('Management Wiki Home') }</a>
       </li>
       <li className={`${isActiveMenu('/app') && 'active'}`}>

src/server/routes/index.js

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

src/server/views/layout/layout.html

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