Continued:

[fba.git] / templates / views / scoreboard.html

diff --git a/templates/views/scoreboard.html b/templates/views/scoreboard.html
index a1d9cc11ca44ff2955a5700ffccf7a1620f2d93e..2f7619485f73bff71c0458f4772a64dd5cd86891 100644 (file)
--- a/templates/views/scoreboard.html
+++ b/templates/views/scoreboard.html
@@ -1,6 +1,21 @@
 {% extends "base.html" %}
 
-{% 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 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 == 'avg_blocks' %}TOP {{amount}} average block 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' %}
@@ -19,12 +34,16 @@
         <h1>Detection mode statistics</h1>
     {% elif mode == 'avg_peers' %}
         <h1>TOP {{amount}} average peer count</h1>
+    {% elif mode == 'avg_blocks' %}
+        <h1>TOP {{amount}} average block count</h1>
     {% elif mode == 'obfuscator' %}
         <h1>TOP {{amount}} obfuscating software</h1>
     {% elif mode == 'obfuscation' %}
         <h1>Obfuscation statistics</h1>
     {% elif mode == 'block_level' %}
         <h1>TOP {{amount}} block levels</h1>
+    {% else %}
+        <h1 style="color: red">mode={{mode}} not supported</h1>
     {% endif %}
 {% endblock %}
 
@@ -33,8 +52,21 @@
         <table class="table-with-rows">
             <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 == 'reference' %}References{% elif mode == 'avg_peers' %}Average{% elif mode in('software', 'error_code', 'obfuscator', 'obfuscation', 'block_level', 'detection_mode') %}Total{% else %}Blocks{% endif %}</th>
+                <th>
+                    {% if mode in ('software', 'avg_peers', 'avg_blocks', '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 in('avg_peers', 'avg_blocks') %}Average
+                    {% elif mode in('software', 'error_code', 'obfuscator', 'obfuscation', 'block_level', 'detection_mode', 'command') %}Total
+                    {% else %}Blocks
+                    {% endif %}
+                </th>
             </thead>
 
             <tbody>
@@ -42,13 +74,15 @@
                 <tr>
                     <td>{{loop.index}}</td>
                     <td>
-                        {% if mode in ('command', 'error_code', 'avg_peers', 'obfuscator', 'obfuscation') %}
-                            {{entry['domain']}}
-                        {% elif entry['domain'] == None %}
+                        {% if entry['domain'] == None %}
                             -
+                        {% elif mode in ('error_code', 'obfuscation') %}
+                            {{entry['domain']}}
                         {% elif mode == 'block_level' %}
                             <a href="top?mode={{mode}}&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>
-                        {% elif mode in ('software', 'detection_mode') %}
+                        {% elif mode in ('avg_peers', 'avg_blocks', 'obfuscator') %}
+                            <a href="list?mode=software&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>
+                        {% elif mode in ('software', 'detection_mode', 'command') %}
                             <a href="list?mode={{mode}}&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>
                         {% else %}
                             {% with domain=entry['domain'] %}
@@ -81,9 +115,10 @@
             <ol>
                 <li><b>AUTO_DISCOVERY</b>: <code>/.well-known/nodeinfo</code> was reachable and software type was found in nodeinfo response</li>
                 <li><b>STATIC_CHECK</b>: Node information was found by probing for well-known URLs</li>
+                <li><b>PLATFORM</b>: Meta data <code>og:platform</code> was found in HTML code</li>
                 <li><b>GENERATOR</b>: Meta data <code>generator</code> was found in HTML code</li>
+                <li><b>APP_NAME</b>: Meta data <code>application-name</code> was found in HTML code</li>
                 <li><b>SITE_NAME</b>: Meta data <code>og:site_name</code> was found in HTML code</li>
-                <li><b>PLATFORM</b>: Meta data <code>og:platform</code> was found in HTML code</li>
                 <li><b>None</b>: the instance was not reachable or the used software was not stated</li>
             </ol>
         </div>