August 2017 - tor-commits - lists.torproject.org

[nyx/master] Fill in download page
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 392baf9681ea16a496f3609a2e4d7befc0ba1c86 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 25 10:16:55 2017 -0700 Fill in download page I'll probably twiddle with the layout bit more, but pretty close to what I'm after. --- web/images/download/archlinux.png | Bin 0 -> 7144 bytes web/images/download/debian.png | Bin 0 -> 5646 bytes web/images/download/fedora.png | Bin 0 -> 4447 bytes web/images/download/freebsd.png | Bin 0 -> 18114 bytes web/images/download/gentoo.png | Bin 0 -> 16245 bytes web/images/download/git.png | Bin 0 -> 2273 bytes web/images/download/git_alt.png | Bin 0 -> 4749 bytes web/images/download/osx.png | Bin 0 -> 3660 bytes web/images/download/pypi.png | Bin 0 -> 3827 bytes web/images/download/redhat.png | Bin 0 -> 4944 bytes web/images/download/resources/fedora.svg | 74 +++++++++++++++++++++++++++++++ web/images/download/slackware.png | Bin 0 -> 10938 bytes web/images/download/ubuntu.png | Bin 0 -> 4814 bytes web/index.html | 73 +++++++++++++++++++++++++++++- web/styles.css | 53 ++++++++++++++++++++++ 15 files changed, 199 insertions(+), 1 deletion(-) diff --git a/web/images/download/archlinux.png b/web/images/download/archlinux.png new file mode 100644 index 0000000..430d5db Binary files /dev/null and b/web/images/download/archlinux.png differ diff --git a/web/images/download/debian.png b/web/images/download/debian.png new file mode 100644 index 0000000..659dc8d Binary files /dev/null and b/web/images/download/debian.png differ diff --git a/web/images/download/fedora.png b/web/images/download/fedora.png new file mode 100644 index 0000000..30d2062 Binary files /dev/null and b/web/images/download/fedora.png differ diff --git a/web/images/download/freebsd.png b/web/images/download/freebsd.png new file mode 100644 index 0000000..cec7774 Binary files /dev/null and b/web/images/download/freebsd.png differ diff --git a/web/images/download/gentoo.png b/web/images/download/gentoo.png new file mode 100644 index 0000000..c96e01c Binary files /dev/null and b/web/images/download/gentoo.png differ diff --git a/web/images/download/git.png b/web/images/download/git.png new file mode 100644 index 0000000..529aa0f Binary files /dev/null and b/web/images/download/git.png differ diff --git a/web/images/download/git_alt.png b/web/images/download/git_alt.png new file mode 100644 index 0000000..88e399e Binary files /dev/null and b/web/images/download/git_alt.png differ diff --git a/web/images/download/osx.png b/web/images/download/osx.png new file mode 100644 index 0000000..bb9caca Binary files /dev/null and b/web/images/download/osx.png differ diff --git a/web/images/download/pypi.png b/web/images/download/pypi.png new file mode 100644 index 0000000..5fd55b7 Binary files /dev/null and b/web/images/download/pypi.png differ diff --git a/web/images/download/redhat.png b/web/images/download/redhat.png new file mode 100644 index 0000000..7300b91 Binary files /dev/null and b/web/images/download/redhat.png differ diff --git a/web/images/download/resources/fedora.svg b/web/images/download/resources/fedora.svg new file mode 100644 index 0000000..8c9cbd6 --- /dev/null +++ b/web/images/download/resources/fedora.svg @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<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" + version="1.0" + width="1024" + height="324" + viewBox="-1.77184308 -1.77184308 197.90104616 62.60512216" + id="svg2870" + inkscape:version="0.48.1 r9760" + sodipodi:docname="Fedora_logo_and_wordmark.svg" + inkscape:export-filename="/home/atagar/Desktop/fedora.png" + inkscape:export-xdpi="57.099247" + inkscape:export-ydpi="57.099247"> + <metadata + id="metadata10"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="668" + inkscape:window-height="480" + id="namedview8" + showgrid="false" + inkscape:zoom="0.45996094" + inkscape:cx="801.51734" + inkscape:cy="162" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="0" + inkscape:current-layer="svg2870" /> + <defs + id="defs2872" /> + <path + inkscape:connector-curvature="0" + id="path3584" + style="fill:#072b61;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 194.35736,16.449737 C 194.35736,7.3649625 186.99245,0 177.90779,0 168.8271,0 161.46537,7.3587875 161.45876,16.43815 l -5e-4,-5.38e-4 0,12.729488 5e-4,5.37e-4 c 0.005,2.0615 1.67683,3.730388 3.73966,3.730388 l 0.0179,-5.25e-4 9.9e-4,5.25e-4 12.69702,0 c 9.08175,-0.0034 16.44297,-7.365788 16.44297,-16.448288" /> + <path + inkscape:connector-curvature="0" + id="path3562" + style="fill:#0a57a4;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 182.75,3.90625 c -4.26397,10e-8 -7.71875,3.4548375 -7.71875,7.71875 l 0,4.09375 -4.09375,0 c -4.26396,0 -7.71875,3.423888 -7.71875,7.6875 -1e-5,4.263838 3.45479,7.71875 7.71875,7.71875 4.26373,1e-6 7.71875,-3.454912 7.71875,-7.71875 l 0,-4.09375 4.09375,0 c 4.26369,1e-6 7.71875,-3.423663 7.71875,-7.6875 0,-4.263912 -3.45506,-7.71875 -7.71875,-7.71875 z m 0,3.625 c 2.25071,2e-7 4.09375,1.842775 4.09375,4.09375 0,2.250363 -1.84304,4.09375 -4.09375,4.09375 l -0.0312,0 -3.46875,0 c -0.31826,0 -0.59375,-0.276063 -0.59375,-0.59375 l 0,-3.5 c 0.004,-2.2480751 1.84598,-4.09375 4.09375,-4.09375 z m -11.8125,11.78125 3.5,0 c 0.31773,1e-6 0.59375,0.244663 0.59375,0.5625 l 0,3.53125 c -0.003,2.247326 -1.84571,4.09375 -4.09375,4.09375 -2.25041,1e-6 -4.09375,-1.843388 -4.09375,-4.09375 0,-2.25075 1.84334,-4.09375 4.09375,-4.09375 z" + sodipodi:nodetypes="sscsssscssscsscsscccssscsss" /> + <path + inkscape:connector-curvature="0" + id="path3588" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 175.01713,15.7113 0,-4.086387 0,-0.0053 c 0,-4.263913 3.45636,-7.720338 7.72033,-7.720338 0.64712,0 1.10663,0.072625 1.7058,0.2295625 0.87288,0.2287375 1.58589,0.9440625 1.58643,1.7769625 2.4e-4,1.00655 -0.73035,1.7381375 -1.82225,1.7381375 -0.5204,0 -0.70824,-0.099563 -1.47026,-0.099563 -2.24777,0 -4.07055,1.82045 -4.07449,4.0685245 l 0,3.522563 0,5.37e-4 c 0,0.317688 0.25716,0.575338 0.57542,0.575338 l 0.002,0 2.67567,0 c 0.99728,0 1.8022,0.797875 1.80304,1.797475 0,1.00045 -0.80603,1.7968 -1.80304,1.7968 l -3.25271,0 0,4.10385 0,0.0054 c 0,4.2633 -3.45661,7.720225 -7.72034,7.720225 -0.64685,0 -1.10662,-0.07299 -1.70525,-0.2295 -0.8732,-0.228425 -1.58673,-0.944325 -1.58698,-1.776925 0,-1.0065 0.73065,-1.738475 1.82252,-1.738475 0.51985,0 0.70849,0.09988 1.46971,0.09988 2.24804,0 4.07135,-1.82095 4.07505,-4.0688 l 0,-3.5408 c 0,-0.3173 -0.25771,-0.574338 -0.57545,-0.574338 l -0.002,0 -2.6757,-5.37e-4 c -0.99726,0 -1.80297,-0.795588 -1.80297,-1.795725 -5.7e-4,-1.006325 0.8 1415,-1.79855 1.82221,-1.79855 l 3.23323,0" /> +</svg> + + diff --git a/web/images/download/slackware.png b/web/images/download/slackware.png new file mode 100644 index 0000000..324e046 Binary files /dev/null and b/web/images/download/slackware.png differ diff --git a/web/images/download/ubuntu.png b/web/images/download/ubuntu.png new file mode 100644 index 0000000..90a9c6e Binary files /dev/null and b/web/images/download/ubuntu.png differ diff --git a/web/index.html b/web/index.html index 81a8e7d..5f97aa9 100644 --- a/web/index.html +++ b/web/index.html @@ -92,7 +92,78 @@ </div> <div id="download" class="content"> - <h1>Download page coming soon</h1> + <div class="section"></div> + <a href="#download" class="section-title">Download</a> + + <p>Nyx is available Mac OSX, Linux, and BSD but <a href="#windows">not Windows</a>. Find your platform below to get started.</p> + + <div class="platform"> + <a href="https://pypi.python.org/pypi/nyx/"><img src="images/download/pypi.png" alt="PyPI" /></a> + <a href="https://pypi.python.org/pypi/nyx/" class="platform-title">Python Package Index</a> + <p>Signed releases and instructions for both Python 2.x and 3.x. You can easily install from its <a href="https://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2">tarball</a> (<a href="https://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2.asc">sig</a>), or with <b>pip</b>...</p> + <pre> +% sudo easy_install pip +% sudo pip install nyx +</pre> + </div> + + <div class="platform"> + <img src="images/download/osx.png" alt="OSX" /> + <span class="platform-title">Mac OSX</span> + <p>As of OSX 10.8 the platform bundles Python 2.7 by default. This makes installation easy...</p> + <pre> +% sudo easy_install pip +% sudo pip install nyx +</pre> + </div> + + <div class="platform"> + <a href="http://packages.debian.org/sid/tor-arm"><img src="images/download/debian.png" alt="Debian" /></a> + <a href="http://packages.debian.org/sid/tor-arm" class="platform-title">Debian</a> + <p>Package maintained by Dererk for Debian.</p> + <pre>% sudo apt-get install tor-arm</pre> + </div> + + <div class="platform"> + <a href="https://launchpad.net/ubuntu/+source/tor-arm"><img src="images/download/ubuntu.png" alt="Ubuntu" /></a> + <a href="https://launchpad.net/ubuntu/+source/tor-arm" class="platform-title">Ubuntu</a> + <p>Package derived from Debian for Ubuntu.</p> + <pre>% sudo apt-get install tor-arm</pre> + </div> + + <div class="platform"> + <a href="https://apps.fedoraproject.org/packages/tor-arm"><img src="images/download/fedora.png" alt="Fedora" /></a> + <a href="https://apps.fedoraproject.org/packages/tor-arm" class="platform-title">Fedora</a> + <p>Packages maintained by Juan for Fedora.</p> + <pre>% sudo yum install tor-arm</pre> + </div> + + <div class="platform"> + <a href="http://packages.gentoo.org/package/net-misc/arm"><img src="images/download/gentoo.png" alt="Gentoo" /></a> + <a href="http://packages.gentoo.org/package/net-misc/arm" class="platform-title">Gentoo</a> + <p>Package maintained by Jesse for Gentoo.</p> + <pre>% sudo emerge arm</pre> + </div> + + <div class="platform"> + <a href="https://slackbuilds.org/repository/13.37/network/arm/"><img src="images/download/slackware.png" alt="Slackware" /></a> + <a href="https://slackbuilds.org/repository/13.37/network/arm/" class="platform-title">Slackware</a> + <p>Package maintained by pyllyukko for <a href="http://slackbuilds.org/howto/">Slackware</a>.</p> + </div> + + <div class="platform"> + <a href="http://www.freshports.org/security/arm"><img src="images/download/freebsd.png" alt="FreeBSD" /></a> + <a href="http://www.freshports.org/security/arm" class="platform-title">FreeBSD</a> + <p>Port maintained by Carlo for <a href="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports.html">FreeBSD</a>.</p> + <pre>% pkg install security/arm</pre> + </div> + + <div class="platform"> + <a href="https://gitweb.torproject.org/nyx.git"><img src="images/download/git.png" alt="Git" /></a> + <a href="https://gitweb.torproject.org/nyx.git" class="platform-title">Source Repository</a> + <p>For those that want to live on the bleeding edge or contribute, Nyx's git repository can be fetched with...</p> + <pre>% git clone https://git.torproject.org/nyx.git</pre> + </div> </div> </div> diff --git a/web/styles.css b/web/styles.css index bd2ff35..846cd2f 100644 --- a/web/styles.css +++ b/web/styles.css @@ -1,3 +1,7 @@ +/*============================================================ +General Tag Attributes +============================================================*/ + body { background: url("images/grid.png"); font-family: "FreeSans", "Arial", "Helvetica", sans-serif; @@ -15,6 +19,10 @@ a:hover { color: #dca85f; } +/*============================================================ +Header Bar (logo and nav) +============================================================*/ + .header { background-color: black; border-bottom: 10px solid #825d27; @@ -79,6 +87,10 @@ a:hover { color: #666666; } +/*============================================================ +Common Page Attributes +============================================================*/ + .content { background: white; border-radius: 10px; @@ -110,6 +122,10 @@ a:hover { position: relative; } +/*============================================================ +Front Page +============================================================*/ + .feature { height: 150px; margin-top: 25px; @@ -134,3 +150,40 @@ a:hover { margin-right: 25px; } +/*============================================================ +Download Page +============================================================*/ + +.platform { + border-top: 1px solid black; + height: 128px; + margin-top: 15px; + padding-top: 10px; + text-align: left; +} + +.platform-title { + color: #856231; + font-size: 24px; + font-weight: bold; +} + +.platform img { + float: left; + margin-right: 25px; +} + +.platform p { + margin-top: 10px; +} + +.platform pre { + background: #dddddd; + border: 1px solid #bbbbbb; + border-radius: 3px; + margin-left: 145px; + padding-bottom: 4px; + padding-top: 4px; + width: 500px; +} +

