organize html_title block

lib/locales/ja/translation.json

@@ -81,6 +81,7 @@
   "Customize": "カスタマイズ",
   "Notification settings": "通知設定",
   "User management": "ユーザー管理",
+  "External Account management": "外部アカウント管理",
   "UserGroup management": "グループ管理",
   "Full Text Search management": "全文検索管理",
   "Basic settings": "基本設定",

lib/views/admin/external-accounts.html

@@ -1,11 +1,11 @@
 {% extends '../layout/admin.html' %}
 
-{% block html_title %}{{ customTitle('外部アカウント管理') }}{% endblock %}
+{% block html_title %}{{ customTitle(t('External Account management')) }}{% endblock %}
 
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">ユーザー管理/外部アカウント管理</h1>
+    <h1 class="title" id="">{{ t('User management') }}/{{ t('External Account management') }}</h1>
   </header>
 </div>
 {% endblock %}

lib/views/admin/user-group-detail.html

@@ -1,11 +1,11 @@
 {% extends '../layout/admin.html' %}
 
-{% block html_title %}{{ customTitle('グループ管理/' + userGroup.name) }}{% endblock %}
+{% block html_title %}{{ customTitle(t('UserGroup management') + '/' + userGroup.name) }}{% endblock %}
 
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ 'グループ管理/' + userGroup.name }}</h1>
+    <h1 class="title" id="">{{ t('UserGroup management') + '/' + userGroup.name }}</h1>
   </header>
 </div>
 {% endblock %}

lib/views/admin/user-groups.html

@@ -110,7 +110,7 @@
       <table class="table table-bordered table-user-list">
         <thead>
           <tr>
-            <th width="100px">#</th>
+            <th width="60px">#</th>
             <th>{{ t('Name') }}</th>
             <th>ユーザ一覧</th>
             <th width="100px">作成日</th>
@@ -119,11 +119,12 @@
         </thead>
         <tbody>
           {% for sGroup in userGroups %}
+          {% set sGroupDetailPageUrl = '/admin/user-group-detail/' + sGroup.name %}
           <tr>
             <td>
               <img src="{{ sGroup|picture }}" class="picture img-circle" />
             </td>
-            <td>{{ sGroup.name }}</td>
+            <td><a href="{{ sGroupDetailPageUrl }}">{{ sGroup.name }}</a></td>
             <td><ul class="list-inline">
               {% for relation in userGroupRelations.get(sGroup) %}
               <li class="list-inline-item badge badge-primary">{{relation.relatedUser.username}}</li>
@@ -137,7 +138,7 @@
                 </button>
                 <ul class="dropdown-menu" role="menu">
                   <li>
-                    <a href="/admin/user-group-detail/{{sGroup.name}}">
+                    <a href="{{ sGroupDetailPageUrl }}">
                       <i class="icon-fw icon-note"></i> 編集
                     </a>
                   </li>

lib/views/installer.html

@@ -2,7 +2,7 @@
 
 {% block html_base_css %}installer nologin{% endblock %}
 
-{% block html_title %}セットアップ {% endblock %}
+{% block html_title %}{{ customTitle('セットアップ') }}{% endblock %}
 
 
 

lib/views/invited.html

@@ -2,7 +2,7 @@
 
 {% block html_base_css %}invited nologin{% endblock %}
 
-{% block html_title %}Registration · {% endblock %}
+{% block html_title %}{{ customTitle('Registration') }}{% endblock %}
 
 
 

lib/views/login.html

@@ -2,7 +2,7 @@
 
 {% block html_base_css %}login-page nologin{% endblock %}
 
-{% block html_title %}{{ t('Sign in') }} · {% endblock %}
+{% block html_title %}{{ customTitle(t('Sign in')) }}{% endblock %}
 
 
 

lib/views/me/api_token.html

@@ -1,7 +1,8 @@
 {% extends '../layout-growi/base/layout.html' %}
 
 
-{% block html_title %}{{ t('API Settings') }} · {{ path }}{% endblock %}
+{% block html_title %}{{ customTitle(t('API Settings')) }}{% endblock %}
+
 
 {% block content_header %}
 <div class="header-wrap">

lib/views/me/external-accounts.html

@@ -1,11 +1,11 @@
 {% extends '../layout-growi/base/layout.html' %}
 
-{% block html_title %}{{ t('Password Settings') }} · {{ path }}{% endblock %}
+{% block html_title %}{{ customTitle(t('user_management.external_account')) }}{% endblock %}
 
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Password Settings') }}</h1>
+    <h1 class="title" id="">{{ t('user_management.external_account') }}</h1>
   </header>
 </div>
 {% endblock %}

lib/views/me/index.html

@@ -1,6 +1,6 @@
 {% extends '../layout-growi/base/layout.html' %}
 
-{% block html_title %}{{ t('User Settings') }} · {{ path }}{% endblock %}
+{% block html_title %}{{ customTitle(t('User Settings')) }}{% endblock %}
 
 {% block content_header %}
 <div class="header-wrap">

lib/views/me/password.html

@@ -1,6 +1,6 @@
 {% extends '../layout-growi/base/layout.html' %}
 
-{% block html_title %}{{ t('Password Settings') }} · {{ path }}{% endblock %}
+{% block html_title %}{{ customTitle(t('Password Settings')) }}{% endblock %}
 
 {% block content_header %}
 <div class="header-wrap">