Просмотр исходного кода

replace 'set page = ' codes in swig templates

Yuki Takei 5 лет назад
Родитель
Сommit
ef48d4900f
2 измененных файлов с 21 добавлено и 21 удалено
  1. 5 5
      src/server/views/modal/empty_trash.html
  2. 16 16
      src/server/views/widget/page_list.html

+ 5 - 5
src/server/views/modal/empty_trash.html

@@ -14,15 +14,15 @@
         <ul>
           {% for data in pages %}
             {% if pagePropertyName %}
-              {% set page = data[pagePropertyName] %}
+              {% set deletePage = data[pagePropertyName] %}
             {% else %}
-              {% set page = data %}
+              {% set deletePage = data %}
             {% endif %}
             <li>
-              <img src="{{ page.lastUpdateUser|picture }}" class="picture img-circle">
-              <a href="{{ page.path }}"
+              <img src="{{ deletePage.lastUpdateUser|picture }}" class="picture img-circle">
+              <a href="{{ deletePage.path }}"
                 class="page-list-link"
-                data-path="{{ page.path }}">{{ decodeURIComponent(page.path) }}
+                data-path="{{ deletePage.path }}">{{ decodeURIComponent(deletePage.path) }}
               </a>
             </li>
           {% endfor %}

+ 16 - 16
src/server/views/widget/page_list.html

@@ -2,45 +2,45 @@
 {% for data in pages %}
 
 {% if pagePropertyName %}
-  {% set page = data[pagePropertyName] %}
+  {% set listPage = data[pagePropertyName] %}
 {% else %}
-  {% set page = data %}
+  {% set listPage = data %}
 {% endif %}
 
 <li>
-  <img src="{{ page.lastUpdateUser|picture }}" class="picture img-circle">
-  <a href="{{ page.path }}"
+  <img src="{{ listPage.lastUpdateUser|picture }}" class="picture img-circle">
+  <a href="{{ listPage.path }}"
     class="page-list-link"
-    data-path="{{ page.path }}">{{ decodeURIComponent(page.path) }}
+    data-path="{{ listPage.path }}">{{ decodeURIComponent(listPage.path) }}
   </a>
   <span class="page-list-meta">
-    {% if page.isPortal() %}
+    {% if listPage.isPortal() %}
       <span class="label label-info">PORTAL</span>
     {% endif  %}
 
-    {% if page.isTemplate() %}
+    {% if listPage.isTemplate() %}
       <span class="label label-info">TMPL</span>
     {% endif  %}
 
-    {% if page.commentCount > 0 %}
+    {% if listPage.commentCount > 0 %}
     <span>
-      <i class="icon-bubble"></i>{{ page.commentCount }}
+      <i class="icon-bubble"></i>{{ listPage.commentCount }}
     </span>
     {% endif  %}
 
-    {% if page.liker.length > 0 %}
-    <span class="page-list-liker" data-count="{{ page.liker.length }}">
-      <i class="icon-like"></i>{{ page.liker.length }}
+    {% if listPage.liker.length > 0 %}
+    <span class="page-list-liker" data-count="{{ listPage.liker.length }}">
+      <i class="icon-like"></i>{{ listPage.liker.length }}
     </span>
     {% endif  %}
 
-    {% if viewConfig.seener_threshold and page.seenUsers.length >= viewConfig.seener_threshold %}
-    <span class="page-list-seer" data-count="{{ page.seenUsers.length }}">
-      <i class="fa fa-paw"></i>{{ page.seenUsers.length }}
+    {% if viewConfig.seener_threshold and listPage.seenUsers.length >= viewConfig.seener_threshold %}
+    <span class="page-list-seer" data-count="{{ listPage.seenUsers.length }}">
+      <i class="fa fa-paw"></i>{{ listPage.seenUsers.length }}
     </span>
     {% endif  %}
 
-    {% if !page.isPublic() %}
+    {% if !listPage.isPublic() %}
     <span>
       <i class="icon icon-lock"></i>
     </span>