Refactor modal

lib/views/layout/2column.html

@@ -24,7 +24,6 @@
     </footer>
   </div>
 </aside>
-{% include '../modal/widget_help.html' %}
 
 {% endblock %} {# layout_sidebar #}
 

lib/views/layout/layout.html

@@ -124,7 +124,7 @@
     </ul>
   </div><!-- /.navbar-collapse -->
 </nav>
-{% include '../modal/widget_create_page.html' %}
+{% include '../modal/create_page.html' %}
 {% endblock  %} {# layout_head_nav #}
 
 <div class="container-fluid">
@@ -145,6 +145,7 @@
 {% block body_end %}
 {% endblock %}
 
+{% include '../modal/help.html' %}
 </body>
 {% endblock %}
 

lib/views/layout/single.html

@@ -24,5 +24,4 @@
     &copy; {{ now|date('Y') }} {{ config.crowi['app:title'] }} <img src="/logo/100x11_g.png" alt="powered by Crowi"> </p>
   </footer>
 </div>
-{% include '../modal/widget_help.html' %}
 {% endblock %}

lib/views/modal/widget_delete.html → lib/views/modal/delete.html

@@ -1,4 +1,4 @@
-  <div class="modal fade" id="deletePage">
+  <div class="modal" id="deletePage">
     <div class="modal-dialog">
       <div class="modal-content">
 

lib/views/modal/widget_help.html → lib/views/modal/help.html

@@ -1,4 +1,4 @@
-<div class="modal fade" id="help-modal">
+<div class="modal" id="help-modal">
   <div class="modal-dialog">
     <div class="modal-content">
 

lib/views/modal/widget_rename.html → lib/views/modal/rename.html

@@ -1,4 +1,4 @@
-  <div class="modal fade" id="renamePage">
+  <div class="modal" id="renamePage">
     <div class="modal-dialog">
       <div class="modal-content">
 

lib/views/modal/widget_unportalize.html → lib/views/modal/unportalize.html

@@ -3,7 +3,7 @@
 {% else %}
   {% set unportalizedPath = page.path|replace('(\/)$', '') %}
 {% endif %}
-  <div class="modal fade" id="unportalize">
+  <div class="modal" id="unportalize">
     <div class="modal-dialog">
       <div class="modal-content">
 

lib/views/modal/widget_what_is_portal.html → lib/views/modal/what_is_portal.html

@@ -1,4 +1,4 @@
-<div class="modal fade" id="help-portal">
+<div class="modal" id="help-portal">
   <div class="modal-dialog">
     <div class="modal-content">
 

lib/views/page.html

@@ -115,9 +115,6 @@
   </ul>
   {% endif %}
 
-  {% include 'modal/widget_rename.html' %}
-  {% include 'modal/widget_delete.html' %}
-
   <div class="tab-content wiki-content">
   {% if req.query.renamed and not page.isDeleted() %}
   <div class="alert alert-info">
@@ -242,8 +239,13 @@
 {% block body_end %}
   {% parent %}
 
-  <div id="presentation-layer" class="fullscreen-layer">
-    <div id="presentation-container"></div>
-  </div>
-  {% include 'modal/widget_page_name_warning.html' %}
+<div id="presentation-layer" class="fullscreen-layer">
+  <div id="presentation-container"></div>
+</div>
+
+<div id="crowi-modals">
+  {% include 'modal/rename.html' %}
+  {% include 'modal/delete.html' %}
+  {% include 'modal/page_name_warning.html' %}
+</div>
 {% endblock %}

lib/views/page_list.html

@@ -97,7 +97,6 @@
     <li class="pull-right"><a href="#revision-history" data-toggle="tab"><i class="fa fa-history"></i> History</a></li>
     {% endif %}
   </ul>
-  {% include 'modal/widget_unportalize.html' %}
 
   <div class="tab-content">
   {% if page and not page.isLatestRevision() %}
@@ -202,7 +201,6 @@
 
 
 </div> {# /.content-main #}
-{% include 'modal/widget_what_is_portal.html' %}
 
 {% block content_main_after %}
 {% endblock %}
@@ -234,6 +232,10 @@
 {% endblock %} {# side_header #}
 
 {% block body_end %}
+<div id="crowi-modals">
+  {% include 'modal/what_is_portal.html' %}
+  {% include 'modal/unportalize.html' %}
+</div>
 <div class="modal fade portal-warning-modal" id="portal-warning-modal">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -258,5 +260,4 @@
     </div>
   </div>
 </div>
-</div>
 {% endblock %} {# body_end #}