imprv: rename, delete, putback modal

* add translation
* adjust styles
* unckecke 'recursively' when delete

lib/locales/en-US/translation.json

@@ -147,13 +147,35 @@
       }
   },
 
-  "Rename page": "Rename page",
-  "New page name": "New page name",
-  "Current page name": "Current page name",
-  "Redirect": "Redirect",
   "modal_rename": {
+    "label": {
+      "Rename page": "Rename page",
+      "New page name": "New page name",
+      "Current page name": "Current page name",
+      "Move recursively": "Move recursively",
+      "Redirect": "Redirect"
+    },
     "help": {
-      "redirect": "Redirect to new page if someone accesses <code>%s</code>"
+      "redirect": "Redirect to new page if someone accesses <code>%s</code>",
+      "recursive": "Rename children of under <code>%s</code> recursively"
+    }
+  },
+
+  "Put Back": "Put Back",
+  "Delete Completely": "Delete Completely",
+
+  "modal_delete": {
+    "label": {
+      "Delete Page": "Delete Page",
+      "recursively": "Process recursively",
+      "completely": "Delete completely"
+    }
+  },
+
+  "modal_putback": {
+    "label": {
+      "Put Back Page": "Put Back Page",
+      "recursively": "Process recursively"
     }
   },
 

lib/locales/ja/translation.json

@@ -146,16 +146,35 @@
       }
   },
 
-  "Rename page": "ページを移動する",
-  "New page name": "移動先のページ名",
-  "Current page name": "現在のページ名",
-  "Redirect": "リダイレクトする",
-  "Move recursively": "再帰的に移動する",
   "modal_rename": {
+    "label": {
+      "Rename page": "ページを移動する",
+      "New page name": "移動先のページ名",
+      "Current page name": "現在のページ名",
+      "Move recursively": "再帰的に移動",
+      "Redirect": "リダイレクトする"
+    },
     "help": {
-      "redirect": "チェックを入れると、<code>%s</code>にアクセスされた際に自動的に新しいページにジャンプします。",
-      "recursive": "チェックを入れると、<code>%s</code>配下のページも移動します。"
+      "redirect": "<code>%s</code> にアクセスされた際に自動的に新しいページにジャンプします",
+      "recursive": "<code>%s</code> 配下のページも移動します"
+    }
+  },
+
+  "Put Back": "元に戻す",
+  "Delete Completely": "完全削除",
+
+  "modal_delete": {
+    "label": {
+      "Delete Page": "ページを削除する",
+      "recursively": "全ての子ページも処理",
+      "completely": "完全削除"
+    }
+  },
 
+  "modal_putBack": {
+    "label": {
+      "Put Back Page": "ページを元に戻す",
+      "recursively": "全ての子ページも処理"
     }
   },
 

lib/views/modal/delete.html

@@ -6,7 +6,7 @@
 
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title"><i class="fa fa-trash-o"></i> Delete Page</h4>
+          <h4 class="modal-title"><i class="fa fa-trash-o"></i> {{ t('modal_delete.label.Delete Page') }}</h4>
         </div>
         <div class="modal-body">
           <div class="form-group">
@@ -21,14 +21,14 @@
           <input type="hidden" name="page_id" value="{{ page._id.toString() }}">
           <input type="hidden" name="revision_id" value="{{ page.revision._id.toString() }}">
           <label class="checkbox-inline text-danger">
-            <input type="checkbox" name="recursively" checked>recursively
+            <input type="checkbox" name="recursively">{{ t('modal_delete.label.recursively') }}
           </label>
           {% if page.isDeleted() %}
             <input type="hidden" name="completely" value="true">
-            <button type="submit" class="btn btn-danger delete-button"><i class="fa fa-times-circle" aria-hidden="true"></i> Delete Completely</button>
+            <button type="submit" class="btn btn-danger delete-button"><i class="fa fa-times-circle" aria-hidden="true"></i> {{ t('Delete Completely') }}</button>
           {% else %}
             <label class="checkbox-inline text-danger">
-              <input type="checkbox" name="completely">completely
+              <input type="checkbox" name="completely">{{ t('modal_delete.label.completely') }}
             </label>
             <button type="submit" class="btn btn-danger delete-button">Delete</button>
           {% endif %}

lib/views/modal/put_back.html

@@ -6,7 +6,7 @@
 
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title"><i class="fa fa-trash-o"></i> Put Back Page</h4>
+          <h4 class="modal-title"><i class="fa fa-trash-o"></i> {{ t('modal_putBack.label.Put Back Page') }}</h4>
         </div>
         <div class="modal-body">
           <div class="form-group">
@@ -20,11 +20,11 @@
           <input type="hidden" name="path" value="{{ page.path }}">
           <input type="hidden" name="page_id" value="{{ page._id.toString() }}">
           <label class="checkbox-inline text-danger">
-            <input type="checkbox" name="recursively" checked>recursively
+            <input type="checkbox" name="recursively" checked> {{ t('modal_putBack.label.recursively') }}
           </label>
-          <button type="submit" class="btn btn-default btn-sm">
+          <button type="submit" class="btn btn-default btn-sm putBack-button">
             <i class="fa fa-undo" aria-hidden="true"></i>
-            Put Back
+            {{ t('Put Back') }}
           </button>
         </div>
 

lib/views/modal/rename.html

@@ -22,14 +22,14 @@
             </div>
             <div class="checkbox">
               <label>
-                <input name="move_recursively" value="1" type="checkbox" checked> {{ t('Move recursively') }}
+                <input name="move_recursively" value="1" type="checkbox" checked> {{ t('modal_rename.label.Move recursively') }}
               </label>
               <p class="help-block"> {{ t('modal_rename.help.recursive', page.path) }}
               </p>
             </div>
             <div class="checkbox">
                <label>
-                 <input name="create_redirect" value="1"  type="checkbox"> {{ t('Redirect') }}
+                 <input name="create_redirect" value="1"  type="checkbox"> {{ t('modal_rename.label.Redirect') }}
                </label>
                <p class="help-block"> {{ t('modal_rename.help.redirect', page.path) }}
                </p>

lib/views/page.html

@@ -83,10 +83,10 @@
       {% if user %}
       <ul class="list-inline pull-right">
         <li>
-          <a href="#" class="btn btn-default btn-sm" data-target="#putBackPage" data-toggle="modal"><i class="fa fa-undo" aria-hidden="true"></i> Put Back</a>
+          <a href="#" class="btn btn-default btn-sm" data-target="#putBackPage" data-toggle="modal"><i class="fa fa-undo" aria-hidden="true"></i> {{ t('Put Back') }}</a>
         </li>
         <li>
-          <a href="#" class="btn btn-danger btn-sm" data-target="#deletePage" data-toggle="modal"><i class="fa fa-times-circle" aria-hidden="true"></i> Delete Completely</a>
+          <a href="#" class="btn btn-danger btn-sm" data-target="#deletePage" data-toggle="modal"><i class="fa fa-times-circle" aria-hidden="true"></i> {{ t('Delete Completely') }}</a>
         </li>
       </ul>{# /.pull-right #}
       {% endif %}

resource/css/_delete.scss

@@ -3,3 +3,9 @@
     margin-left: .5em;
   }
 }
+
+#putBackPage {
+  .putBack-button {
+    margin-left: .5em;
+  }
+}