commit 0e32e5c9a9b2e705b1f3a650767283f2f564f06b Author: Damian Johnson atagar@torproject.org Date: Wed Oct 25 10:41:56 2017 -0700
Nicer looking contact page
Replacing the textual listing with images to give the page a friendlier, more approachable feel. --- web/changelog/index.html | 2 +- web/images/bugtracker.png | Bin 0 -> 12291 bytes web/images/email.png | Bin 0 -> 7086 bytes web/images/irc.png | Bin 0 -> 16700 bytes web/images/irc.xcf | Bin 0 -> 54118 bytes web/images/source.txt | 14 ++++++++++++++ web/index.html | 33 ++++++++++++++------------------- web/styles.css | 32 ++++++++++++++++++++++++++++++++ 8 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/web/changelog/index.html b/web/changelog/index.html index 6389cee..174aaa7 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -95,7 +95,7 @@
<li><span class="component">Logging</span> <ul> - <li>Reduced log deduplication from an O(n^2) operation to constant time</li> + <li>Reduced log deduplication from an O(n<sup>2</sup>) operation to constant time</li> </ul> </li>
diff --git a/web/images/bugtracker.png b/web/images/bugtracker.png new file mode 100644 index 0000000..579025f Binary files /dev/null and b/web/images/bugtracker.png differ diff --git a/web/images/email.png b/web/images/email.png new file mode 100644 index 0000000..53a9032 Binary files /dev/null and b/web/images/email.png differ diff --git a/web/images/irc.png b/web/images/irc.png new file mode 100644 index 0000000..134bc3c Binary files /dev/null and b/web/images/irc.png differ diff --git a/web/images/irc.xcf b/web/images/irc.xcf new file mode 100644 index 0000000..4ec2f67 Binary files /dev/null and b/web/images/irc.xcf differ diff --git a/web/images/source.txt b/web/images/source.txt new file mode 100644 index 0000000..ad76dd4 --- /dev/null +++ b/web/images/source.txt @@ -0,0 +1,14 @@ +Images in this folder originate from the following... + +* bugtracker + Source: Nuvola + License: LGPL v2 + +* email + Source: https://commons.wikimedia.org/wiki/File:Email_Silk.svg + License: CC v2.5 (A) + +* irc + Source: https://commons.wikimedia.org/wiki/File:Linecons_speech-bubble.svg + Licence: CC v3 (A) + diff --git a/web/index.html b/web/index.html index 5d35a1a..3f2fafd 100644 --- a/web/index.html +++ b/web/index.html @@ -753,27 +753,22 @@ logged_events BW, NOTICE, WARN, ERR <div class="section"></div> <a href="#contact" class="section-title">Contact</a>
- <p>Issues? Feedback? Tor has a few support forums for relay operators...</p> - - <br> - - <ul> - <li><h2><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">Email</a></h2> - <p><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays@</a> is a list of relay operators for relay operators. System administration question? Tips for handling an abuse complaint? Then this is the place for you.</p><br> - </li> - - <li><h2><a href="https://www.torproject.org/about/contact.html.en#irc">IRC</a></h2> - <p>Need real-time help? Give OFTC's <a href="https://www.torproject.org/about/contact.html.en#irc">#tor channel</a> a try.</p><br> - </li> + <table id="contact"> + <tr> + <td id="email-contact"><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays"><img src="images/email.png" alt="irc"></a></td> + <td class="contact-description">Relay tips? System administration question? <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays@</a> is a list of relay operators for relay operators. You can also contact <a href="https://www.atagar.com/contact/">Nyx's author</a>.</td> + </tr>
- <li><h2><a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">Bug Tracker</a></h2> - <p>Nyx glitch? Stacktrace? To report technical problems drop us a line on our <a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">bug tracker</a>.</p><br> - </li> + <tr> + <td id="irc-contact"><a href="https://www.torproject.org/about/contact.html.en#irc"><img src="images/irc.png" alt="irc"></a></td> + <td class="contact-description">Want real-time help? Give OFTC's <a href="https://www.torproject.org/about/contact.html.en#irc">#tor channel</a> a try.</td> + </tr>
- <li><h2><a href="https://www.atagar.com/contact/">Author</a></h2> - <p>Got general feedback or a feature idea you'd like to float? <a href="https://www.atagar.com/contact/">Let me know!</a></p><br> - </li> - </ul> + <tr> + <td id="bugtracker-contact"><a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs"><img src="images/bugtracker.png" alt="bugtracker"></a></td> + <td class="contact-description">Running into a bug? To report technical problems drop us a line on our <a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">bug tracker</a>.</td> + </tr> + </table> </div>
<script type="text/javascript"> diff --git a/web/styles.css b/web/styles.css index 3311217..81bca90 100644 --- a/web/styles.css +++ b/web/styles.css @@ -354,6 +354,38 @@ Configuration Page }
/*============================================================ +Contact Page +============================================================*/ + +#contact { + margin-top: 15px; +} + +#contact table, tr, td { + border: none; + margin-bottom: 0px; + padding: 15px; + text-align: left; + vertical-align: top; +} + +.contact-description { + padding-top: 20px; +} + +#email-contact { + padding-bottom: 25px; +} + +#irc-contact { + padding-bottom: 10px; +} + +#bugtracker-contact { + padding-bottom: 0px; +} + +/*============================================================ Change Log Page ============================================================*/