1 0

[nyx/master] Note download image sources
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 383c3e157a35e313b5deea3ffb8c564400a58f80 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 27 10:31:00 2017 -0700 Note download image sources Stem noted all this in it reStructured page. Our index.html is already gonna be pretty big since it's a single page site so putting this in a text file instead. --- web/images/download/source.txt | 58 ++++++++++++++++++++++++++++++++++++++++++ web/index.html | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/web/images/download/source.txt b/web/images/download/source.txt new file mode 100644 index 0000000..a444c6c --- /dev/null +++ b/web/images/download/source.txt @@ -0,0 +1,58 @@ +Platform images in this folder originate from the following... + +* PyPI + Source: http://www.python.org/community/logos/ + License: http://www.python.org/psf/trademarks + +* OSX + Source: IconArchive (http://www.iconarchive.com/show/papercut-social-icons-by-graphicloads/Apple…) + Author: GraphicLoads, Papercut Social Icons + License: Freeware + +* Debian + Source: NuoveXT (http://nuovext.pwsp.net/) + Author: Alexandre Moore (http://sa-ki.deviantart.com/) + License: GPL v2 + File: NuoveXT/128x128/apps/debian-logo.png + +* Ubuntu + Source: http://logonoid.com/ubuntu-logo/ + Not quite sure of the license, probably covered by... + http://design.ubuntu.com/brand/ubuntu-logo + +* Fedora + Source: https://en.wikipedia.org/wiki/File:Fedora_logo_and_wordmark.svg + Author: Unknown + +* Red Hat + Source: NuoveXT (http://nuovext.pwsp.net/) + Author: Alexandre Moore (http://sa-ki.deviantart.com/) + License: GPL v2 + File: NuoveXT/128x128/apps/fedora.png + +* Gentoo + Source: https://www.gentoo.org/main/en/name-logo.xml + +* Arch Linux + Source: https://en.wikipedia.org/wiki/File:Archlinux-official-fullcolour.svg + +* Slackware + Source: NuoveXT (http://nuovext.pwsp.net/) + Author: Alexandre Moore (http://sa-ki.deviantart.com/) + License: GPL v2 + File: NuoveXT/128x128/apps/slackware.png + +* FreeBSD + Source: https://en.wikipedia.org/wiki/File:Freebsd_logo.svg + Author: Anton Gural + +* Git + Source: https://en.wikipedia.org/wiki/File:Git-logo.svg + Author: Jason Long + License: CC v3 (A) + +* Git (Alternate) + Source: http://www.dylanbeattie.net/git_logo/ + Author: Dylan Beattie + License: CC v3 (A, SA) + diff --git a/web/index.html b/web/index.html index 031dd16..96b118c 100644 --- a/web/index.html +++ b/web/index.html @@ -32,7 +32,7 @@ <p>Nyx is a command-line monitor for <a href="https://www.torproject.org/">Tor</a>. With this you can get detailed real-time information about your relay such as bandwidth usage, connections, logs, and much more.</p> - <p>Nyx's latest version is <b>1.4.5</b>, released April 28th, 2012. Prior to our upcoming release this application went under the name of '<b>arm</b>'. Sorry about the confusion!</p> + <p>Nyx's latest version is <b>1.4.5</b>, released April 28th, 2012. Prior to our upcoming release this application went under the name of '<b>arm</b>'. Sorry for the confusion!</p> <div id="features" class="section"></div> <a href="#features" class="section-title">What does Nyx provide?</a>

