diff --git a/index.html b/index.html index b315d43837b0cb1aa6eb5b27973a971c97a96d43..983c88d4338d72a587f83f11994cdb1312fcebd4 100644 --- a/index.html +++ b/index.html @@ -4,10 +4,10 @@ <meta charset="utf-8"> <title>Jitsimeter: Encuentra la instancia de Jitsi más rápida para tu videoconferencia</title> <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.js"></script> - <script type="text/javascript" src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.js"></script> + <script type="text/javascript" src="https://cdn.datatables.net/v/dt/dt-1.10.20/fc-3.3.0/fh-3.1.6/r-2.2.3/datatables.min.js"></script> <script type="text/javascript" src="jitsimeter.js"></script> <meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline'"> - <link rel="stylesheet" href="https://cdn.datatables.net/1.10.20/css/jquery.dataTables.min.css"> + <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/dt/dt-1.10.20/fc-3.3.0/fh-3.1.6/r-2.2.3/datatables.min.css"/> <link rel="stylesheet" href="main.css"> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon"> <link rel="icon" href="./favicon.ico" type="image/x-icon"> @@ -37,9 +37,9 @@ </div> <p id="notice"> <span id="notice-stop"> - <span lang="es">Detener las descargas antes de inciar.</span> + <span lang="es">Pausa las descargas antes de inciar.</span> <span lang="de">Der Test der Download-Geschwindigkeit läuft lokal auf ihrem Computer, deshalb sollten sie mögliche Downloads vorher beenden.</span> - <span lang="en">Stop the downloads before starting.</span> + <span lang="en">Pause the downloads before starting.</span> <span lang="fr">Arrêtez les téléchargements avant de commencer.</span> <span lang="ca">Detenir les descàrregues abans de iniciar.</span> <span lang="it">Fermare gli scarichi prima d'avviare.</span> @@ -120,6 +120,14 @@ <table id="instancesTable" class="display" style="width:100%"> <thead> <tr> + <th> + <span lang="es">Evaluado</span> + <span lang="de">Tested</span> + <span lang="en">Tested</span> + <span lang="fr">Tested</span> + <span lang="ca">Tested</span> + <span lang="it">Tested</span> + </th> <th> <span lang="es">Dirección web</span> <span lang="de">Webseite</span> @@ -177,12 +185,12 @@ <span lang="it">Provider</span> </th> <th> - <span lang="es">Evaluado</span> - <span lang="de">Tested</span> - <span lang="en">Tested</span> - <span lang="fr">Tested</span> - <span lang="ca">Tested</span> - <span lang="it">Tested</span> + <span lang="es">Version</span> + <span lang="de">Version</span> + <span lang="en">Version</span> + <span lang="fr">Version</span> + <span lang="ca">Version</span> + <span lang="it">Version</span> </th> </tr> </thead> diff --git a/jitsimeter.js b/jitsimeter.js index 71a9b7fece17f66f0c5e2decf4775ca4d9c5d52b..c8ab7ad84069da7e564b0ab4604928d65e303188 100644 --- a/jitsimeter.js +++ b/jitsimeter.js @@ -25,16 +25,20 @@ $(document).ready(function() { "ajax": instancesURL, info: false, order: 3, + responsive: true, + fixedHeader: true, + fixedColumns: true, "paging": false, "columns": [ - { "data": "domain", render: function(value) { return "<a href='https://"+value+"'>"+value+"</a>"; } }, + { "data": "tested", className: "dt-body-center", defaultContent: "-", render: function(value) { return (value === true) ? "✔" : (value === window.undefined) ? "-" : (value === "progress") ? "⟳" : "✖"; } }, + { "data": "domain", render: function(value, a, data) { return "<a href='https://"+value+"'>"+value+"</a>"+ (data.authEnabled ? " 🔒" : ""); } }, { "data": "download", type: "num", defaultContent: "-", className: "dt-body-right", render: function(value) { return (value === false) ? "✖" : value; }}, { "data": "rtt", type: "num-fmt", defaultContent: "-", className: "dt-body-right", render: function(value) { return (value === false) ? "✖" : value; } }, { "data": "countryCode", className: "dt-body-center" }, { "data": "bad", className: "dt-body-center", render: function(value) { return (value === true) ? "✖" : "✔"; } }, { "data": "hosterBad", className: "dt-body-center", render: function(value) { return (value === true) ? "✖" : "✔"; } }, { "data": "hoster" }, - { "data": "tested", className: "dt-body-center", defaultContent: "-", render: function(value) { return (value === true) ? "✔" : (value === window.undefined) ? "-" : (value === "progress") ? "⟳" : "✖"; } } + { "data": "jitsiVersion" } ], pageLength: 300, initComplete: function() { @@ -71,9 +75,9 @@ async function startTest() { let index = instance.table.cell($cell).index(); instance.row = instance.table.row(index.row); - instance.downloadCell = instance.table.cell({row: index.row, column: 1}); - instance.rttCell = instance.table.cell({row: index.row, column: 2}); - instance.testedCell = instance.table.cell({row: index.row, column: 7}); + instance.testedCell = instance.table.cell({row: index.row, column: 0}); + instance.downloadCell = instance.table.cell({row: index.row, column: 2}); + instance.rttCell = instance.table.cell({row: index.row, column: 3}); if (instance.available == false) { failed(instance); @@ -91,7 +95,7 @@ async function startTest() { } function updateProgress() { - $('#instancesTable').DataTable().order(1).draw(); + $('#instancesTable').DataTable().order(2).draw(); $("#progress").attr("max",instanceCounts.total); $("#progress").attr("value",(instanceCounts.failed+instanceCounts.tested));