itizawa 6 лет назад
Родитель
Сommit
69b92789e3
2 измененных файлов с 9 добавлено и 9 удалено
  1. 7 5
      src/server/views/modal/delete.html
  2. 2 4
      src/server/views/widget/page_alerts.html

+ 7 - 5
src/server/views/modal/delete.html

@@ -28,14 +28,16 @@
             <p class="help-block"> {{ t('modal_delete.help.recursively', page.path) }}
             </p>
           </div>
-          {% if not page.isDeleted() and user.canDeleteCompletely(user) %}
           <div class="checkbox checkbox-danger">
-            <input name="completely" id="cbDeleteCompletely" value="1"  type="checkbox">
+          <input name="completely" id="cbDeleteCompletely" {% if not page.isDeleted() and !user.canDeleteCompletely(user) %} disabled="disabled" {% endif %} 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>
+              <!-- GC-1755 Change Sentence -->
+              {% if not page.isDeleted() and !user.canDeleteCompletely(user) %}
+                <p class="bg-danger text-white p-2 mt-2"> <i class="icon-ban" ></i> 完全削除の権限がありません </p>
+              {% else %}
+                <p class="help-block"> {{ t('modal_delete.help.completely') }}</p>
+              {% endif %}
           </div>
-          {% endif %}
         </div>
         <div class="modal-footer">
           <div class="d-flex justify-content-between">

+ 2 - 4
src/server/views/widget/page_alerts.html

@@ -24,13 +24,11 @@
       {% if page.isDeleted() and user %}
       <ul class="list-inline">
         <li>
-          <a href="#" class="btn btn-default btn-rounded btn-sm" data-target="#putBackPage" data-toggle="modal"><i class="icon-action-undo" aria-hidden="true"></i> {{ t('Put Back') }}</a>
+          <button href="#" class="btn btn-default btn-rounded btn-sm" data-target="#putBackPage" data-toggle="modal"><i class="icon-action-undo" aria-hidden="true"></i> {{ t('Put Back') }}</button>
         </li>
-        {% if user.canDeleteCompletely(user) %}
         <li>
-          <a href="#" class="btn btn-danger btn-rounded btn-sm" data-target="#deletePage" data-toggle="modal"><i class="icon-fire" aria-hidden="true"></i> {{ t('Delete Completely') }}</a>
+            <button href="#" class="btn btn-danger btn-rounded btn-sm" {% if !user.canDeleteCompletely(user) %} disabled="disabled" {% endif %} data-target="#deletePage" data-toggle="modal"><i class="icon-fire" aria-hidden="true"></i> {{ t('Delete Completely') }}</button>
         </li>
-        {% endif %}
       </ul>{# /.pull-right #}
       {% endif %}
     </div>