Skip to content

Commit 6f510f2

Browse files
meldradwfreed
authored andcommitted
Website redesign, add dark mode, upgrade bootstrap, fix site data
1 parent b7b2445 commit 6f510f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+19871
-8558
lines changed

ElectionResults.md

+5-25
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,8 @@ title: ElectionResults
55

66
# Election Results #
77

8-
* [2002](/ElectionResults/2002)
9-
* [2003-04](/ElectionResults/2003-04)
10-
* [2003-10](/ElectionResults/2003-10)
11-
* [2004](/ElectionResults/2004)
12-
* [2005](/ElectionResults/2005)
13-
* [2006](/ElectionResults/2006)
14-
* [2007](/ElectionResults/2007)
15-
* [2008](/ElectionResults/2008)
16-
* [2009](/ElectionResults/2009)
17-
* [2010](/ElectionResults/2010)
18-
* [2011](/ElectionResults/2011)
19-
* [2012](/ElectionResults/2012)
20-
* [2013](/ElectionResults/2013)
21-
* [2014](/ElectionResults/2014)
22-
* [2015](/ElectionResults/2015)
23-
* [2016](/ElectionResults/2016)
24-
* [2017](/ElectionResults/2017)
25-
* [2018](/ElectionResults/2018)
26-
* [2019](/ElectionResults/2019)
27-
* [2020](/ElectionResults/2020)
28-
* [2021](/ElectionResults/2021)
29-
* [2022](/ElectionResults/2022)
30-
* [2023](/ElectionResults/2023)
31-
* [2024](/ElectionResults/2024)
32-
8+
{% for page in site.pages %}
9+
{% if page.path contains "ElectionResults/" -%}
10+
* [{{ page.title | remove: "Election Results" }}]({{ page.url }})
11+
{%- endif -%}
12+
{%- endfor %}

FAQ.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
layout: master
33
title: FAQ
44
---
5-
# Frequently Asked Questions #
5+
6+
# Frequently Asked Questions
7+
8+
## How do I contact staff?
9+
10+
{% include helplinks.html %}
11+
12+
## Other questions grouped by topic
613

714
* [General Questions](/FAQ/General_Questions) -- General questions about OFTC,
815
including its structure, its purposes, and its goals

FAQ/General_Questions.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
layout: master
33
title: FAQ/General_Questions
44
---
5-
* TOC
5+
6+
* toc
67
{:toc}
78

89
## What prompted OFTC's creation? ##
@@ -70,4 +71,5 @@ be provided about them on our project web site.
7071

7172
## What happened to Mibbit's access to OFTC? ##
7273

