brushup the view for managing ExternalAccount

lib/routes/admin.js

@@ -493,11 +493,11 @@ module.exports = function(crowi, app) {
     ExternalAccount.findOneAndRemove({accountId})
       .then((result) => {
         req.flash('successMessage', `外部アカウント '${accountId}' を削除しました`);
-        return res.redirect('/admin/external-accounts');
+        return res.redirect('/admin/users/external-accounts');
       })
       .catch((err) => {
         req.flash('errorMessage', '削除に失敗しました。');
-        return res.redirect('/admin/external-accounts');
+        return res.redirect('/admin/users/external-accounts');
       });
   };
 

lib/routes/index.js

@@ -102,8 +102,8 @@ module.exports = function(crowi, app) {
   // new route patterns from here:
   app.post('/_api/admin/users.resetPassword'  , loginRequired(crowi, app) , middleware.adminRequired() , csrf, admin.user.resetPassword);
 
-  app.get('/admin/external-accounts'               , loginRequired(crowi, app) , middleware.adminRequired() , admin.externalAccount.index);
-  app.post('/admin/external-accounts/:id/remove'   , loginRequired(crowi, app) , middleware.adminRequired() , admin.externalAccount.remove);
+  app.get('/admin/users/external-accounts'               , loginRequired(crowi, app) , middleware.adminRequired() , admin.externalAccount.index);
+  app.post('/admin/users/external-accounts/:id/remove'   , loginRequired(crowi, app) , middleware.adminRequired() , admin.externalAccount.remove);
 
   app.get('/me'                       , loginRequired(crowi, app) , me.index);
   app.get('/me/password'              , loginRequired(crowi, app) , me.password);

lib/views/admin/external-accounts.html

@@ -5,7 +5,7 @@
 {% block content_head %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">外部アカウント管理</h1>
+    <h1 class="title" id="">ユーザー管理/外部アカウント管理</h1>
   </header>
 </div>
 {% endblock %}
@@ -95,7 +95,7 @@
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">編集メニュー</li>
                   <li class="dropdown-button">
-                    <form action="/admin/external-accounts/{{ account.accountId }}/remove" method="post">
+                    <form action="/admin/users/external-accounts/{{ account.accountId }}/remove" method="post">
                       <input type="hidden" name="_csrf" value="{{ csrf() }}">
                       <button type="submit" class="btn btn-block btn-danger">削除する</button>
                     </form>
@@ -111,7 +111,7 @@
         </tbody>
       </table>
 
-      {% include '../widget/pager.html' with {path: "/admin/external-accounts", pager: pager} %}
+      {% include '../widget/pager.html' with {path: "/admin/users/external-accounts", pager: pager} %}
 
     </div>
   </div>

lib/views/admin/users.html

@@ -34,7 +34,7 @@
     <div class="col-md-9">
       <p>
         <button data-toggle="collapse" class="btn btn-default" href="#inviteUserForm">新規ユーザーの招待</button>
-        <a class="btn btn-default" href="/admin/external-accounts">
+        <a class="btn btn-default" href="/admin/users/external-accounts">
           <i class="fa fa-user-plus" aria-hidden="true"></i>
           外部アカウントの管理
         </a>

lib/views/admin/widget/menu.html

@@ -8,7 +8,7 @@
   <li class="{% if current == 'markdown'%}active{% endif %}"><a href="/admin/markdown"><i class="fa fa-pencil"></i> Markdown設定</a></li>
   <li class="{% if current == 'customize'%}active{% endif %}"><a href="/admin/customize"><i class="fa fa-object-group"></i> カスタマイズ</a></li>
   <li class="{% if current == 'notification'%}active{% endif %}"><a href="/admin/notification"><i class="fa fa-bell"></i> 通知設定</a></li>
-  <li class="{% if current == 'user'%}active{% endif %}"><a href="/admin/users"><i class="fa fa-users"></i> ユーザー管理</a></li>
+  <li class="{% if current == 'user' || current == 'external-account' %}active{% endif %}"><a href="/admin/users"><i class="fa fa-users"></i> ユーザー管理</a></li>
   {% if searchConfigured() %}
   <li class="{% if current == 'search'%}active{% endif %}"><a href="/admin/search"><i class="fa fa-search"></i> 検索管理</a></li>
   {% endif %}