Merge branch 'master' into csrf-protection

lib/routes/page.js

@@ -430,7 +430,7 @@ module.exports = function(crowi, app) {
       if (user === null) {
         throw new Error('The user not found.');
       }
-      renderVars.user = user;
+      renderVars.pageUser = user;
 
       return Bookmark.findByUser(user, queryOptions);
     }).then(function(bookmarks) {
@@ -468,7 +468,7 @@ module.exports = function(crowi, app) {
       if (user === null) {
         throw new Error('The user not found.');
       }
-      renderVars.user = user;
+      renderVars.pageUser = user;
 
       return Page.findListByCreator(user, queryOptions);
     }).then(function(pages) {

lib/views/user/bookmarks.html

@@ -2,14 +2,14 @@
 
 {% block main_css_class %}bookmark-page{% endblock %}
 
-{% block html_title %}{{ user.name }}'s Bookmarks · {% endblock %}
+{% block html_title %}{{ pageUser.name }}'s Bookmarks · {% endblock %}
 
 {% block content_head %}
 <div class="header-wrap">
   <header id="page-header">
     <p class="stopper"><a href="#" data-affix-disable="#page-header"><i class="fa fa-chevron-up"></i></a></p>
 
-    <h1 class="title">{{ user.name }}'s Bookmarks</h1>
+    <h1 class="title">{{ pageUser.name }}'s Bookmarks</h1>
   </header>
 </div>
 {% endblock %}

lib/views/user/recent-create.html

@@ -2,14 +2,14 @@
 
 {% block main_css_class %}recent-create-page{% endblock %}
 
-{% block html_title %}{{ user.name }}'s Recent Created Pages 揃 {% endblock %}
+{% block html_title %}{{ pageUser.name }}'s Recent Created Pages 揃 {% endblock %}
 
 {% block content_head %}
 <div class="header-wrap">
   <header id="page-header">
     <p class="stopper"><a href="#" data-affix-disable="#page-header"><i class="fa fa-chevron-up"></i></a></p>
 
-    <h1 class="title">{{ user.name }}'s Created Pages</h1>
+    <h1 class="title">{{ pageUser.name }}'s Created Pages</h1>
   </header>
 </div>
 {% endblock %}

lib/views/widget/page_list.html

@@ -33,7 +33,7 @@
 
     {% if viewConfig.seener_threshold and page.seenUsers.length >= viewConfig.seener_threshold %}
     <span>
-      <i class="fa fa-eye">{{ page.seenUsers.length }}</i>
+      <i class="fa fa-eye"></i>{{ page.seenUsers.length }}
     </span>
     {% endif  %}
 

lib/views/widget/page_side_content.html

@@ -2,11 +2,11 @@
 <ul class="fitted-list">
   <li data-toggle="tooltip" data-placement="bottom" title="共有用リンク" class="input-group">
     <span class="input-group-addon">共有用</span>
-    <input class="copy-link form-control" type="text" value="{{ config.crowi['app:title']|default('Crowi') }} {{ path }}  {{ baseUrl }}/{{ page._id.toString() }}">
+    <input readonly class="copy-link form-control" type="text" value="{{ config.crowi['app:title']|default('Crowi') }} {{ path }}  {{ baseUrl }}/{{ page._id.toString() }}">
   </li>
   <li data-toggle="tooltip" data-placement="bottom" title="Markdown形式のリンク" class="input-group">
     <span class="input-group-addon">Markdown</span>
-    <input class="copy-link form-control" type="text" value="[{{ path }}]({{ baseUrl }}/{{ page._id.toString() }})">
+    <input readonly class="copy-link form-control" type="text" value="[{{ path }}]({{ baseUrl }}/{{ page._id.toString() }})">
   </li>
 </ul>
 

resource/css/_wiki.scss

@@ -104,6 +104,7 @@ div.body {
     background: #444;
     color: #f0f0f0;
     font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+    word-break: break-word;
   }
 
   img {