73-
Please refer to the [Mibbit document](/Mibbit) that we have prepared that outlines why access via Mibbit is no longer possible.
74+
Mibbit [announced that it would shut down](https://web.archive.org/web/20240801091256/https://mibbit.com/)
75+
in August 2024. OFTC had already [blocked Mibbit](/Mibbit) prior to this.

FAQ/IRC_Related_Questions.md

+12-7
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@
22
layout: master
33
title: FAQ/IRC_Related_Questions
44
---
5-
* This will be the TOC
5+
6+
* toc
67
{:toc}
78

89
## What IRC servers can I connect to? ##
910

10-
Please see the [OFTC](/), it lists the servers and ports you should use.
11+
The information provided on the [main page](/) should work fine under most
12+
circumstances.
13+
14+
It is possible to force IPv4 (irc4.oftc.net) or IPv6 (irc6.oftc.net) if your
15+
network does not handle this gracefully.
1116

1217
Do not connect to individual servers, always let the DNS rotation pick one for
13-
you. This employs GeoDNS to take you to a server nearby. It also allows us to do
14-
load-balancing on servers and take out servers that will go down for
18+
you. This employs GeoDNS to take you to a server nearby. It also allows us to
19+
do load-balancing on servers and take out servers that will go down for
1520
maintenance.
1621

1722
## What are "Services"? ##
@@ -40,12 +45,12 @@ services on connecting clients. Please just ignore connections from
4045
zombie-scan.oftc.net, the connects are harmless. (If you really don't like them,
4146
use a firewall.)
4247

43-
## Who are all these users with the host-mask nick.something.oftc.net? ##
48+
## Who are all these users with the host-mask nickname.something.oftc.net? ##
4449

45-
* `<nick>.<role>.oftc.net` is a [Staff](/staff) member, they have these masks
50+
* `<nickname>.<role>.oftc.net` is a [Staff](/staff) member, they have these masks
4651
to be easily identified as to what role they play. A complete explanation is
4752
available at [Staff](/staff)
48-
* `<nick>.user.oftc.net` is a user cloak. Please see
53+
* `<nickname>.user.oftc.net` is a user cloak. Please see
4954
[UserCloaks](/UserCloaks) for more information.
5055

5156
## How can I sponsor a server or join the project's staff? ##

Services.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
layout: master
33
title: Services
44
---
5-
The IRC services is a common name for our set of helper systems for managing
6-
your nicknames and channels. They can be used to provide you with access with
7-
certain privileges and protection.
85

96
* TOC
107
{:toc}
118

9+
# Services
10+
11+
The IRC services is a common name for our set of helper systems for managing
12+
your nicknames and channels. They can be used to provide you with access with
13+
certain privileges and protection.
14+
1215
## How to use Services ##
1316

1417
### Register your account ###

UserCloaks.md

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ layout: master
33
title: User Cloaks
44
---
55

6+
* TOC
7+
{:toc}
8+
69
## Cloaks
710

811
Cloaks are provided via services; for any cloak to take effect you must identify

_data/sponsors.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../sponsors.json

_data/staff.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../staff.json

_includes/footer.html

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<footer class="footer bg-secondary-subtle">
2+
<div class="container">
3+
<div class="row pt-5 pb-2">
4+
<div class="col-lg-3">
5+
<p class="lead" role="heading" aria-level="2">Need network support?</p>
6+
{% include helplinks.html %}
7+
<p class="d-none d-lg-block d-xl-block">
8+
<a href="#back-to-top" title="Jump back to top" aria-label="Jump back to top of page">
9+
<i role="presentation" class='bi bi-arrow-up-circle pe-3 ps-3' title="Up arrow in circle" aria-label="Jump back to top of page"></i>Back to top</a></p>
10+
</div>
11+
<div class="col-lg-4">
12+
<p class="lead" role="heading" aria-level="2">Review our code:</p>
13+
<p>
14+
<a href="https://github.com/oftc" title="OFTC organization on github">
15+
<i role="presentation" class='bi bi-github pe-3 ps-3' title="Github logo"></i>OFTC on Github
16+
</a>
17+
</p>
18+
<p class="lead" role="heading" aria-level="2">Other issues?</p>
19+
<p>
20+
<a href="https://github.com/oftc/oftc/issues" title="OFTC issue tracker on github">
21+
<i role="presentation" class='bi bi-github pe-3 ps-3' title="Github logo"></i>Public issue tracker
22+
</a>
23+
</p>
24+
</div>
25+
<div class="col-lg-5">
26+
<p class="d-none d-lg-block d-xl-block"><a href="/feed.xml"><i role="presentation" class="bi bi-rss pe-3" title="RSS icon"></i>Atom/RSS news feed</a></p>
27+
<p>Founded in 2001 by members of the Open Source and Free Software communities, OFTC aims to provide those communities with better communication, development, and support infrastructure.</p>
28+
<p>OFTC is a member of
29+
<svg role="presentation" height="20px" width="40px" >
30+
<image xlink:href="https://www.spi-inc.org/logo.svg" width="40px">
31+
</svg>
32+
<a href="http://www.spi-inc.org/" aria-label="Visit the SPI website">Software in the Public Interest</a>.<br>Contributions to SPI keep OFTC running.</p>
33+
<p class="d-block d-lg-none d-xl-none"><a href="/feed.xml"><i role="presentation" class="bi bi-rss ps-3 pe-3" title="RSS icon"></i>Atom/RSS news feed</a></p>
34+
<p class="d-block d-lg-none d-xl-none"><a href="#back-to-top" title="Up arrow in circle"><i role="presentation" class='bi bi-arrow-up-circle pe-3 ps-3' aria-label="Back to top"></i>Back to top</a></p>
35+
</div>
36+
</div>
37+
</div>
38+
</footer>

_includes/helplinks.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<p class="helplink">
2+
<a href="https://webchat.oftc.net/?channels=oftc&nick=%23webvisitor&uio=d4" target="_blank" rel="noopener noreferrer">
3+
<i role="presentation" class='bi bi-chat-right-dots pe-3 ps-3' title="IRC support channel"></i>#oftc
4+
</a>
5+
</p>
6+
<p class="helplink">
7+
<a href="mailto:[email protected]?subject=Support%20enquiry:&body=I%20need%20help%20with%3A" target="_blank" rel="noopener noreferrer" title="Support email address">
8+
<i role="presentation" class='bi bi-envelope pe-3 ps-3' title="Email icon"></i>[email protected]
9+
</a>
10+
</p>

_includes/hero.html

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{% if page.url == "/" %}
2+
<div class="container bg-body-tertiary p-5 pb-4 rounded-bottom">
3+
<div class="row">
4+
<div class="col-lg-3 hero d-none d-xl-block">
5+
<div class="p-3 logo-xl">
6+
{% include logo.html %}
7+
<h1 class="pt-5">OFTC</h1>
8+
</div>
9+
</div>
10+
<div class="col-lg-3 hero d-none d-lg-block d-xl-none">
11+
<div class="p-3 logo-lg">
12+
{% include logo.html %}
13+
<h1 class="pt-4">OFTC</h1>
14+
</div>
15+
</div>
16+
<div class="col-lg-9">
17+
<p>The Open and Free Technology Community is a volunteer-run network that aims to provide stable and effective
18+
collaboration services to members of the community in any part of the world,
19+
while closely listening to their needs and desires.
20+
</p>
21+
<p>You can reach the OFTC IRC network by using a traditional <a href="https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients">IRC
22+
Client</a> of choice, or by the
23+
<a href="WebChat">WebChat</a> that we provide. The webchat enables you to connect to the
24+
network and chat directly from within your browser.
25+
</p>
26+
<div class="row mb-3">
27+
<div class="col-lg-12">
28+
<div class="bg-body-secondary p-4 pb-1 h-100 rounded-3 text-center">
29+
<p class="lead" role="heading" aria-level="2">Connect your client to <i role="presentation" class='bi bi-lock-fill' title="Connect with SSL/TLS"></i><a href="ircs://irc.oftc.net:6697" aria-label="Start an encrypted session with your IRC client"><code>ircs://irc.oftc.net:6697</code></a></p>
30+
</div>
31+
</div>
32+
</div>
33+
<div class="row mb-3">
34+
<div class="col-lg-6">
35+
<div class="bg-body-secondary p-4 pb-1 h-100 rounded-3">
36+
<p><i role="presentation" class='bi bi-lock-fill' title="Connect with SSL/TLS"></i>
37+
To connect securely, use ports 6697 or 9999.</p>
38+
<p>TLS/SSL is supported on all servers. Our server certificates are signed by <a href="https://letsencrypt.org/">Let’s Encrypt</a>. We also publish DNSSEC-signed TLSA records: <code>dig _6697._tcp.irc.oftc.net tlsa</code>.</p>
39+
40+
<p>Both IPv4 and IPv6 are available.</p>
41+
</div>
42+
</div>
43+
<div class="col-lg-6">
44+
<div class="bg-body-secondary p-4 pb-1 h-100 rounded-3">
45+
<p><i role="presentation" class='bi bi-incognito' title="Connect over Tor"></i>
46+
Use of <a href="/Tor">Tor</a> is permitted to the address above.</p>
47+
<p>You can also connect to the onion service: <a href="ircs://oftcnet6xg6roj6d7id4y4cu6dchysacqj2ldgea73qzdagufflqxrid.onion:6697" aria-label="Start a session over Tor with your IRC client">
48+
<code>ircs://oftcnet6xg6roj6d7id4y4cu6dchysacqj2ldgea73qzdagufflqxrid.onion:6697</code>
49+
</a></p>
50+
</div>
51+
</div>
52+
</div>
53+
<p><i role="presentation" class='bi bi-unlock-fill' title="Connect over plain text"></i>
54+
<strong>(Not recommended)</strong> To connect without TLS/SSL use ports 6668-6670 or 7000.</p>
55+
<p>IRC services (NickServ, ChanServ) are available for nick and channel registration. See <a href="NickServ/CertFP/">CertFP</a> for how to configure client certificate-based NickServ identification.</p>
56+
</div>
57+
</div>
58+
</div>
59+
{% endif %}

_includes/logo.html

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 135.398 135.398" role="presentation">
3+
<path d="M105.52 11.889c-11.592 0-21.04 9.445-21.04 21.037 0 11.59 9.448 21.037 21.04 21.037 4.64 0 8.894-1.562 12.378-4.121l17.022 17.154c-2.658 3.523-4.295 7.854-4.295 12.592 0 4.959 1.8 9.464 4.686 13.066l-17.1 16.938c-3.54-2.707-7.906-4.379-12.691-4.38-10.624 0-19.354 7.963-20.752 18.212H79.09c-1.399-10.249-10.129-18.211-20.752-18.211-11.591 0-21.037 9.446-21.037 21.037s9.446 21.037 21.037 21.037c10.979 0 19.93-8.503 20.855-19.248h5.47c.925 10.745 9.878 19.248 20.857 19.248 11.59 0 21.035-9.446 21.035-21.037 0-5.143-1.932-9.802-5.014-13.463l17.031-16.869a20.803 20.803 0 0 0 10.407 4.436v5.13c-10.317 1.337-18.354 10.094-18.354 20.766 0 11.591 9.446 21.037 21.037 21.037s21.037-9.446 21.037-21.037c0-10.93-8.43-19.849-19.107-20.842v-4.978c10.678-.993 19.107-9.911 19.107-20.842 0-11.591-9.446-21.037-21.037-21.037-5.19 0-9.89 1.965-13.564 5.097l-16.815-16.947c3.24-3.702 5.272-8.487 5.272-13.775 0-11.591-9.444-21.037-21.035-21.037zm0 4.613a16.388 16.388 0 0 1 16.421 16.424 16.387 16.387 0 0 1-16.421 16.422 16.388 16.388 0 0 1-16.424-16.422 16.39 16.39 0 0 1 16.424-16.424zm46.142 46.662a16.39 16.39 0 0 1 16.424 16.424 16.388 16.388 0 0 1-16.424 16.422 16.386 16.386 0 0 1-16.422-16.422 16.389 16.389 0 0 1 16.422-16.424zm-93.324 46.664A16.387 16.387 0 0 1 74.76 126.25a16.386 16.386 0 0 1-16.422 16.422 16.386 16.386 0 0 1-16.422-16.422 16.386 16.386 0 0 1 16.422-16.422zm47.182 0a16.387 16.387 0 0 1 16.421 16.422 16.386 16.386 0 0 1-16.421 16.422 16.388 16.388 0 0 1-16.424-16.422 16.388 16.388 0 0 1 16.424-16.422zm46.142 0a16.388 16.388 0 0 1 16.424 16.422 16.388 16.388 0 0 1-16.424 16.422 16.386 16.386 0 0 1-16.422-16.422 16.387 16.387 0 0 1 16.422-16.422z" color="" style="-inkscape-stroke:none" transform="translate(-37.3 -11.889)"/>
4+
<image src="/img/oftc-logo-grey.png" xlink:href=""></image>
5+
</svg>

_includes/navbar.html

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<nav class="navbar navbar-expand-lg navbar-secondary bg-body-secondary">
2+
<div class="container" id="back-to-top">
3+
4+
<div class="col smallhero">
5+
<a class="logo me-0 navbar-brand" href="/" aria-label="Back to Home">
6+
{% include logo.html %}<span class="herospan">OFTC</span>
7+
</a>
8+
</div>
9+
10+
<a class="p-1" id="skip-to-content" href="#jump-to-content" aria-label="Skip to content"><i role="presentation" class="bi bi-arrow-down-circle p-1"></i>Skip to content</a>
11+
12+
<button class="navbar-toggler" type="button" role="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
13+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
14+
<ul class="justify-content-lg-left col navbar-nav">
15+
{% if page.url == "/" %}
16+
<li class="nav-item"><a class="nav-link active" aria-current="page" href="#" aria-label="Back to Home">Home</a></li>
17+
{% else %}
18+
<li class="nav-item" ><a class="nav-link" href="/" aria-label="Back to Home">Home</a></li>
19+
{% endif %}
20+
{% if page.url == "/archive/" %}
21+
<li class="nav-item"><a class="nav-link active" aria-current="page" href="/archives/" aria-label="News archives">News</a></li>
22+
{% else %}
23+
<li class="nav-item"><a class="nav-link" href="/archives/" aria-label="News archives">News</a></li>
24+
{% endif %}
25+
{% if page.url == "/staff/" %}
26+
<li class="nav-item"><a class="nav-link active" aria-current="page" href="/staff/" aria-label="OFTC staff">Staff</a></li>
27+
{% else %}
28+
<li class="nav-item" ><a class="nav-link" href="/staff/" aria-label="OFTC staff">Staff</a></li>
29+
{% endif %}
30+
{% if page.url == "/documentation/" %}
31+
<li class="nav-item"><a class="nav-link active" aria-current="page" href="/documentation/" aria-label="Documentation">Documentation</a></li>
32+
{% else %}
33+
<li class="nav-item"><a class="nav-link" href="/documentation/" aria-label="Documentation">Documentation</a></li>
34+
{% endif %}
35+
{% if page.url == "/FAQ/" %}
36+
<li class="nav-item"><a class="nav-link active" aria-current="page" href="/FAQ/" aria-label="FAQ and help contacts">Help</a></li>
37+
{% else %}
38+
<li class="nav-item"><a class="nav-link" href="/FAQ/" aria-label="FAQ and help contacts">Help</a></li>
39+
{% endif %}
40+
</ul>
41+
<div class="dark-mode-toggler navbar-form form-check form-switch d-lg-flex col justify-content-lg-center">
42+
<i role="presentation" class='bi bi-sun light-mode-bi' title="Light mode"></i>
43+
<input class="form-check-input" type="checkbox" id="darkModeSwitch" checked aria-label="Toggle dark mode" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-title="Toggle dark mode" >
44+
<i role="presentation" class='bi bi-moon dark-mode-bi' title="Dark mode"></i>
45+
</div>
46+
<div class="col align-self-end">
47+
<form class="d-lg-flex justify-content-lg-end navbar-form" role="form" id="webchat" aria-label="Our webchat" action="//webchat.oftc.net" method="get" target="_blank">
48+
<input class="form-control me-2" name="channels" type="text" placeholder="Nickname" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-title="Enter your IRC nickname" aria-label="Enter your IRC nickname">
49+
<input class="form-control me-2" name="nick" type="text" placeholder="#oftc, #moocows" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-title="Enter comma seperated list of channels to join" aria-label="Enter comma seperated list of channels to join">
50+
<input type="hidden" name="uio" value="d4">
51+
<button class="btn btn-primary" type="submit" role="button" aria-label="Go to web the client (in a new tab)">Chat!</button>
52+
</form>
53+
</div>
54+
</div>
55+
</div>
56+
</nav>

0 commit comments

Comments
 (0)