1 0

[nyx/master] Show tab containing requested anchor
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit a2d9d9ec318b990e73e768123d61edc2d226527a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 27 12:02:21 2017 -0700 Show tab containing requested anchor When the page is loaded with an anchor tag we should show that tab's content so it... well, works. --- web/index.html | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/web/index.html b/web/index.html index 981603e..4f4dc4a 100644 --- a/web/index.html +++ b/web/index.html @@ -169,10 +169,22 @@ </div> </div> -  <script> $(function() { - $(".tabs").tabs(".panes > .content", { history: true }); + $(".tabs").tabs(".panes > .content", { history: true }); + + // when provided an anchor select the tab it resides within + + var anchor = window.location.hash; + var tabs = $(".tabs").data("tabs"); + + if ($("#home").find(anchor).length) { + tabs.click("home"); + } else if ($("#faq").find(anchor).length) { + tabs.click("faq"); + } else if ($("#download").find(anchor).length) { + tabs.click("download"); + } }); </script> </body>

1 0

[nyx/master] Note name change
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 626093961b6125af178d12b45bf322f7229b4de4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 23 22:19:03 2017 -0700 Note name change Any time a project changes names it's confusing as hell. I've attempted to cut down on this confusion by keeping the old name until our 2.0 release and plan to continue to do so. That said, I *might* introduce this new site before that. Not sure - we'll see. --- web/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/index.html b/web/index.html index 1d40517..365d97c 100644 --- a/web/index.html +++ b/web/index.html @@ -29,6 +29,8 @@ <p>Nyx is a command-line monitor for <a href="https://www.torproject.org/">Tor</a>. With this you can get detailed real-time information about your relay such as bandwidth usage, connections, logs, and much more.</p> <p>Nyx's latest version is <b>1.4.5</b>, released April 28th, 2012.</p> + + <p><b>Note:</b> Prior to the next release this application went under the name of '<b>arm</b>'. Very sorry about the confusion.</p> </div> </body> </html>

