Continued:

- metrics wasn't the right word here, statistics is more proper
- renamed links.tpl -> links.html

diff --git a/templates/views/index.html b/templates/views/index.html
index 5d0609f9f8a1a8bfd09a368f68785131ad3551da..94ff6ebbbe702fe323f8c65cc694489b7482f3ba 100644 (file)
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -37,8 +37,8 @@
         <a href="{{base_url}}/scoreboard?mode=detection_mode&amp;amount=10">detection modes</a> /
         <a href="{{base_url}}/scoreboard?mode=avg_peers&amp;amount=30">average peers</a> /
         <a href="{{base_url}}/scoreboard?mode=obfuscator&amp;amount=30">obfuscating software</a> /
-        <a href="{{base_url}}/scoreboard?mode=obfuscation&amp;amount=10">obfuscation metrics</a> /
-        <a href="{{base_url}}/scoreboard?mode=block_level&amp;amount=20">block level metrics</a>
+        <a href="{{base_url}}/scoreboard?mode=obfuscation&amp;amount=10">obfuscation statistics</a> /
+        <a href="{{base_url}}/scoreboard?mode=block_level&amp;amount=20">block level statistics</a>
     </p>
 {% endblock %}
 {% block footer %}

diff --git a/templates/views/scoreboard.html b/templates/views/scoreboard.html
index ba54fbd1818cf12280d63302c806c3aa64a90734..70d42708599466dda3fb6f345f2935f2f67d33a6 100644 (file)
--- a/templates/views/scoreboard.html
+++ b/templates/views/scoreboard.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'detection_mode' %}Detection mode metrics{% elif mode == 'block_level' %}TOP {{amount}} block level metrics{% elif mode == 'obfuscation' %}Obfuscation metrics{% elif mode == 'obfuscator' %}TOP {{amount}} obfuscating software{% elif mode == 'avg_peers' %}TOP {{amount}} average peer count{% elif mode == 'command' %}TOP {{amount}} commands{% elif mode == 'error_code' %}TOP {{amount}} error codes{% elif mode == 'reference' %}TOP {{amount}} referencing instances{% elif mode == 'blocked' %}TOP {{amount}} deferated instances{% elif mode == 'blocker' %}TOP {{amount}} deferating instances{% endif %}{% endblock %}
+{% block title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'detection_mode' %}Detection mode statistics{% elif mode == 'block_level' %}TOP {{amount}} block level statistics{% elif mode == 'obfuscation' %}Obfuscation statistics{% elif mode == 'obfuscator' %}TOP {{amount}} obfuscating software{% elif mode == 'avg_peers' %}TOP {{amount}} average peer count{% elif mode == 'command' %}TOP {{amount}} commands{% elif mode == 'error_code' %}TOP {{amount}} error codes{% elif mode == 'reference' %}TOP {{amount}} referencing instances{% elif mode == 'blocked' %}TOP {{amount}} deferated instances{% elif mode == 'blocker' %}TOP {{amount}} deferating instances{% endif %}{% endblock %}
 
 {% block header %}
     {% if mode == 'blocker' %}
@@ -16,13 +16,13 @@
     {% elif mode == 'error_code' %}
         <h1>TOP {{amount}} error codes</h1>
     {% elif mode == 'detection_mode' %}
-        <h1>Detection mode metrics</h1>
+        <h1>Detection mode statistics</h1>
     {% elif mode == 'avg_peers' %}
         <h1>TOP {{amount}} average peer count</h1>
     {% elif mode == 'obfuscator' %}
         <h1>TOP {{amount}} obfuscating software</h1>
     {% elif mode == 'obfuscation' %}
-        <h1>Obfuscation metrics</h1>
+        <h1>Obfuscation statistics</h1>
     {% elif mode == 'block_level' %}
         <h1>TOP {{amount}} block levels</h1>
     {% endif %}
@@ -33,7 +33,7 @@
         <table>
             <thead>
                 <th>№</th>
-                <th>{% if mode in ('software', 'avg_peers', 'obfuscator') %}Software{% elif mode == 'obfuscation' %}obfuscation status{% elif mode == 'detection_mode' %}Detection mode{% elif mode == 'error_code' %}Error code{% else %}Instance{% endif %}</th>
+                <th>{% if mode in ('software', 'avg_peers', 'obfuscator') %}Software{% elif mode == 'obfuscation' %}Obfuscation status{% elif mode == 'detection_mode' %}Detection mode{% elif mode == 'error_code' %}Error code{% else %}Instance{% endif %}</th>
                 <th>{% if mode == 'reference' %}References{% elif mode == 'avg_peers' %}Average{% elif mode in('software', 'error_code', 'obfuscator', 'obfuscation', 'block_level', 'detection_mode') %}Total{% else %}Blocks{% endif %}</th>
             </thead>
 
@@ -50,7 +50,7 @@
                             <a href="{{base_url}}/top?mode=block_level&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>
                         {% else %}
                             {% with domain=entry['domain'] %}
-                            {% include "widgets/links.tpl" %}
+                            {% include "widgets/links.html" %}
                             {% endwith %}
                         {% endif %}
                     </td>

diff --git a/templates/views/top.html b/templates/views/top.html
index 82acd71f94e9fb3526962e3d979b5593f027be22..2dc0582a3915ef782418ed2df6d47cbd65f4850c 100644 (file)
--- a/templates/views/top.html
+++ b/templates/views/top.html
@@ -49,12 +49,12 @@
                     <tr>
                         <td>
                             {% with domain=block['blocker'] %}
-                            {% include "widgets/links.tpl" %}
+                            {% include "widgets/links.html" %}
                             {% endwith %}
                         </td>
                         <td>
                             {% with domain=block['blocked'] %}
-                            {% include "widgets/links.tpl" %}
+                            {% include "widgets/links.html" %}
                             {% endwith %}
                         </td>
                         <td>{{block['reason']}}</td>

diff --git a/templates/widgets/links.html b/templates/widgets/links.html
new file mode 100644 (file)
index 0000000..46b435a
--- /dev/null
+++ b/templates/widgets/links.html
@@ -0,0 +1,3 @@
+[<a class="listlink" href="{{base_url}}/top?mode=domain&amp;value={{domain}}" title="Search {{domain}}">D</a>]
+[<a class="listlink" href="{{base_url}}/top?mode=reverse&amp;value={{domain}}" title="Reverse search {{domain}}">R</a>]
+<a href="https://{{domain}}" rel="nofollow noopener noreferrer">{{domain}}</a>

diff --git a/templates/widgets/links.tpl b/templates/widgets/links.tpl
deleted file mode 100644 (file)
index 46b435a..0000000
--- a/templates/widgets/links.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-[<a class="listlink" href="{{base_url}}/top?mode=domain&amp;value={{domain}}" title="Search {{domain}}">D</a>]
-[<a class="listlink" href="{{base_url}}/top?mode=reverse&amp;value={{domain}}" title="Reverse search {{domain}}">R</a>]
-<a href="https://{{domain}}" rel="nofollow noopener noreferrer">{{domain}}</a>