Explorar o código

improve delete modal

Yuki Takei %!s(int64=6) %!d(string=hai) anos
pai
achega
38ed4bf91b
Modificáronse 2 ficheiros con 13 adicións e 10 borrados
  1. 1 1
      resource/locales/en-US/translation.json
  2. 12 9
      src/server/views/modal/delete.html

+ 1 - 1
resource/locales/en-US/translation.json

@@ -287,7 +287,7 @@
   "modal_delete": {
     "delete_page": "Delete Page",
     "deleting_page": "Deleting Page",
-    "delete_recursively": "Delete child pages under %s recursively.",
+    "delete_recursively": "Delete child pages recursively.",
     "delete_completely": "Delete Completely",
     "delete_completely_restriction": "You have no admin to delete completely.",
     "recursively": "Delete children of under <code>%s</code> recursively.",

+ 12 - 9
src/server/views/modal/delete.html

@@ -25,20 +25,23 @@
           {% if page.grant != 2 %}
           <div class="checkbox checkbox-warning">
             <input name="recursively" id="cbDeleteRecursively" value="1" type="checkbox" checked>
-            <label for="cbDeleteRecursively">{{ t('modal_delete.delete_recursively') }}</label>
-            <p class="help-block"> {{ t('modal_delete.recursively', page.path) }}
-            </p>
+            <label for="cbDeleteRecursively">
+              {{ t('modal_delete.delete_recursively') }}
+              <p class="help-block mt-0"> {{ t('modal_delete.recursively', page.path) }}</p>
+            </label>
           </div>
           {% endif %}
           {% if not page.isDeleted() %}
           <div class="checkbox checkbox-danger">
-          <input name="completely" id="cbDeleteCompletely" {% if !user.canDeleteCompletely(page.creator._id) %} disabled="disabled" {% endif %} value="1"  type="checkbox">
-            <label for="cbDeleteCompletely" class="text-danger">{{ t('modal_delete.delete_completely') }}</label>
-            {% if !user.canDeleteCompletely(page.creator._id) %}
-              <p class="bg-danger text-white p-2 mt-2"> <i class="icon-ban" ></i>{{ t('modal_delete.delete_completely_restriction') }}</p>
+            <input name="completely" id="cbDeleteCompletely" {% if user.canDeleteCompletely(page.creator._id) %} disabled="disabled" {% endif %} value="1"  type="checkbox">
+            <label for="cbDeleteCompletely" class="text-danger">
+              {{ t('modal_delete.delete_completely') }}
+              <p class="help-block mt-0"> {{ t('modal_delete.completely') }}</p>
+              {% endif %}
+            </label>
+            {% if user.canDeleteCompletely(page.creator._id) %}
+              <p class="alert alert-warning p-2"> <i class="icon-ban icon-fw" ></i>{{ t('modal_delete.delete_completely_restriction') }}</p>
             {% else %}
-            <p class="help-block"> {{ t('modal_delete.completely') }}</p>
-            {% endif %}
           </div>
           {% endif %}
         </div>