correction du lien vers internet-signalement.gouv.fr

[website.git] / Services.mdwn

diff --git a/Services.mdwn b/Services.mdwn
index 9bb655e0b187518dee87d370b206b65dbccccb75..2619ea36c1e1f8ca88616afbfd1d958ee7ed0471 100644 (file)
--- a/Services.mdwn
+++ b/Services.mdwn
@@ -1,36 +1,15 @@
+[[!meta stylesheet="assets/bw_graphs" rel="stylesheet" title="graphs"]]
+[[!meta stylesheet="assets/weights_graphs" rel="stylesheet" title="graphs"]]
+[[!meta link="https://onionoo.torproject.org" rel="preconnect"]]

 [[!meta script="assets/l10n.fr"]]
 [[!meta script="assets/relays"]]
 [[!meta script="assets/d3/d3.v3.min"]]
 [[!meta script="assets/bw_graphs"]]
 [[!meta script="assets/l10n.fr"]]
 [[!meta script="assets/relays"]]
 [[!meta script="assets/d3/d3.v3.min"]]
 [[!meta script="assets/bw_graphs"]]

-[[!meta stylesheet="assets/bw_graphs" rel="stylesheet" title="graphs"]]

 [[!meta script="assets/weights_graphs"]]
 [[!meta script="assets/weights_graphs"]]

-[[!meta stylesheet="assets/weights_graphs" rel="stylesheet" title="graphs"]]

 [[!meta script="assets/pie_graphs"]]
 [[!meta title="Services"]]
 
 [[!meta script="assets/pie_graphs"]]
 [[!meta title="Services"]]
 

-<script>
-
-var content = d3.select("#content");
-var consensus_figure = content.append("figure")
-  .attr('class', 'graph graph-consensus')
-consensus_figure.append("span")
-  .attr("id", "consensus-pie");
-consensus_figure.append("figcaption")
-  .text(L10n.consensus_weight);
-
-var exit_figure = content.append("figure")
-  .attr('class', 'graph graph-exit')
-exit_figure.append("span")
-  .attr("id", "exit-pie");
-exit_figure.append("figcaption")
-  .text(L10n.exit_probability);
-
-content.append("div")
-  .style("clear", "left");
-
-new ConsensusPieDrawer("#consensus-pie").draw();
-new ExitPieDrawer("#exit-pie").draw();
-</script>
+<script type="text/javascript" src="../assets/services-pie.js"></script>

 
 Relais
 ======
 
 Relais
 ======


@@ -77,6 +56,12 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
       <td><code>90FD 830C 357A 5109 AB3C 5052 8771 3F1A C811 174C</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>
       <td><code>90FD 830C 357A 5109 AB3C 5052 8771 3F1A C811 174C</code></td>
       <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
     </tr>

+    <tr>
+      <td><a href="http://www.globenet.org/">Globenet</a></td>
+      <td><a href="https://atlas.torproject.org/#details/8E6EDA78D8E3ABA88D877C3E37D6D4F0938C7B9F">AlGrothendieck</a></td>
+      <td><code>8E6E DA78 D8E3 ABA8 8D87 7C3E 37D6 D4F0 938C 7B9F</code></td>
+      <td><a href="https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy">Reduced Exit Policy</a></td>
+    </tr>

 
   </tbody>
   <tfoot class="footnotes">
 
   </tbody>
   <tfoot class="footnotes">


@@ -105,20 +90,4 @@ Nos oignons fait actuellement fonctionner les relais Tor suivants :
   </tfoot>
 </table>
 
   </tfoot>
 </table>
 

-<script>
-d3.select("#content").append("h1")
-  .text(L10n.bandwidth);
-d3.select("#content").append("div")
-  .attr("id", "bandwidth")
-  .text(L10n.loading);
-
-new BwDrawer("#bandwidth").draw();
-
-d3.select("#content").append("h1")
-  .text(L10n.weights);
-d3.select("#content").append("div")
-  .attr("id", "weights")
-  .text(L10n.loading);
-
-new WeightsDrawer("#weights").draw();
-</script>
+<script type="text/javascript" src="../assets/services-plot.js"></script>