clean templates for modal

src/server/routes/page.js

@@ -937,7 +937,7 @@ module.exports = function(crowi, app) {
       moveUnderTrees: req.body.move_trees || 0,
       socketClientId: +req.body.socketClientId || undefined,
     };
-    const isRecursiveMove = req.body.move_recursively || 0;
+    const isRecursively = req.body.recursively || 0;
 
     if (!Page.isCreatableName(newPagePath)) {
       return res.json(ApiResponse.error(`Could not use the path '${newPagePath})'`, 'invalid_path'));
@@ -962,7 +962,7 @@ module.exports = function(crowi, app) {
         return res.json(ApiResponse.error('Someone could update this page, so couldn\'t delete.', 'outdated'));
       }
 
-      if (isRecursiveMove) {
+      if (isRecursively) {
         page = await Page.renameRecursively(page, newPagePath, req.user, options);
       }
       else {

src/server/views/modal/delete.html

@@ -19,15 +19,18 @@
             <label for="">Deleting page:</label><br>
             <code>{{ page.path }}</code>
           </div>
+
+          <hr>
+
           <div class="checkbox checkbox-warning">
-            <input name="delete_recursively" id="cbDeleteRecursively" value="1" type="checkbox" checked>
+            <input name="recursively" id="cbDeleteRecursively" value="1" type="checkbox" checked>
             <label for="cbDeleteRecursively">{{ t('modal_delete.label.Delete recursively') }}</label>
             <p class="help-block"> {{ t('modal_delete.help.recursively', page.path) }}
             </p>
           </div>
           {% if not page.isDeleted() %}
           <div class="checkbox checkbox-danger">
-            <input name="delete_completely" id="cbDeleteCompletely" value="1"  type="checkbox">
+            <input name="completely" id="cbDeleteCompletely" value="1"  type="checkbox">
               <label for="cbDeleteCompletely" class="text-danger">{{ t('modal_delete.label.Delete completely') }}</label>
               <p class="help-block"> {{ t('modal_delete.help.completely') }}
               </p>
@@ -36,20 +39,7 @@
         </div>
         <div class="modal-footer">
           <div class="d-flex justify-content-between">
-            <p>
-              <span class="text-danger msg msg-notfound_or_forbidden">
-                <strong><i class="icon-fw icon-ban"></i> {{ t('page_api_error.notfound_or_forbidden') }}</strong>
-              </span>
-              <span class="text-warning msg msg-outdated">
-                <strong><i class="icon-fw icon-bulb"></i> {{ t('page_api_error.outdated') }}</strong>
-                <a href="javascript:location.reload();">
-                  <i class="fa fa-angle-double-right"></i> {{ t('Load latest') }}
-                </a>
-              </span>
-              <span class="text-danger msg msg-unknown">
-                <strong><i class="icon-fw icon-ban"></i> Unknown error occured</strong>
-              </span>
-            </p>
+            {% include '../widget/modal/page-api-error-messages.html' %}
             <div>
               <input type="hidden" name="_csrf" value="{{ csrf() }}">
               <input type="hidden" name="path" value="{{ page.path }}">

src/server/views/modal/duplicate.html

@@ -23,15 +23,7 @@
         </div>
         <div class="modal-footer">
           <div class="d-flex justify-content-between">
-            <p>
-              <span class="text-danger msg msg-notfound_or_forbidden">
-                <strong><i class="icon-fw icon-ban"></i>{{ t('Original page is not found or forbidden.') }}</strong>
-              </span>
-              <span class="text-danger msg msg-already_exists">
-                <strong><i class="icon-fw icon-ban"></i>{{ t('New page path is already exists.') }}</strong>
-                <small id="linkToNewPage"></small>
-              </span>
-            </p>
+            {% include '../widget/modal/page-api-error-messages.html' %}
             <div>
               <input type="hidden" name="_csrf" value="{{ csrf() }}">
               <input type="hidden" name="path" value="{{ page.path }}">

src/server/views/modal/rename.html

@@ -20,8 +20,11 @@
               <input type="text" class="form-control" name="new_path" id="newPageName" value="{{ page.path }}">
             </div>
           </div>
+
+          <hr>
+
           <div class="checkbox checkbox-warning">
-            <input name="move_recursively" id="cbRenameRecursively" value="1" type="checkbox" checked>
+            <input name="recursively" id="cbRenameRecursively" value="1" type="checkbox" checked>
             <label for="cbRenameRecursively">{{ t('modal_rename.label.Move recursively') }}</label>
             <p class="help-block"> {{ t('modal_rename.help.recursive', page.path) }}
             </p>
@@ -35,27 +38,7 @@
         </div>
         <div class="modal-footer">
           <div class="d-flex justify-content-between">
-            <p>
-              <span class="text-danger msg msg-notfound_or_forbidden">
-                <strong><i class="icon-fw icon-ban"></i>{{ t('page_api_error.notfound_or_forbidden') }}</strong>
-              </span>
-              <span class="text-danger msg msg-already_exists">
-                <strong><i class="icon-fw icon-ban"></i>{{ t('page_api_error.already_exists') }}</strong>
-                <small id="linkToNewPage"></small>
-              </span>
-              <span class="text-warning msg msg-outdated">
-                <strong><i class="icon-fw icon-bulb"></i> {{ t('page_api_error.outdated') }}</strong>
-                <a href="javascript:location.reload();">
-                  <i class="fa fa-angle-double-right"></i> {{ t('Load latest') }}
-                </a>
-              </span>
-              <span class="text-danger msg msg-invalid_path">
-                <strong><i class="icon-fw icon-ban"></i> Invalid path</strong>
-              </span>
-              <span class="text-danger msg msg-unknown">
-                <strong><i class="icon-fw icon-ban"></i> Unknown error occured</strong>
-              </span>
-            </p>
+            {% include '../widget/modal/page-api-error-messages.html' %}
             <div>
               <input type="hidden" name="_csrf" value="{{ csrf() }}">
               <input type="hidden" name="path" value="{{ page.path }}">

src/server/views/modal/unportalize.html

@@ -33,15 +33,7 @@
         </div>
         <div class="modal-footer">
           <div class="d-flex justify-content-between">
-            <p>
-              <span class="text-danger msg msg-notfound_or_forbidden">
-                <strong><i class="icon-fw icon-ban"></i>{{ t('Original page is not found or forbidden.') }}</strong>
-              </span>
-              <span class="text-danger msg msg-already_exists">
-                <strong><i class="icon-fw icon-ban"></i>{{ t('New page path is already exists.') }}</strong>
-                <small id="linkToNewPage"></small>
-              </span>
-            </p>
+            {% include '../widget/modal/page-api-error-messages.html' %}
             <div>
               <input type="hidden" name="_csrf" value="{{ csrf() }}">
               <input type="hidden" name="path" value="{{ page.path }}">