Merge branch 'master' into support/lint-in-ci

# Conflicts:
#	resource/js/legacy/crowi.js

CHANGES.md

@@ -5,6 +5,7 @@ CHANGES
 
 * Improvement: Add Vim/Emacs/Sublime-Text icons for keybindings menu
 * Improvement: Add 'mono-blue' theme
+* Fix: Unportalize process failed silently
 * Support: Switch the logger from 'pino' to 'bunyan'
 * Support: Set the alias for 'debug' to the debug function of 'bunyan'
 * Support: Translate /admin/security

lib/locales/en-US/sandbox.md

@@ -232,7 +232,7 @@ ___
 
 ```
 [/Sandbox]
-</user/admin1>
+&lt;/user/admin1>
 ```
 
 [/Sandbox]  
@@ -240,8 +240,8 @@ ___
 
 ## Pukiwiki like linker
 
-(available by [weseek/crowi-plugin-pukiwiki-like-linker
-](https://github.com/weseek/crowi-plugin-pukiwiki-like-linker) )
+(available by [weseek/growi-plugin-pukiwiki-like-linker
+](https://github.com/weseek/growi-plugin-pukiwiki-like-linker) )
 
 最も柔軟な Linker です。  
 記述中のページを基点とした相対リンクと、表示テキストに対するリンクを同時に実現できます。

lib/locales/ja/sandbox.md

@@ -232,7 +232,7 @@ ___
 
 ```
 [/Sandbox]
-</user/admin1>
+&lt;/user/admin1>
 ```
 
 [/Sandbox]  
@@ -240,8 +240,8 @@ ___
 
 ## Pukiwiki like linker
 
-(available by [weseek/crowi-plugin-pukiwiki-like-linker
-](https://github.com/weseek/crowi-plugin-pukiwiki-like-linker) )
+(available by [weseek/growi-plugin-pukiwiki-like-linker
+](https://github.com/weseek/growi-plugin-pukiwiki-like-linker) )
 
 最も柔軟な Linker です。  
 記述中のページを基点とした相対リンクと、表示テキストに対するリンクを同時に実現できます。

lib/views/modal/unportalize.html

@@ -32,17 +32,21 @@
             </div>
         </div>
         <div class="modal-footer">
-          <p class="pull-left text-left">
-            <small id="newPageNameCheck"></small>
-            <br>
-            <span id="linkToNewPage"></span>
-          </p>
-          <input type="hidden" name="_csrf" value="{{ csrf() }}">
-          <input type="hidden" name="path" value="{{ page.path }}">
-          <input type="hidden" class="form-control" name="new_path" id="newPageName" value="{{ unportalizedPath }}">
-          <input type="hidden" name="page_id" value="{{ page._id.toString() }}">
-          <input type="hidden" name="revision_id" value="{{ page.revision._id.toString() }}">
-          <button type="submit" class="btn btn-warning">Unportalize</button>
+          <div class="d-flex justify-content-between">
+            <p>
+              <span class="text-danger msg-already-exists">
+                <strong><i class="icon-fw icon-ban"></i>{{ t('Page is already exists.') }}</strong>
+              </span>
+              <small id="linkToNewPage" class="msg-already-exists"></small>
+            </p>
+            <div>
+              <input type="hidden" name="_csrf" value="{{ csrf() }}">
+              <input type="hidden" name="path" value="{{ page.path }}">
+              <input type="hidden" class="form-control" name="new_path" id="newPageName" value="{{ unportalizedPath }}">
+              <input type="hidden" name="page_id" value="{{ page._id.toString() }}">
+              <input type="hidden" name="revision_id" value="{{ page.revision._id.toString() }}">
+              <button type="submit" class="btn btn-warning">Unportalize</button>
+            </div>
         </div>
 
       </form>

resource/js/legacy/crowi.js

@@ -242,10 +242,10 @@ $(function() {
     return false;
   });
 
-  // rename
-  $('#renamePage').on('shown.bs.modal', function(e) {
+  // rename/unportalize
+  $('#renamePage, #unportalize').on('shown.bs.modal', function(e) {
     $('#renamePage #newPageName').focus();
-    $('#renamePage .msg-already-exists').hide();
+    $('#renamePage .msg-already-exists, #unportalize .msg-already-exists').hide();
   });
   $('#renamePageForm, #unportalize-form').submit(function(e) {
     // create name-value map
@@ -259,11 +259,12 @@ $(function() {
       url: '/_api/pages.rename',
       data: $(this).serialize(),
       dataType: 'json'
-    }).done(function(res) {
+    })
+    .done(function(res) {
       if (!res.ok) {
         // if already exists
-        $('#renamePage .msg-already-exists').show();
-        $('#renamePage #linkToNewPage').html(`
+        $('#renamePage .msg-already-exists, #unportalize .msg-already-exists').show();
+        $('#renamePage #linkToNewPage, #unportalize #linkToNewPage').html(`
           <a href="${nameValueMap.new_path}">${nameValueMap.new_path} <i class="icon-login"></i></a>
         `);
       }