Update templates for the Stats page on 'log_categories'

my8100 · Jun 20, 2019 · 9a161c8 · 9a161c8
1 parent ed636ce
commit 9a161c8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/scrapydweb/templates/scrapydweb/stats.html b/scrapydweb/templates/scrapydweb/stats.html
@@ -85,7 +85,7 @@ <h3>PROJECT ({{ project }}), SPIDER ({{ spider }})</h3>
                             N/A
                         {% else %}
                             <strong class="{% if pages %}green{% else %}red{% endif %}">{{ pages }}</strong>
-                        {% endif %}    
+                        {% endif %}
                         </td>
                     </tr>
                     <tr>
@@ -95,7 +95,7 @@ <h3>PROJECT ({{ project }}), SPIDER ({{ spider }})</h3>
                             N/A
                         {% else %}
                             <strong class="{% if items %}green{% else %}red{% endif %}">{{ items }}</strong>
-                        {% endif %}        
+                        {% endif %}
                         </td>
                     </tr>
                     <tr><th>shutdown_reason</th><td id="shutdown_reason">{{ shutdown_reason }}</td></tr>
@@ -128,7 +128,11 @@ <h3 style="color: red;">WARNING+</h3>
                         <div class="title">
                             <h4>
                                 <div style="width: 200px; display: inline-block;">{{ title }}</div>
-                                {{ log_categories[title]['count'] }} in total
+                                {% if log_categories[title]['details']|length < log_categories[title]['count'] %}
+                                    last {{ log_categories[title]['details']|length }} of {{ log_categories[title]['count'] }}
+                                {% else %}
+                                    {{ log_categories[title]['count'] }} in total
+                                {% endif %}
                             </h4>
                             <i class="iconfont icon-right"></i>
                         </div>
@@ -153,7 +157,11 @@ <h3 style="color: orange;">INFO</h3>
                         <div class="title">
                             <h4>
                                 <div style="width: 200px; display: inline-block;">{{ title }}</div>
-                                {{ log_categories[title]['count'] }} in total
+                                {% if log_categories[title]['details']|length < log_categories[title]['count'] %}
+                                    last {{ log_categories[title]['details']|length }} of {{ log_categories[title]['count'] }}
+                                {% else %}
+                                    {{ log_categories[title]['count'] }} in total
+                                {% endif %}
                             </h4>
                             <i class="iconfont icon-right"></i>
                         </div>

diff --git a/scrapydweb/templates/scrapydweb/stats_mobileui.html b/scrapydweb/templates/scrapydweb/stats_mobileui.html
@@ -135,7 +135,11 @@ <h3 style="color: red;">WARNING+</h3>
                         <div class="title">
                             <h4>
                                 <div style="width: 200px; display: inline-block;">{{ title }}</div>
-                                {{ log_categories[title]['count'] }} in total
+                                {% if log_categories[title]['details']|length < log_categories[title]['count'] %}
+                                    last {{ log_categories[title]['details']|length }} of {{ log_categories[title]['count'] }}
+                                {% else %}
+                                    {{ log_categories[title]['count'] }} in total
+                                {% endif %}
                             </h4>
                             <i class="iconfont icon-right"></i>
                         </div>
@@ -160,7 +164,11 @@ <h3 style="color: orange;">INFO</h3>
                         <div class="title">
                             <h4>
                                 <div style="width: 200px; display: inline-block;">{{ title }}</div>
-                                {{ log_categories[title]['count'] }} in total
+                                {% if log_categories[title]['details']|length < log_categories[title]['count'] %}
+                                    last {{ log_categories[title]['details']|length }} of {{ log_categories[title]['count'] }}
+                                {% else %}
+                                    {{ log_categories[title]['count'] }} in total
+                                {% endif %}
                             </h4>
                             <i class="iconfont icon-right"></i>
                         </div>