commit f1d6716ff599e89033ae6fee7972ff27d8c3bdc6 Author: Pili Guerra <pili@piliguerra.com> Date: Mon Mar 23 17:18:36 2020 +0000 Add Tools section to Onion Services landing page. Fixes #66. --- assets/static/images/onions/png/onionshare.png | Bin 0 -> 16103 bytes assets/static/images/onions/png/securedrop.png | Bin 0 -> 17483 bytes assets/static/images/onions/svg/globaleaks.svg | 3 +++ databags/onion-tools.ini | 17 +++++++++++++++++ templates/onion-services.html | 17 +++++++++++++++++ 5 files changed, 37 insertions(+) diff --git a/assets/static/images/onions/png/onionshare.png b/assets/static/images/onions/png/onionshare.png new file mode 100644 index 0000000..e2948b0 Binary files /dev/null and b/assets/static/images/onions/png/onionshare.png differ diff --git a/assets/static/images/onions/png/securedrop.png b/assets/static/images/onions/png/securedrop.png new file mode 100644 index 0000000..55f9b01 Binary files /dev/null and b/assets/static/images/onions/png/securedrop.png differ diff --git a/assets/static/images/onions/svg/globaleaks.svg b/assets/static/images/onions/svg/globaleaks.svg new file mode 100644 index 0000000..ca9095f --- /dev/null +++ b/assets/static/images/onions/svg/globaleaks.svg @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2" version="1.1" inkscape:version="0.91 r13725" xml:space="preserve" width="974.03241" height="904.7312" viewBox="0 0 974.03241 904.7312" sodipodi:docname="GlobaLeaks.svg"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath clipPathUnits="userSpaceOnUse" id="clipPath26"><path d="m 0,680.855 779.691,0 0,-474 -779.691,0 0,474 z" id="path28" inkscape:connector-curvature="0"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="clipPath36"><path d="m 0,207 780,0 0 ,475 -780,0 0,-475 z" id="path38" inkscape:connector-curvature="0"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="clipPath46"><path d="m 0,682 780,0 0,-475 -780,0 0,475 z" id="path48" inkscape:connector-curvature="0"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="clipPath56"><path d="m 0,207 780,0 0,475 -780,0 0,-475 z" id="path58" inkscape:connector-curvature="0"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="clipPath66"><path d="m 0,682 780,0 0,-475 -780,0 0,475 z" id="path68" inkscape:connector-curvature="0"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="clipPath76"><path d="m 0,207 780,0 0,475 -780,0 0,-475 z" id="path78" inkscape:connector-curvature="0"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="clipPath86"><path d="m 0,682 780,0 0,-475 -780,0 0,475 z" id="path88" inkscape:connector-curvature="0"/></clipPath><clipPath clipPathUnits="userSpaceOnUse" id="clipPath96"><path d="m 0,207 780,0 0,475 -780,0 0,-475 z" id="path98" ink scape:connector-curvature="0"/></clipPath></defs><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1855" inkscape:window-height="1056" id="namedview4" showgrid="false" inkscape:zoom="0.26085096" inkscape:cx="9.7321601" inkscape:cy="452.3656" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" inkscape:current-layer="g10"/><g id="g10" inkscape:groupmode="layer" inkscape:label="GlobaLeaks" transform="matrix(1.25,0,0,-1.25,0,904.73122)"><g id="g3468" transform="translate(-5.3613281e-4,-25.026991)"><g id="g12"><path inkscape:connector-curvature="0" id="path14" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 522.805,665.406 4.172,0 0,-0.586 -4.172,0 0,0.586 z"/><path inkscape:connector-curvature="0" id="path16" style="fill:#00adef;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3 94.773,665.406 -262.535,0 -107.511,-218.66 60.199,0 -62.422,-223.988 372.269,0 0,442.648 z"/><path inkscape:connector-curvature="0" id="path18" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 132.234,665.406 -107.507,-218.66 60.199,0 -62.418,-223.988 372.265,0 0,442.648 -262.539,0 z"/><path inkscape:connector-curvature="0" id="path20" style="fill:#151b34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 348.957,665.406 -107.508,-218.644 49.606,0 0,-224.008 472.761,0 0,442.652 -414.859,0 z"/></g><g id="g22"><g clip-path="url(#clipPath26)" id="g24"><g transform="translate(0,-0.215027)" id="g30"><g id="g32"><g clip-path="url(#clipPath36)" id="g34"><g id="g40"/><g id="g42"><g clip-path="url(#clipPath46)" id="g44"><g id="g50"><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g id="g60"/><g id="g62"><g clip-path="url(#clipPath66)" id="g64"><g id="g70"><g id="g72"><g clip-path="url(#clipPath76)" id="g74"><g id="g80"/><g id="g82"><g clip-path="url(#clipPath86)" i d="g84"><g id="g90"><g id="g92"><g clip-path="url(#clipPath96)" id="g94"><g id="g100"><path inkscape:connector-curvature="0" id="path102" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 763.82,222.98 -187.765,0 33.187,95.082 c 3.164,8.918 -1.515,18.704 -10.433,21.856 -8.914,3.152 -18.704,-1.52 -21.852,-10.434 l -6.281,-16.621 0,68.012 c 0,12.234 -9.914,22.148 -22.149,22.148 -5.675,0 -10.851,-2.152 -14.769,-5.668 l 0,3.211 c 0,11.868 -9.356,21.481 -21.094,22.043 l 2.762,24.368 -58.68,0 107.504,218.644 199.57,0 0,-442.641 z M 497.918,416.691 c -4.313,-4.046 -7.043,-9.746 -7.043,-16.125 l 0,-3.211 c -3.922,3.516 -9.082,5.668 -14.773,5.668 -12.227,0 -22.141,-9.914 -22.141,-22.148 l 0,-19.195 c -1.066,0.207 -2.16,0.324 -3.289,0.324 -9.508,0 -17.223,-7.715 -17.223,-17.234 l 0,-121.79 -72.691,0 33.199,95.082 c 3.148,8.918 -1.527,18.704 -10.437,21.856 -8.926,3.152 -18.711,-1.52 -21.856,-10.434 l -6.277,-16.621 0,68.012 c 0,12.234 -9.922,22.148 -22.16,22.148 -5.676,0 - 10.844,-2.152 -14.762,-5.668 l 0,3.211 c 0,11.868 -9.36,21.481 -21.098,22.043 l 2.762,24.368 -58.68,0 107.504,218.644 199.559,0 -115.063,-234.059 66.164,0 -1.695,-14.871 z m -216.715,0 c -4.316,-4.046 -7.043,-9.746 -7.043,-16.125 l 0,-3.211 c -3.922,3.516 -9.082,5.668 -14.773,5.668 -12.231,0 -22.149,-9.914 -22.149,-22.148 l 0,-19.195 c -1.062,0.207 -2.152,0.324 -3.285,0.324 -9.512,0 -17.223,-7.715 -17.223,-17.234 l 0,-121.797 -194.222,0 15.168,54.422 c 3.012,-0.645 6.109,-1.098 9.312,-1.098 l 17.707,0 c 24.731,0 44.782,20.051 44.782,44.789 l 0,4.051 c 0,24.734 -20.051,44.785 -44.782,44.785 l -1.234,0 21.465,77.035 -60.199,0 107.511,218.664 199.559,0 -115.067,-234.059 66.157,0 -1.684,-14.871 z M 122.656,681.027 0,431.566 l 64.66,0 -62.437,-223.984 777.004,0 0,473.445 -656.571,0 z m 469.52,-154.406 c 7,0 12.664,5.676 12.664,12.676 0,7 -5.664,12.676 -12.664,12.676 -7.008,0 -12.676,-5.676 -12.676,-12.676 0,-7 5.668,-12.676 12.676,-12.676 m 1.414,25.352 c -7.004,0 -12.672,-5.676 -12.672, -12.676 0,-7 5.668,-12.676 12.672,-12.676 7.004,0 12.672,5.676 12.672,12.676 0,7 -5.668,12.676 -12.672,12.676 m -216.711,0 c -7.008,0 -12.68,-5.676 -12.68,-12.676 0,-7 5.672,-12.676 12.68,-12.676 7,0 12.668,5.676 12.668,12.676 0,7 -5.668,12.676 -12.668,12.676 m -216.719,0 c -7.008,0 -12.676,-5.676 -12.676,-12.676 0,-7 5.668,-12.676 12.676,-12.676 6.996,0 12.664,5.676 12.664,12.676 0,7 -5.668,12.676 -12.664,12.676"/></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g></g><path d="m 62.445,149.144 0,-17.718 9.285,0 c 0,-4.317 -0.234,-7.879 -0.703,-10.692 -0.375,-2.719 -0.937,-4.875 -1.687,-6.469 -0.75,-1.5 -1.688,-2.531 -2.813,-3.093 -1.031,-0.563 -2.25,-0.844 -3.656,-0.844 -1.973,0 -3.566,0.516 -4.785,1.547 -1.125,1.031 -2.016,2.859 -2.672,5.484 -0.562,2.625 -0.937,6.141 -1.125,10.547 -0.187,4.504 -0.281,10.129 -0.281,16.879 0,6.75 0.094,12.328 0.281,16.738 0.188,4.5 0.563,8.059 1.125,10.684 0.656,2.625 1.594,4.457 2.813,5.488 1.312,1.031 3.046,1.547 5.207 ,1.547 3.093,0 5.109,-1.453 6.046,-4.359 0.938,-2.438 1.407,-6.328 1.407,-11.676 l 25.316,0 c 0,6.098 -0.797,11.25 -2.391,15.473 -1.597,4.312 -3.8,7.828 -6.613,10.55 -2.812,2.719 -6.187,4.688 -10.125,5.907 -3.844,1.218 -8.062,1.828 -12.656,1.828 -7.691,0 -13.973,-1.172 -18.848,-3.516 -4.875,-2.25 -8.718,-5.582 -11.531,-9.992 -2.723,-4.402 -4.598,-9.84 -5.629,-16.309 -0.937,-6.468 -1.406,-13.926 -1.406,-22.363 0,-8.344 0.234,-15.754 0.703,-22.223 0.563,-6.468 1.828,-11.906 3.797,-16.312 1.969,-4.406 4.879,-7.738 8.723,-9.988 3.843,-2.157 9.093,-3.235 15.75,-3.235 2.25,0 4.453,0.141 6.609,0.422 2.254,0.281 4.316,0.75 6.191,1.406 1.969,0.75 3.703,1.828 5.203,3.235 1.594,1.406 2.813,3.191 3.657,5.347 l 0.281,0 0.562,-8.863 17.723,0 0,54.57 -33.758,0" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path106" inkscape:connector-curvature="0"/><path d="m 106.891,194.996 0,-100.422 58.367,0 0,21.379 -32.207,0 0,79.043 -26.16,0" style="fill:#3d86cf;fill-opacity:1;fill-ru le:nonzero;stroke:none" id="path108" inkscape:connector-curvature="0"/><path d="m 196.059,144.785 c 0,6.75 0.093,12.328 0.281,16.738 0.187,4.5 0.562,8.059 1.125,10.684 0.656,2.625 1.547,4.457 2.672,5.488 1.218,1.031 2.812,1.547 4.781,1.547 1.969,0 3.516,-0.516 4.641,-1.547 1.222,-1.031 2.113,-2.863 2.675,-5.488 0.657,-2.625 1.078,-6.184 1.266,-10.684 0.188,-4.41 0.281,-9.988 0.281,-16.738 0,-6.75 -0.093,-12.375 -0.281,-16.879 -0.188,-4.406 -0.609,-7.922 -1.266,-10.547 -0.562,-2.625 -1.453,-4.453 -2.675,-5.484 -1.125,-1.031 -2.672,-1.547 -4.641,-1.547 -1.969,0 -3.563,0.516 -4.781,1.547 -1.125,1.031 -2.016,2.859 -2.672,5.484 -0.563,2.625 -0.938,6.141 -1.125,10.547 -0.188,4.504 -0.281,10.129 -0.281,16.879 m -27.004,0 c 0,-9.375 0.609,-17.395 1.828,-24.051 1.219,-6.562 3.234,-11.953 6.047,-16.172 2.812,-4.125 6.519,-7.082 11.113,-8.863 4.594,-1.781 10.219,-2.672 16.875,-2.672 6.66,0 12.285,0.891 16.879,2.672 4.594,1.781 8.297,4.738 11.109,8.863 2.813,4.219 4.828,9.61 6.047,16.172 1.223, 6.656 1.832,14.676 1.832,24.051 0,9.375 -0.609,17.348 -1.832,23.91 -1.219,6.656 -3.234,12.047 -6.047,16.172 -2.812,4.223 -6.515,7.27 -11.109,9.145 -4.594,1.968 -10.219,2.953 -16.879,2.953 -6.656,0 -12.281,-0.985 -16.875,-2.953 -4.594,-1.875 -8.301,-4.922 -11.113,-9.145 -2.813,-4.125 -4.828,-9.516 -6.047,-16.172 -1.219,-6.562 -1.828,-14.535 -1.828,-23.91" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path110" inkscape:connector-curvature="0"/><path d="m 277.211,113.422 0,24.472 7.312,0 c 2.438,0 4.594,-1.031 6.469,-3.093 1.875,-2.063 2.813,-5.063 2.813,-9.004 0,-4.219 -0.938,-7.36 -2.813,-9.422 -1.875,-1.969 -4.031,-2.953 -6.469,-2.953 l -7.312,0 m 0,42.191 0,20.535 6.328,0 c 2.719,0 4.781,-1.031 6.188,-3.093 1.406,-2.063 2.109,-4.5 2.109,-7.313 0,-2.719 -0.703,-5.109 -2.109,-7.176 -1.407,-1.969 -3.469,-2.953 -6.188,-2.953 l -6.328,0 m -26.16,39.383 0,-100.422 39.519,0 c 5.438,0 10.082,0.703 13.926,2.109 3.844,1.5 6.938,3.567 9.281,6.192 2.438,2.625 4.219,5.76 5 5.344,9.422 1.125,3.656 1.688,7.64 1.688,11.953 0,2.625 -0.375,5.203 -1.125,7.738 -0.657,2.625 -1.735,5.016 -3.235,7.172 -1.5,2.156 -3.422,3.937 -5.765,5.344 -2.344,1.5 -5.157,2.39 -8.438,2.672 l 0,0.281 c 2.813,0.562 5.203,1.547 7.172,2.953 1.969,1.406 3.562,3.094 4.781,5.062 1.313,2.063 2.25,4.317 2.813,6.754 0.656,2.532 0.984,5.106 0.984,7.731 0,7.598 -2.25,13.644 -6.75,18.148 -4.406,4.594 -11.297,6.891 -20.676,6.891 l -39.519,0" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path112" inkscape:connector-curvature="0"/><path d="m 363.707,174.457 -7.176,-42.61 14.629,0 -7.172,42.61 -0.281,0 m 16.594,20.539 24.472,-100.422 -27.847,0 -2.672,17.582 -20.816,0 -2.672,-17.582 -27.426,0 24.051,100.422 32.91,0" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path114" inkscape:connector-curvature="0"/><path d="m 409.133,194.996 0,-100.422 58.367,0 0,21.379 -32.207,0 0,79.043 -26.16,0" style="fill:#151b34;fill-opacity:1;fill-rule:nonzero;stroke: none" id="path116" inkscape:connector-curvature="0"/><path d="m 474.254,194.996 0,-100.422 60.758,0 0,21.379 -34.602,0 0,19.973 31.223,0 0,20.531 -31.223,0 0,17.16 33.336,0 0,21.379 -59.492,0" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path118" inkscape:connector-curvature="0"/><path d="m 577.344,174.457 -7.172,-42.61 14.625,0 -7.172,42.61 -0.281,0 m 16.597,20.539 24.469,-100.422 -27.848,0 -2.671,17.582 -20.813,0 -2.672,-17.582 -27.426,0 24.047,100.422 32.914,0" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path120" inkscape:connector-curvature="0"/><path d="m 621.789,194.996 0,-100.422 26.156,0 0,26.582 5.489,8.441 15.328,-35.023 29.816,0 -28.41,56.539 25.316,43.883 -27.847,0 -19.41,-38.539 -0.282,0 0,38.539 -26.156,0" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path122" inkscape:connector-curvature="0"/><path d="m 740.07,166.023 24.469,0 c 0,10.782 -2.578,18.61 -7.734,23.489 -5.063,4.968 -13.313,7.453 -24 .754,7.453 -11.063,0 -19.313,-2.672 -24.754,-8.016 -5.438,-5.348 -8.156,-13.129 -8.156,-23.348 0,-5.906 0.984,-10.691 2.953,-14.347 2.062,-3.657 4.594,-6.61 7.597,-8.86 3.094,-2.25 6.422,-4.078 9.985,-5.484 3.562,-1.406 6.844,-2.813 9.844,-4.219 3.093,-1.312 5.625,-2.953 7.593,-4.926 2.067,-1.875 3.098,-4.453 3.098,-7.734 0,-2.719 -0.75,-5.016 -2.254,-6.891 -1.406,-1.875 -3.469,-2.812 -6.187,-2.812 -2.532,0 -4.594,0.844 -6.188,2.531 -1.594,1.781 -2.391,4.828 -2.391,9.141 l 0,2.39 -25.316,0 0,-3.515 c 0,-5.25 0.75,-9.656 2.25,-13.219 1.5,-3.562 3.656,-6.469 6.469,-8.723 2.91,-2.156 6.426,-3.656 10.551,-4.5 4.218,-0.937 9.046,-1.406 14.484,-1.406 11.535,0 20.348,2.391 26.441,7.176 6.094,4.875 9.141,12.656 9.141,23.344 0,6.097 -1.078,11.019 -3.234,14.769 -2.063,3.844 -4.688,6.938 -7.875,9.281 -3.188,2.344 -6.61,4.219 -10.266,5.625 -3.656,1.5 -7.078,2.954 -10.27,4.36 -3.187,1.406 -5.859,3.051 -8.015,4.926 -2.063,1.968 -3.094,4.593 -3.094,7.875 0,2.25 0.656,4.265 1.969,6.047 1.312,1.875 3.375,2.812 6.187,2.812 2.532,0 4.407,-1.078 5.625,-3.234 1.223,-2.063 1.832,-4.594 1.832,-7.594 l 0,-2.391" style="fill:#3d86cf;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path124" inkscape:connector-curvature="0"/></g></g></svg> \ No newline at end of file diff --git a/databags/onion-tools.ini b/databags/onion-tools.ini new file mode 100644 index 0000000..6eff5af --- /dev/null +++ b/databags/onion-tools.ini @@ -0,0 +1,17 @@ +[onionshare] +link = https://onionshare.org/ +image = /static/images/onions/png/onionshare.png +label = OnionShare +active = True + +[securedrop] +link = https://securedrop.org +image = /static/images/onions/png/securedrop.png +label = SecureDrop +active = True + +[globaleaks] +link = https://www.globaleaks.org/ +image =/static/images/onions/svg/globaleaks.svg +label= GlobaLeaks +active = True diff --git a/templates/onion-services.html b/templates/onion-services.html index a4a7ed6..d726742 100644 --- a/templates/onion-services.html +++ b/templates/onion-services.html @@ -51,6 +51,23 @@ </div> {% endfor %} </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto">{{ _('Tools') }}</h2> + </div> + <div class="row mx-auto"> + {% for id, item in bag('onion-tools').items() %} + {% if item.active == "True" %} + <div class="col-4"> + <div class="card h-50 border-0"> + <a href="{{ item.link }}"><img class="card-img-top h-200 w-25 mx-auto d-block" src="{{ item.image|asseturl }}"></a> + <div class="card-body"> + <p class="card-text text-primary text-center"><a href="{{ item.link }}">{{ item.label }}</a></p> + </div> + </div> + </div> + {% endif %} + {% endfor %} + </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Learn More') }}</h2> <p class="text-center">