]> nos-oignons.net Git - website.git/blobdiff - Services.mdwn
Services: Charge le CSS avant les scripts JS
[website.git] / Services.mdwn
index 8db25f0212e362d4fe22e268f742a56575d582f8..9bf45f8bf99802a036fdb518c659cfdfc652e829 100644 (file)
@@ -1,36 +1,14 @@
+[[!meta stylesheet="assets/bw_graphs" rel="stylesheet" title="graphs"]]
+[[!meta stylesheet="assets/weights_graphs" rel="stylesheet" title="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 stylesheet="assets/weights_graphs" rel="stylesheet" title="graphs"]]
 [[!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
 ======
@@ -79,7 +57,7 @@ Nos oignons fait actuellement fonctionner les relais Tor suivantsĀ :
     </tr>
     <tr>
       <td><a href="http://www.globenet.org/">Globenet</a></td>
-      <td><a href="https://atlas.torproject.org/#details/8E6EDA78D8E3ABA88D877C3E37D6D4F0938C7B9F">AlGrothendieck</a><sup>5</sup></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>
@@ -111,20 +89,4 @@ Nos oignons fait actuellement fonctionner les relais Tor suivantsĀ :
   </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>