Unportalize

lib/views/modal/widget_unportalize.html

@@ -0,0 +1,36 @@
+  <div class="modal fade" id="unportalize">
+    <div class="modal-dialog">
+      <div class="modal-content">
+
+      <form role="form" id="unportalize-form" onsubmit="return false;">
+
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title">ポータル化を解除する</h4>
+        </div>
+        <div class="modal-body">
+          <ul>
+           <li>このポータル化を解除し、通常のページに戻します。</li>
+          </ul>
+            <div class="form-group">
+              <p>
+                <label for="">このページ</label><br><code>{{ page.path }}</code>
+              </p>
+              <p>
+                <label for="">解除後のページ</label><br><code>{{ page.path|replace('(\/)$', '') }}</code>
+              </p>
+            </div>
+        </div>
+        <div class="modal-footer">
+          <p><small class="pull-left" id="newPageNameCheck"></small></p>
+          <input type="hidden" name="path" value="{{ page.path }}">
+          <input type="hidden" class="form-control" name="new_path" id="newPageName" value="{{ page.path|replace('(\/)$', '') }}">
+          <input type="hidden" name="page_id" value="{{ page._id.toString() }}">
+          <input type="hidden" name="revision_id" value="{{ page.revision._id.toString() }}">
+          <input type="submit" class="btn btn-primary" value="Unportalize!">
+        </div>
+
+      </form>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div><!-- /.modal -->

lib/views/page_list.html

@@ -85,8 +85,18 @@
         <i class="fa fa-times"></i>
       </a>
     </li>
+    {%  else %}
+    <li class="dropdown pull-right">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <i class="fa fa-wrench"></i> <span class="caret"></span>
+      </a>
+      <ul class="dropdown-menu">
+       <li><a href="#" data-target="#unportalize" data-toggle="modal"><i class="fa fa-share"></i> ポータル解除</a></li>
+      </ul>
+    </li>
     {% endif %}
   </ul>
+  {% include 'modal/widget_unportalize.html' %}
 
   <div class="tab-content">
     <div class="wiki tab-pane {% if not req.body.pageForm %}active{% endif %}" id="revision-body-content">{{ page.revision.body|nl2br|safe }}</div>

resource/js/crowi.js

@@ -302,11 +302,11 @@ $(function() {
   $('#renamePage').on('shown.bs.modal', function (e) {
     $('#newPageName').focus();
   });
-  $('#renamePageForm').submit(function(e) {
+  $('#renamePageForm, #unportalize-form').submit(function(e) {
     $.ajax({
       type: 'POST',
       url: '/_api/pages.rename',
-      data: $('#renamePageForm').serialize(),
+      data: $(this).serialize(),
       dataType: 'json'
     }).done(function(res) {
       if (!res.ok) {
@@ -314,13 +314,12 @@ $(function() {
         $('#newPageNameCheck').addClass('alert-danger');
       } else {
         var page = res.page;
-        var path = $('#pagePath').html();
 
         $('#newPageNameCheck').removeClass('alert-danger');
         $('#newPageNameCheck').html('<img src="/images/loading_s.gif"> 移動しました。移動先にジャンプします。');
 
         setTimeout(function() {
-          top.location.href = page.path + '?renamed=' + path;
+          top.location.href = page.path + '?renamed=' + pagePath;
         }, 1000);
       }
     });