X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=templates%2Fviews%2Fscoreboard.html;h=bb25f1fe071aa85169df0fa8885a915eecc5337f;hb=ba67edf5cc964bb13a81af1a2e4768823e95a31a;hp=ba54fbd1818cf12280d63302c806c3aa64a90734;hpb=79a3d934f22852b1b385a4d88ffde4cd9eba2608;p=fba.git

diff --git a/templates/views/scoreboard.html b/templates/views/scoreboard.html
index ba54fbd..bb25f1f 100644
--- 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 %}
@@ -30,10 +30,10 @@
 
 {% block content %}
     <div class="scoreboard">
-        <table>
+        <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 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>
 
@@ -42,15 +42,17 @@
                 <tr>
                     <td>{{loop.index}}</td>
                     <td>
-                        {% if mode in ('software', 'command', 'error_code', 'detection_mode', 'avg_peers', 'obfuscator', 'obfuscation') %}
+                        {% if mode in ('error_code', 'avg_peers', 'obfuscator', 'obfuscation') %}
                             {{entry['domain']}}
                         {% elif entry['domain'] == None %}
                             -
                         {% elif mode == 'block_level' %}
-                            <a href="{{base_url}}/top?mode=block_level&amp;value={{entry['domain']}}&amp;amount=50">{{entry['domain']}}</a>
+                            <a href="top?mode={{mode}}&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'] %}
-                            {% include "widgets/links.tpl" %}
+                            {% include "widgets/links.html" %}
                             {% endwith %}
                         {% endif %}
                     </td>
@@ -65,28 +67,29 @@
 {% block footer %}
     {% if mode == 'error_code' %}
         <div class="notice">
-            <h2>Error codes:</h2>
+            <h3>Error codes:</h3>
             <ul>
                 <li>Error code 999 is fake and covers a lot of reasons why the domain/instance is not reachable. Mostly that the domain is not resolvable or the server refused connection.</li>
             </ul>
         </div>
     {% elif mode == 'detection_mode' %}
         <div class="notice">
-            <h2>Detection modes:</h2>
+            <h3>Detection modes:</h3>
             <div>
                 Detection is done in following order:
             </div>
             <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>GENERATOR</b>: Meta data <code>generator</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>STATIC_CHECK</b>: All above did not reveal software type, so a check on pre-defined JSON elements was done</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>
     {% elif mode == 'obfuscation' %}
         <div class="notice">
-            <h2>Obfuscation status:</h2>
+            <h3>Obfuscation status:</h3>
             <ul>
                 <li>Only supported networks are counted here.</li>
                 <li><b>None</b> means not determined yet or erroneous.</li>