1 0

[nyx/master] Iterate over panes rather than hardcoded list
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 15c8fe553bf1402a31246787648f706af35bc7b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 27 21:10:20 2017 -0700 Iterate over panes rather than hardcoded list --- web/index.html | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/web/index.html b/web/index.html index 75ff1e6..55b3263 100644 --- a/web/index.html +++ b/web/index.html @@ -188,19 +188,17 @@ <script> $(function() { - $(".tabs").tabs(".panes > .content", { history: true }); - // when provided an anchor select the tab it resides within var anchor = window.location.hash; - var tabs = $(".tabs").data("tabs"); - - if ($("#home").find(anchor).length) { - tabs.click("home"); - } else if ($("#faq").find(anchor).length) { - tabs.click("faq"); - } else if ($("#download").find(anchor).length) { - tabs.click("download"); + $(".tabs").tabs(".panes > .content", { history: true }); + + if (anchor) { + $(".panes").children().each(function () { + if ($(this).find(anchor).length) { + $(".tabs").data("tabs").click(this.id); + } + }); } // show/hide for FAQ questions

1 0

[nyx/master] Stub FAQ section
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 15b95ce9c303cdc35a4827a8842124f93554cef8 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 27 19:44:23 2017 -0700 Stub FAQ section Couple question stubs for colapsing and expanding. --- web/index.html | 34 +++++++++++++++++++++++++++++++++- web/styles.css | 20 ++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/web/index.html b/web/index.html index 4f4dc4a..f8710ed 100644 --- a/web/index.html +++ b/web/index.html @@ -88,7 +88,24 @@ </div> <div id="faq" class="content"> - <h1>FAQ coming soon</h1> + <div class="section"></div> + <a href="#faq" class="section-title">Fact & Question</a> + + <br /><br /> + + <div class="question" id="question_1"> + <span>Demo question 1</span> + <div class="answer_container"> + <div class="answer">answer 1</div> + </div> + </div> + + <div class="question" id="question_2"> + <span>Demo question 2</span> + <div class="answer_container"> + <div class="answer">answer 2</div> + </div> + </div> </div> <div id="download" class="content"> @@ -185,6 +202,21 @@ } else if ($("#download").find(anchor).length) { tabs.click("download"); } + + // show/hide for FAQ questions + + $('.question').click(function() { + var answer = $(this).find('.answer_container'); + + if (answer.is('.open')) { + answer.animate({'height': '0'}, 100); + answer.removeClass('open'); + } else { + var newHeight = $(this).find('.answer').height() + 'px'; + answer.animate({'height': newHeight}, 100); + answer.addClass('open'); + } + }); }); </script> </body> diff --git a/web/styles.css b/web/styles.css index 846cd2f..7e6a10c 100644 --- a/web/styles.css +++ b/web/styles.css @@ -151,6 +151,26 @@ Front Page } /*============================================================ +FAQ Page +============================================================*/ + +.question { + color: #523a17; + cursor: pointer; + font-size: 24px; + font-weight: bold; + margin: 0px; + padding: 0px 0px 5px 0px; + text-align: left; +} + +.answer_container { + height: 0px; + overflow: hidden; + padding: 0px; +} + +/*============================================================ Download Page ============================================================*/

1 0

[nyx/master] Avoid need for a wrapper 'answer_container'
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 45daf4ad0fda25e7d12a148a608e0d452b615b39 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 27 20:57:51 2017 -0700 Avoid need for a wrapper 'answer_container' --- web/index.html | 17 +++++++++++------ web/styles.css | 29 ++++++++++++++++------------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/web/index.html b/web/index.html index f8710ed..75ff1e6 100644 --- a/web/index.html +++ b/web/index.html @@ -95,15 +95,15 @@ <div class="question" id="question_1"> <span>Demo question 1</span> - <div class="answer_container"> - <div class="answer">answer 1</div> + <div class="answer"> + <p>answer 1</p> </div> </div> <div class="question" id="question_2"> <span>Demo question 2</span> - <div class="answer_container"> - <div class="answer">answer 2</div> + <div class="answer"> + <p>answer 2</p> </div> </div> </div> @@ -206,13 +206,18 @@ // show/hide for FAQ questions $('.question').click(function() { - var answer = $(this).find('.answer_container'); + var answer = $(this).find('.answer'); if (answer.is('.open')) { answer.animate({'height': '0'}, 100); answer.removeClass('open'); } else { - var newHeight = $(this).find('.answer').height() + 'px'; + var newHeight = 0; + + answer.children().each(function () { + newHeight += $(this).outerHeight(true); + }); + answer.animate({'height': newHeight}, 100); answer.addClass('open'); } diff --git a/web/styles.css b/web/styles.css index 7e6a10c..fcd0510 100644 --- a/web/styles.css +++ b/web/styles.css @@ -155,19 +155,22 @@ FAQ Page ============================================================*/ .question { - color: #523a17; - cursor: pointer; - font-size: 24px; - font-weight: bold; - margin: 0px; - padding: 0px 0px 5px 0px; - text-align: left; -} - -.answer_container { - height: 0px; - overflow: hidden; - padding: 0px; + cursor: pointer; + margin: 0px; + padding: 0px 0px 5px 0px; + text-align: left; +} + +.question span { + color: #523a17; + font-size: 24px; + font-weight: bold; +} + +.answer { + height: 0px; + overflow: hidden; + padding: 0px; } /*============================================================

1 0

[nyx/master] Scroll to anchor
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 35e0c91a83d448ed1ea8fdbb676c6335c0a4e506 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 27 21:24:58 2017 -0700 Scroll to anchor By dynamically swapping taps we didn't necessarily scroll to the anchor afterward. --- web/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/web/index.html b/web/index.html index 55b3263..646d7d2 100644 --- a/web/index.html +++ b/web/index.html @@ -197,6 +197,7 @@ $(".panes").children().each(function () { if ($(this).find(anchor).length) { $(".tabs").data("tabs").click(this.id); + document.getElementById(anchor.substr(1)).scrollIntoView(); } }); }

1 0

[nyx/master] Show full shadowgirl picture
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit 2c20f58eac2c1bfc875730fe628670db807db96b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 28 10:58:36 2017 -0700 Show full shadowgirl picture Expanding our answer's min-height so the image is shown. Clearly a hack but it works. --- web/index.html | 3 +-- web/styles.css | 17 +++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/web/index.html b/web/index.html index 2116b00..bae6170 100644 --- a/web/index.html +++ b/web/index.html @@ -106,8 +106,7 @@ <span>Why is it called Nyx?</span> <div class="answer"> <a href="http://fallenlights.net/"><img src="images/faq/shadowgirl.jpg" alt="greek goddess" title="Nyx by Shadowgirl, used with permission." /></a> - <p>Simple - because it's short and memorable. Terminal applications are handiest when they're easy to remember and type, such as top, ssh, etc. Anything longer is just begging to be aliased down.</p> - <p>That, and because Nyx is the <a href="https://en.wikipedia.org/wiki/Nyx">Greek goddess of night</a>.</p> + <p style="min-height: 340px">Simple - because the <a href="https://en.wikipedia.org/wiki/Nyx">Greek goddess of night</a> is short and memorable. Terminal applications are handiest when they're brief and easy to type. Top, ssh, scp - anything longer is just begging to be aliased down.</p> </div> </div> </div> diff --git a/web/styles.css b/web/styles.css index 98a76c1..ba7ddd5 100644 --- a/web/styles.css +++ b/web/styles.css @@ -167,18 +167,23 @@ FAQ Page font-weight: bold; } -.question img { - float: right; - margin-top: 20px; - margin-left: 20px; -} - .answer { height: 0px; overflow: hidden; padding: 0px; } +.answer img { + float: right; + margin-top: 0px; + margin-left: 20px; +} + +.answer p { + margin-bottom: 10px; + margin-top: 5px; +} + /*============================================================ Download Page ============================================================*/

