Sotaro KARASAWA 10 лет назад
Родитель
Сommit
5143104629

+ 2 - 2
lib/util/swigFunctions.js

@@ -43,8 +43,8 @@ module.exports = function(crowi, app, locals) {
     return false;
   };
 
-  locals.user_page_root = function(user) {
-    if (!user) {
+  locals.userPageRoot = function(user) {
+    if (!user || !user.username) {
       return '';
     }
     return '/user/' + user.username;

+ 3 - 3
lib/views/modal/widget_today_memo.html

@@ -9,13 +9,13 @@
         <h4 class="modal-title">新規メモを作成</h4>
       </div>
       <div class="modal-body">
-        <p><a href="{{ user_page_root(user) }}/メモ/"><i class="fa fa-list-ul"></i> 自分のメモ一覧を見る</a></p>
+        <p><a href="{{ userPageRoot(user) }}/メモ/"><i class="fa fa-list-ul"></i> 自分のメモ一覧を見る</a></p>
 
           <div class="input-group">
-            <span class="input-group-addon">{{ user_page_root(user) }}/メモ/{{ now|datetz('Y/m/d') }}/</span>
+            <span class="input-group-addon">{{ userPageRoot(user) }}/メモ/{{ now|datetz('Y/m/d') }}/</span>
             <input type="text" class="form-control" id="memoName" name="memoName" placeholder="メモ名を入力">
           </div>
-          <input type="hidden" class="form-control" name="memoNamePrefix" value="{{ user_page_root(user) }}/メモ/{{ now|datetz('Y/m/d') }}/">
+          <input type="hidden" class="form-control" name="memoNamePrefix" value="{{ userPageRoot(user) }}/メモ/{{ now|datetz('Y/m/d') }}/">
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">キャンセル</button>

+ 4 - 10
lib/views/widget/page_side_header.html

@@ -3,11 +3,13 @@
   <div class="row">
     {# default(author) としているのは、v1.1.1 以前に page.creator データが入ってないから。暫定として最新更新ユーザーを表示しちゃう。 #}
     <div class="col-md-3 creator-picture">
-      <img src="{{ page.creator|default(author)|picture }}" class="picture picture-lg picture-rounded"><br>
+      <a href="{{ userPageRoot(page.creator) }}">
+        <img src="{{ page.creator|default(author)|picture }}" class="picture picture-lg picture-rounded"><br>
+      </a>
     </div>
     <div class="col-md-9">
       <p class="creator">
-        {{ page.creator.name|default(author.name) }}
+        <a href="{{ userPageRoot(page.creator) }}">{{ page.creator.name|default(author.name) }}</a>
       </p>
       <p class="created-at">
         作成日: {{ page.createdAt|datetz('Y/m/d H:i:s') }}<br>
@@ -39,14 +41,6 @@
           {{ page.seenUsers.length }}
         </p>
         <p id="seen-user-list" class="seen-user-list" data-seen-users="{{ page.seenUsers|default([])|join(',') }}">
-        {#
-          {% for seenUser in page.seenUsers %}
-          <a href="{{ user_page_root(seenUser) }}" title="{{ seenUser.name }}"><img alt="{{ seenUser.name }}" src="{{ seenUser|picture }}" class="picture picture-xs picture-rounded"></a>
-          {% endfor %}
-          {% if page.seenUsers.length > 10 %}
-            (...)
-          {% endif %}
-        #}
         </p>
       </dd>
     </dl>