Yuki Takei 8 лет назад
Родитель
Сommit
05414d6f45
3 измененных файлов с 21 добавлено и 15 удалено
  1. 15 14
      lib/views/admin/users.html
  2. 1 1
      lib/views/layout/admin.html
  3. 5 0
      resource/css/_admin.scss

+ 15 - 14
lib/views/admin/users.html

@@ -134,39 +134,40 @@
 
 
       <h2>ユーザー一覧</h2>
       <h2>ユーザー一覧</h2>
 
 
-      <table class="table table-hover table-striped table-bordered">
+      <table class="table table-hover table-striped table-bordered table-user-list">
         <thead>
         <thead>
           <tr>
           <tr>
-            <th>#</th>
-            <th>ユーザーID</th>
+            <th width="100px">#</th>
+            <th>Status</th>
+            <th><code>username</code></th>
             <th>名前</th>
             <th>名前</th>
             <th>メールアドレス</th>
             <th>メールアドレス</th>
-            <th>作成日</th>
-            <th>最終ログイン</th>
-            <th>操作</th>
+            <th width="100px">作成日</th>
+            <th width="150px">最終ログイン</th>
+            <th width="90px">操作</th>
           </tr>
           </tr>
         </thead>
         </thead>
         <tbody>
         <tbody>
           {% for sUser in users %}
           {% for sUser in users %}
           <tr>
           <tr>
             <td>
             <td>
-              <img src="{{ sUser|picture }}" class="picture picture-rounded" /><br>
-              <span class="label {{ css.userStatus(sUser) }}">
-                {{ consts.userStatus[sUser.status] }}
-              </span><br>
+              <img src="{{ sUser|picture }}" class="picture picture-rounded" />
               {% if sUser.admin %}
               {% if sUser.admin %}
-              <span class="label label-primary">
+              <span class="label label-primary label-admin">
                 Admin
                 Admin
               </span>
               </span>
               {% endif %}
               {% endif %}
             </td>
             </td>
+            <td>
+              <span class="label {{ css.userStatus(sUser) }}">
+                {{ consts.userStatus[sUser.status] }}
+              </span>
+            </td>
             <td>
             <td>
               <strong>{{ sUser.username }}</strong>
               <strong>{{ sUser.username }}</strong>
             </td>
             </td>
             <td>{{ sUser.name }}</td>
             <td>{{ sUser.name }}</td>
             <td>{{ sUser.email }}</td>
             <td>{{ sUser.email }}</td>
-            <td>{{ sUser.createdAt|date('Y-m-d') }}</td>
-            <td>{{ sUser.lastLoginAt|date('Y-m-d') }}</td>
             <td>{{ sUser.createdAt|date('Y-m-d', sUser.createdAt.getTimezoneOffset()) }}</td>
             <td>{{ sUser.createdAt|date('Y-m-d', sUser.createdAt.getTimezoneOffset()) }}</td>
             <td>
             <td>
               {% if sUser.lastLoginAt %}
               {% if sUser.lastLoginAt %}
@@ -175,7 +176,7 @@
             </td>
             </td>
             <td>
             <td>
               <div class="btn-group admin-user-menu">
               <div class="btn-group admin-user-menu">
-                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
                   編集
                   編集
                   <span class="caret"></span>
                   <span class="caret"></span>
                 </button>
                 </button>

+ 1 - 1
lib/views/layout/admin.html

@@ -1,4 +1,4 @@
-{% extends '2column.html' %}
+{% extends 'single.html' %}
 
 
 {% block html_additional_headers %}
 {% block html_additional_headers %}
   {% parent %}
   {% parent %}

+ 5 - 0
resource/css/_admin.scss

@@ -31,4 +31,9 @@
     }
     }
   }
   }
 
 
+  .table-user-list {
+    .label-admin {
+      margin-left: 1em;
+    }
+  }
 } // }}}
 } // }}}