Merge branch 'master' into rc/3.4.0

CHANGES.md

@@ -4,6 +4,7 @@ CHANGES
 ## 3.4.0-RC
 
 * Improvement: Restrict to access attachments when the user is not allowed to see page
+* Improvement: Show fans and visitors of page
 * Fix: Profile image is not displayed when `FILE_UPLOAD=mongodb`
 * Support: Launch with Node.js v10
 * Support: Launch with MongoDB 3.6

src/client/js/components/PageAttachment/Attachment.js

@@ -48,7 +48,7 @@ export default class Attachment extends React.Component {
       : '';
 
     return (
-      <li>
+      <li className='attachment'>
         <User user={attachment.creator} />
 
         <a href={attachment.filePathProxied}><i className={formatIcon}></i> {attachment.originalName}</a>

src/client/js/components/PageAttachment/PageAttachmentList.js

@@ -26,7 +26,7 @@ export default class PageAttachmentList extends React.Component {
         {(attachmentList.length != 0) &&
           <h5><strong>Attachments</strong></h5>
         }
-        <ul>
+        <ul className='pl-2'>
           {attachmentList}
         </ul>
       </div>

src/client/styles/scss/_attachments.scss

@@ -1,6 +1,11 @@
 .page-attachments-row {
   border-top: solid 1px transparent;
 }
+.page-attachments {
+  li.attachment {
+    list-style: none;
+  }
+}
 .page-attachments, .page-meta {
   font-size: 0.95em;
 

src/server/views/layout-crowi/widget/page_side_header.html

@@ -18,7 +18,7 @@
     </div>
   </div>
 
-  <div class="like-box">
+  <span class="like-box">
     <dl class="dl-horizontal">
       <dt class="text-info">
         <i class="icon-like"></i> {{ t('Like!') }}
@@ -26,7 +26,7 @@
       <dd>
         <p class="liker-user-count">{{ page.liker.length|default(0) }}</p>
         {% if page.liker.length > 15 %}<span class="text-muted">..</span>{% endif %}
-        <span id="liker-list" data-user-ids="{{ page.liker|slice(-15)|default([])|join(',') }}"></div>
+        <span id="liker-list" data-user-ids="{{ page.liker|slice(-15)|default([])|join(',') }}"></span>
       </dd>
 
       <dt class="text-danger">