WIP: reconstruct layouts

* rename modal

lib/views/layout/layout.html

@@ -75,8 +75,8 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
   {% endif %}
 
   <script src="{{ webpack_asset('style').js }}"></script>
-  <!-- <script src="{{ webpack_asset('style-theme-default').js }}"></script> -->
-  <script src="{{ webpack_asset('style-theme-default-dark').js }}"></script>
+  <script src="{{ webpack_asset('style-theme-default').js }}"></script>
+  <!-- <script src="{{ webpack_asset('style-theme-default-dark').js }}"></script> -->
   <script src="{{ webpack_asset('commons').js }}" defer></script>
   {% if isEnabledPlugins() %}
     <script src="{{ webpack_asset('plugin').js }}" defer></script>

lib/views/modal/rename.html

@@ -43,12 +43,21 @@
             {# </div> #}
         </div>
         <div class="modal-footer">
-          <p><small class="pull-left" id="newPageNameCheck"></small></p>
-          <input type="hidden" name="_csrf" value="{{ csrf() }}">
-          <input type="hidden" name="path" value="{{ page.path }}">
-          <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="fcbtn btn btn-outline btn-rounded btn-primary btn-1b">Rename</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" name="page_id" value="{{ page._id.toString() }}">
+              <input type="hidden" name="revision_id" value="{{ page.revision._id.toString() }}">
+              <button type="submit" class="btn btn-primary">Rename</button>
+            </div>
+          </div>
         </div>
 
       </form>

resource/js/legacy/crowi.js

@@ -237,6 +237,7 @@ $(function() {
   // rename
   $('#renamePage').on('shown.bs.modal', function (e) {
     $('#newPageName').focus();
+    $('.msg-already-exists').hide();
   });
   $('#renamePageForm, #unportalize-form').submit(function(e) {
     // create name-value map
@@ -253,22 +254,13 @@ $(function() {
     }).done(function(res) {
       if (!res.ok) {
         // if already exists
-        $('#newPageNameCheck').html('<i class="fa fa-times-circle"></i> ' + res.error);
-        $('#newPageNameCheck').addClass('alert-danger');
+        $('.msg-already-exists').show();
         $('#linkToNewPage').html(`
-          <i class="fa fa-fw fa-arrow-right"></i><a href="${nameValueMap.new_path}">${nameValueMap.new_path}</a>
+          <a href="${nameValueMap.new_path}">${nameValueMap.new_path} <i class="icon-login"></i></a>
         `);
       } else {
         var page = res.page;
-
-        $('#newPageNameCheck').removeClass('alert-danger');
-        //$('#newPageNameCheck').html('<img src="/images/loading_s.gif"> 移動しました。移動先にジャンプします。');
-        // fix
-        $('#newPageNameCheck').html('<img src="/images/loading_s.gif"> Page moved! Redirecting to new page location.');
-
-        setTimeout(function() {
-          top.location.href = page.path + '?renamed=' + pagePath;
-        }, 1000);
+        top.location.href = page.path + '?renamed=' + pagePath;
       }
     });