1 0

[nyx/master] Revamp our FAQ content
by atagar＠torproject.org 05 Aug '17

05 Aug '17

commit dc7b0896cd2a23730c2f82c91ea022f054f7bf0b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 31 12:54:58 2017 -0700 Revamp our FAQ content Rewording most of our FAQ entries and adjusting their styling. Finally pretty happy with it! --- web/images/faq/acs_failure.png | Bin 161127 -> 151697 bytes web/index.html | 101 +++++++++++++++++++++-------------------- web/styles.css | 34 ++++++++++++-- 3 files changed, 84 insertions(+), 51 deletions(-) diff --git a/web/images/faq/acs_failure.png b/web/images/faq/acs_failure.png index cd44aa8..b540e66 100644 Binary files a/web/images/faq/acs_failure.png and b/web/images/faq/acs_failure.png differ diff --git a/web/index.html b/web/index.html index 2b68571..5ec9ea8 100644 --- a/web/index.html +++ b/web/index.html @@ -103,7 +103,7 @@ <li id="why_is_it_called_nyx"> <span>Why is it called Nyx?</span> <div class="answer"> - <a href="http://fallenlights.net/"><img src="images/faq/shadowgirl.jpg" alt="greek goddess" title="Nyx by Shadowgirl, used with permission." /></a> + <a class="nyx-img" href="http://fallenlights.net/"><img src="images/faq/shadowgirl.jpg" alt="greek goddess" title="Nyx by Shadowgirl, used with permission." /></a> <p style="min-height: 340px">Simple - because the <a href="https://en.wikipedia.org/wiki/Nyx">Greek goddess of night</a> is short and memorable. Terminal applications are handiest when they're brief and easy to type. Top, ssh, scp - anything longer is just begging to be aliased down.</p> </div> </li> @@ -111,7 +111,7 @@ <li id="does_nyx_have_any_dependencies"> <span>Does Nyx have any dependencies?</span> <div class="answer"> - <p><b>Yes</b>, Nyx requires <a href="https://stem.torproject.org/>">Stem 1.4.5 or later</a>. + <p><b>Yes</b>, Nyx requires <a href="https://stem.torproject.org/">Stem 1.5.4 or later</a>. </div> </li> @@ -125,9 +125,9 @@ <li id="are_there_any_other_tor_uis"> <span>Are there any other user interfaces for Tor?</span> <div class="answer"> - <img src="images/faq/vidalia.jpg" alt="vidalia" /> - <p>Yes, though sadly this isn't a space that gets much attention.</p> - <p>For years <a href="https://en.wikipedia.org/wiki/Vidalia_%28software%29">Vidalia</a> was the default interface of Tor until it was replaced in 2013 by <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>. Vidalia includes a launcher, settings editor, map, and more. <a href="https://sourceforge.net/projects/tork/">TorK</a> is similar, providing connection information as well but never reached the same level of prominence. Both interfaces are now unmaintained.</p> + <p>Yes, though sadly this space doesn't get much attention.</p> + <p>For years <a href="https://en.wikipedia.org/wiki/Vidalia_%28software%29">Vidalia</a> was the default interface of Tor until it was replaced by <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a> in 2013. Vidalia includes a launcher, settings editor, map, and more. <a href="https://sourceforge.net/projects/tork/">TorK</a> is similar, providing connection information as well but never reached the same level of prominence. Both interfaces are now unmaintained.</p> + <img class="vidalia-img" src="images/faq/vidalia.jpg" alt="vidalia" /> <p>Smaller widgets include...</p> <ul> @@ -151,36 +151,36 @@ </li> </ul> - <div class="section"></div> + <div class="faq-section" style="padding-top: 35px;"></div> <a href="#usage" class="section-title">Usage</a> <br /><br /> <ul class="questions"> - <li id="will_exits_include_user_traffic"> - <span>When running an exit will I see people's traffic?</span> + <li id="will_i_see_other_peoples_traffic"> + <span>Will I see other people's traffic?</span> <div class="answer"> - <p><b>No</b>. Potential client and exit connections are scrubbed of sensitive information. Be aware that it's highly discouraged (and possibly illegal) for relay operators to view this data, so please don't.</p> + <p><b>No</b>. Potential client and exit connections are scrubbed of sensitive information. Be aware that it's highly discouraged (and likely illegal) for relay operators to view this data, so please don't.</p> </div> </li> - <li id="is_it_harmful_to_share_data"> - <span>Is it harmful to share the information provided by Nyx?</span> + <li id="is_it_harmful_to_share_information_i_see"> + <span>Is it harmful to share information I see?</span> <div class="answer"> <p><b>Not really</b>, but show some moderation. Screenshots of Nyx are unlikely to do any harm but try to avoid exposing data en mass.</p> </div> </li> - <li id="can_nyx_leak_data"> - <span>Is there any chance that nyx will leak data?</span> + <li id="can_running_nyx_leak_data"> + <span>Can running Nyx leak data?</span> <div class="answer"> - <p><b>No</b>. Nyx is a completely passive listener, fetching all information from either Tor or the local system.</p> + <p><b>No</b>. As a passive listener Nyx retrieves everything it needs from your local system. Nothing goes over the network.</p> </div> </li> - <li id="why_dont_i_see_the_bandwith_graph"> - <span>Why don't I see the bandwidth graph?</span> + <li id="why_cant_i_see_the_bandwith_graph"> + <span>Why can't I see the bandwidth graph?</span> <div class="answer"> - <p>On some terminals such as Gentoo screen sessions appear to have a bug where highlighted spaces aren't shown. Try running...</p> + <p>Some terminals, such as screen sessions on Gentoo, apparently have a bug where highlighted space characters are not shown. Try running...</p> <pre>export TERM="rxvt-unicode"</pre> </div> </li> @@ -188,20 +188,19 @@ <li id="why_are_borders_broken"> <span>Why are there borders like 'mwqqqqqqqqj'?</span> <div class="answer"> - <p>If you're getting something that looks like...</p> - <a href="images/screenshots/acs_failure.png"><img src="images/faq/acs_failure.png" alt="acs display failure" /></a> - <p>... you are encountering a terminal bug where alternate character support (ACS) <a href="http://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing">is unavailable</a>.</p> - <p>Unfortunately there doesn't seem to be a way for Nyx to automatically detect or correct this. To work around this you can set the following in your nyxrc to not use ACS borders...</p> + <a class="acs-img" href="images/screenshots/acs_failure.png"><img src="images/faq/acs_failure.png" alt="acs display failure" /></a> + <p>When alternate character support (ACS) <a href="http://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing">is unavailable</a> borders become characters like the picture above. This is a terminal bug.</p> + <p>Unfortunately there doesn't seem to be a way for Nyx to automatically detect this. However, when it happens this <b>can</b> be easily corrected. Simply run <i>reset</i>. To tell Nyx not to use ACS borders simply add the following to your nyxrc...</p> <pre>features.acsSupport false</pre> </div> </li> <li id="why_are_relay_details_missing"> - <span>Why are relay details for connections missing?</span> + <span>Why are connections missing relay details?</span> <div class="answer"> - <p>Relays publish information about themselves in documents called <i>descriptors</i>. These documents are downloaded by Tor. New documents available on an hourly basis but Tor will only download them if it needs them, so the descriptors you have may be older.</p> - <p>Nyx's connections page use these descriptors to enrich connection information with data about the relay you're connected with. If Tor doesn't have this information the data may be stale or missing.</p> - <p><b>This is fine.</b> Descriptor information we use changes infrequently so even if they're a few hours old it won't matter. However, if you really need up-to-date information you can add the following to your torrc...</p> + <p>Nyx presents your <a href="images/features/connections.png">active connections</a> correlated with tor consensus data. This means that in addition to the IP/port we also provide Tor-specific information such as your connection's relay fingerprint, nickname, contact address, and much more.</p> + <p>However, sometimes this extra information is missing <b>and that's fine</b>. Relays publish information about themselves on an hourly basis in documents called <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html#what-i…">descriptors</a>. Tor downloads only the descriptors it needs to run, so Tor may not have information about all the relays you're connecting to. And that's ok.</p> + <p>However, if you need up-to-date information you can add the following to your torrc...</p> <pre># download new descriptors even if our cache is still valid @@ -212,7 +211,7 @@ FetchUselessDescriptors 1</pre> </li> </ul> - <div class="section"></div> + <div class="faq-section"></div> <a href="#development" class="section-title">Development</a> <br /><br /> @@ -220,29 +219,36 @@ FetchUselessDescriptors 1</pre> <li id="how_do_i_get_started"> <span>How do I get started?</span> <div class="answer"> - <p>The best way of getting involved with any project is to jump right in! Our <a href="http://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">bug tracker</a> lists several development tasks. In particular look for the 'easy' keyword when getting started. If you have any questions then I'm always more than happy to help! I'm <b>atagar</b> on <a href="http://www.oftc.net/">oftc</a> and also available <a href="https://www.atagar.com/contact/">via email</a>.</p> - <p>To start hacking on Nyx please do the following and don't hesitate to let me know if you get stuck or would like to discuss anything!</p> + <p>The best way of getting involved with any project is to jump right in! In particular look for the <i>easy</i> keyword on our <a href="http://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">bug tracker</a> for a handy spot to start.</p> + <p>Got questions? I'm <b>atagar</b> on <a href="http://www.oftc.net/">oftc</a> and available <a href="https://www.atagar.com/contact/">via email</a>. To get started...</p> + + <ol> + <li>Clone our <a href="http://git-scm.com/">git</a> repository...<pre>git clone https://git.torproject.org/nyx.git</pre><br /></li> + <li>Install our test dependencies<pre>sudo pip install mock pyflakes pycodestyle</pre><br /></li> + <li>Install the development version of <a href="https://stem.torproject.org/">Stem</a>...<pre>git clone https://git.torproject.org/stem.git +cd stem +sudo python setup.py install</pre><br /></li> + <li>Find a <a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">bug or feature</a> that sounds fun and dig in!</li> + </ol> + </div> + </li> + <li id="how_do_i_file_a_pull_request"> + <span>How do I file a pull request?</span> + <div class="answer"> + <p>Got something to send my way? It's easy...</p> <ol> - <li>Clone our <a href="http://git-scm.com/">git</a> repository: <b>git clone https://git.torproject.org/nyx.git</b></li> - <li>Install the development version of <a href="https://stem.torproject.org/">Stem</a>: <b>git clone https://git.torproject.org/stem.git; cd stem; sudo python setup.py install</b>.</li> - <li>Get our test dependencies: <b>sudo pip install mock pep8 pyflakes</b>.</li> - <li>Find a <a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">bug or feature</a> that sounds interesting.</li> - <li>When you have something that you would like to contribute back do the following... + <li>Make a publicly accessible repository for me to pull from. If you don't already have one <a href="https://github.com/">GitHub</a> is great for this.<br /><br /></li> + <li>File a <a href="https://trac.torproject.org/projects/tor/newticket">trac ticket</a>. Only fields you'll need are...<br /><br /> <ul> - <li>If you don't already have a publicly accessible Nyx repository then set one up. <a href="https://github.com/">GitHub</a> in particular is great for this.</li> - <li>File a <a href="https://trac.torproject.org/projects/tor/newticket">trac ticket</a>, the only fields you'll need are... - <ul> - <li><b>Summary</b>: short description of your change</li> - <li><b>Description</b>: longer description and a link to your repository with either the git commits or branch that has your change</li> - <li><b>Type</b>: 'defect' if this is a bug fix and 'enhancement' otherwise</li> - <li><b>Priority</b>: rough guess at the priority of your change</li> - <li><b>Component</b>: Core Tor / Nyx</li> - </ul> - </li> - <li>I'll review the change and give suggestions. When we're both happy with it I'll push your change to the official repository.</li> + <li><b>Summary</b>: brief description of your change</li> + <li><b>Description</b>: description of your change and a link to your repository for me to pull from</li> + <li><b>Type</b>: 'defect' if this is a bug fix and 'enhancement' otherwise</li> + <li><b>Component</b>: Core Tor → Nyx</li> </ul> + <br /> </li> + <li>I'll review your change and give suggestions. When we're both happy with it I'll push your change to the official repository.</li> </ol> </div> </li> @@ -250,9 +256,8 @@ FetchUselessDescriptors 1</pre> <li id="how_do_i_run_the_tests"> <span>How do I run the tests?</span> <div class="answer"> - <p>Nyx has unit tests, including tests that exercise our curses functionality. When you run the tests you may notice your console flicker as these are exercised.</p> - <p>If you have them installed we run <a href="https://launchpad.net/pyflakes">pyflakes</a> to do static error checking and <a href="http://pycodestyle.readthedocs.org/en/latest/">pycodestyle</a> for style checking as part of our tests.</p> - <p>Tests are run with...</p> + <p>Nyx has unit tests that exercise our curses functionality. When you run the tests you'll probably notice your console flicker as these tests are exercised. This is normal. Testing also runs <a href="https://launchpad.net/pyflakes">pyflakes</a> and <a href="http://pycodestyle.readthedocs.org/en/latest/">pycodestyle</a> in the background.<p> + <p>Running our tests is simple...</p> <pre>% run_tests.py</pre> </div> </li> @@ -372,7 +377,7 @@ FetchUselessDescriptors 1</pre> var newHeight = 0; answer.children().each(function () { - if (this.tagName == "P") { + if (["nyx-img", "vidalia-img"].indexOf(this.className) == -1) { newHeight += $(this).outerHeight(true); } }); diff --git a/web/styles.css b/web/styles.css index fb839ca..88aac94 100644 --- a/web/styles.css +++ b/web/styles.css @@ -154,9 +154,16 @@ Front Page FAQ Page ============================================================*/ +.faq-section { + border-bottom: 1px solid #856231; + margin-bottom: -16px; + padding-top: 30px; +} + .questions { margin: 0px; padding-left: 15px; + padding-bottom: 0px; } .questions li { @@ -179,15 +186,36 @@ FAQ Page padding: 0px; } -.answer img { +.answer p { + margin-bottom: 10px; + margin-top: 5px; +} + +.answer pre { + margin-bottom: 0px; + padding-bottom: 0px; +} + +.answer ol { + margin-top: 20px; +} + +.nyx-img { float: right; margin-top: 5px; margin-left: 20px; } -.answer p { +.vidalia-img { + float: right; + margin-top: -15px; + margin-left: 20px; +} + +.acs-img { + display: block; /* needed so expanding uses the content's height */ margin-bottom: 10px; - margin-top: 5px; + margin-top: 10px; } /*============================================================

1 0