Skip to content

Commit c218233

Browse files
authored
Merge pull request #143 from openscad/closedown-advent-2024
Closedown advent 2024
2 parents c03c13f + 7a84755 commit c218233

File tree

10 files changed

+49
-27
lines changed

10 files changed

+49
-27
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/nbproject
2+
/node_modules

advent-calendar-2019/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@
292292
<span class="sep">-</span>
293293
<a class="footer" href="https://openscad.org/advent-calendar-2023/">2023</a>
294294
<span class="sep">-</span>
295+
<a class="footer" href="https://openscad.org/advent-calendar-2024/">2024</a>
296+
<span class="sep">-</span>
295297
</div>
296298
</body>
297299
</html>

advent-calendar-2020/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@
337337
<span class="sep">-</span>
338338
<a class="link" href="https://openscad.org/advent-calendar-2023/">2023</a>
339339
<span class="sep">-</span>
340+
<a class="link" href="https://openscad.org/advent-calendar-2024/">2024</a>
341+
<span class="sep">-</span>
340342
</div>
341343
</body>
342344
</html>

advent-calendar-2021/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,8 @@
535535
<span class="sep">-</span>
536536
<a class="link" href="https://openscad.org/advent-calendar-2023/">2023</a>
537537
<span class="sep">-</span>
538+
<a class="link" href="https://openscad.org/advent-calendar-2024/">2024</a>
539+
<span class="sep">-</span>
538540
</div>
539541
<div id="modal" class="modal">
540542
<div class="modal-content">

advent-calendar-2022/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,8 @@
577577
<span class="sep">-</span>
578578
<a class="link" href="https://openscad.org/advent-calendar-2023/">2023</a>
579579
<span class="sep">-</span>
580+
<a class="link" href="https://openscad.org/advent-calendar-2024/">2024</a>
581+
<span class="sep">-</span>
580582
</div>
581583
<div id="modal" class="modal">
582584
<div class="modal-content">

advent-calendar-2023/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@
576576
<span class="sep">-</span>
577577
<a class="link" href="https://openscad.org/advent-calendar-2023/">2023</a>
578578
<span class="sep">-</span>
579+
<a class="link" href="https://openscad.org/advent-calendar-2024/">2024</a>
580+
<span class="sep">-</span>
579581
</div>
580582
<div id="modal" class="modal">
581583
<div class="modal-content">

advent-calendar-2024/index.html

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,18 @@
113113
feather.replace();
114114
new Snow('#snow', { number:20, r: 2.5, v: 1 });
115115
date = new Date();
116+
/*
116117
if (date.getUTCMonth() === 11) {
117118
for (day = 1;day <= date.getUTCDate();day++) {
118119
$(".day-" + day + " .content").removeClass("hide");
119120
$(".day-" + day + " .door").addClass("transform");
120121
}
121122
}
123+
*/
122124
for (day = 1;day <= 24;day++) {
125+
$(".day-" + day + " .content").removeClass("hide");
126+
$(".day-" + day + " .door").addClass("transform");
127+
$(".day-" + day + " input").prop("checked", true);
123128
div = document.getElementById("day-" + day);
124129
data = days.get("day" + day);
125130
if (data) {
@@ -560,8 +565,22 @@
560565
<span class="sep">||</span>
561566
All scripts are licensed <a class="link" href="https://creativecommons.org/publicdomain/zero/1.0/legalcode">CC0</a>
562567
<span class="sep">||</span>
563-
Doors open midnight UTC
568+
<a class="link" href="https://github.com/openscad/openscad-advent-calendar-2024/">Design repo on github</a>
564569
<span class="sep">||</span>
570+
<br>
571+
<span class="sep">-</span>
572+
<a class="link" href="https://openscad.org/advent-calendar-2019/">2019</a>
573+
<span class="sep">-</span>
574+
<a class="link" href="https://openscad.org/advent-calendar-2020/">2020</a>
575+
<span class="sep">-</span>
576+
<a class="link" href="https://openscad.org/advent-calendar-2021/">2021</a>
577+
<span class="sep">-</span>
578+
<a class="link" href="https://openscad.org/advent-calendar-2022/">2022</a>
579+
<span class="sep">-</span>
580+
<a class="link" href="https://openscad.org/advent-calendar-2023/">2023</a>
581+
<span class="sep">-</span>
582+
<a class="link" href="https://openscad.org/advent-calendar-2024/">2024</a>
583+
<span class="sep">-</span>
565584
</div>
566585
<div id="modal" class="modal">
567586
<div class="modal-content">

community.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ <h1>Community</h1>
7979
<section-head>
8080
<div class="link-grid">
8181
<div class="link-button">
82-
<h1><a href="https://web.libera.chat/?channel=#openscad">Chat</a></h1>
83-
<small>Chat with users and developers, show things you made, ask questions</small>
82+
<h1><a href="https://web.libera.chat/?channel=#openscad">Discussion</a></h1>
83+
<small>Talk with users and developers, show things you made, ask questions</small>
8484
</div>
8585
<div class="link-button">
8686
<h1><a href="https://lists.openscad.org/empathy/list/discuss.lists.openscad.org">Mailing list</a></h1>
@@ -134,16 +134,15 @@ <h1>Forum / Mailing List</h1>
134134
</section>
135135

136136
<section id="irc">
137-
<h1>Chat / IRC Channel</h1>
137+
<h1>Discussion / Talk to Humans / IRC Channel</h1>
138138
<ul>
139-
<li>Join via the libera.chat <a href="https://web.libera.chat/?channel=#openscad">web chat</a> (KiwiIRC)</li>
139+
<li>Join via the libera.chat <a href="https://web.libera.chat/?channel=#openscad">web gui</a> (KiwiIRC)</li>
140140
<li>Connect with an IRC client to <a href="irc:[email protected]" target="_blank">#openscad</a> on <a href="ircs://irc.libera.chat:6697">irc.libera.chat</a> +6697 (TLS)</li>
141-
<li style="text-decoration: line-through;">The chat room is also available via <a href="https://matrix.org/">Matrix</a> as <a href="https://matrix.to/#/#openscad:libera.chat">#openscad:libera.chat</a></li>
142141
<li>Additional documentation on how to connect can be found at <a href="https://libera.chat/guides">https://libera.chat/guides</a></li>
143142
</ul>
144143
<br/>
145144
<p>The Matrix room got disconnected due to issues with the bridge
146-
<a href="https://matrix.org/blog/2023/07/deportalling-libera-chat/">Deportalling from Libera Chat</a>.
145+
<a href="https://matrix.org/blog/2023/07/deportalling-libera-chat/">Deportalling from Libera.Chat</a>.
147146
Unfortunately there is no solution yet for reconnecting the existing room, a ticket with Matrix support
148147
is so far unanswered. If you can help fixing this issue, please reach out.</p>
149148
</section>

gallery.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>OpenSCAD - Gallery</title>
77

88
<link href="assets/css/style.css" rel="stylesheet">
9-
9+
1010
<link href="assets/fonts/open-sans/all.css" rel="stylesheet">
1111
<link href="assets/fontawesome/css/brands.min.css" rel="stylesheet">
1212
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
@@ -62,7 +62,7 @@ <h2 class="subtitle" style="position:relative; left:45px;">The Programmers Solid
6262
</header>
6363

6464
<div id="page-content">
65-
65+
6666
<div id="sidebar" class="sticky">
6767
<h1>Gallery</h1>
6868
<ul>
@@ -77,23 +77,24 @@ <h1>#SCADvent</h1>
7777
<li><a href="advent-calendar-2021/">2021 Advent Calendar</a></li>
7878
<li><a href="advent-calendar-2022/">2022 Advent Calendar</a></li>
7979
<li><a href="advent-calendar-2023/">2023 Advent Calendar</a></li>
80+
<li><a href="advent-calendar-2024/">2024 Advent Calendar</a></li>
8081
</ul>
8182
</div>
82-
83+
8384
<article>
84-
85+
8586
<section id="gallery" class="left">
8687
<h1>OpenSCAD Gallery</h1>
8788
</section>
88-
89+
8990
</article>
9091

9192
<div class="clear"></div>
9293

9394
</div><!--#page-content end-->
9495

9596
<footer>
96-
97+
9798
</footer>
9899
</div><!--#page-wrap end-->
99100

index.html

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<link href="assets/fontawesome/css/brands.min.css" rel="stylesheet">
1919
<link href="assets/fontawesome/css/fontawesome.min.css" rel="stylesheet">
2020

21-
<script src="advent-calendar-2024/snow.js"></script>
2221
<script src="assets/js/jquery-1.9.1.min.js"></script>
2322

2423
<!-- One-Page-Nav -->
@@ -35,11 +34,6 @@
3534
<script src="inc/win_release_links.js"></script>
3635
<script src="assets/js/home.js"></script>
3736
<script src="assets/js/header.js"></script>
38-
<script type="text/javascript">
39-
window.onload = function() {
40-
new Snow('#snow', { number:12, r: 2.5, v: 1 });
41-
}
42-
</script>
4337
<style>
4438
.header {
4539
background-color: #444;
@@ -112,21 +106,19 @@ <h1>Recent News</h1>
112106
</div>
113107

114108
<article>
115-
<div id="snow">
116-
<section-area id="ticker" class="snow">
109+
<section-area id="ticker">
117110
<div class="ticker-wrap">
118111
<div class="ticker-move ticker-animation">
119-
<div class="ticker-item"><div class="ticker-content"><big><a href="/advent-calendar-2024">OpenSCAD Advent Calendar 2024</a></big></div></div>
120-
<div class="ticker-item"><div class="ticker-content">OpenSCAD Chat: <a target="_blank" href="https://web.libera.chat/?channel=#openscad">#openscad</a> (on IRC network <a target="_blank" href="https://libera.chat/">libera.chat</a>)</div></div>
121-
<div class="ticker-item"><div class="ticker-content">OpenSCAD on <a href="https://fosstodon.org/@OpenSCAD">Mastodon</a></div></div>
122-
<div class="ticker-item"><div class="ticker-content"><a href="https://en.wikibooks.org/wiki/OpenSCAD_Tutorial">OpenSCAD Tutorial</a> on Wikibooks</div></div>
112+
<div class="ticker-item"><div class="ticker-content">OpenSCAD Discussion, talk with Humans: <a target="_blank" href="https://web.libera.chat/?channel=#openscad">#openscad</a> (on IRC network <a target="_blank" href="https://libera.chat/">libera.chat</a>)</div></div>
113+
<div class="ticker-item"><div class="ticker-content">OpenSCAD <a href="https://en.wikibooks.org/wiki/OpenSCAD_User_Manual">User Manual</a> and <a href="https://en.wikibooks.org/wiki/OpenSCAD_Tutorial">Tutorial</a> on Wikibooks</div></div>
114+
<div class="ticker-item"><div class="ticker-content">OpenSCAD on <a href="https://fosstodon.org/@OpenSCAD">Mastodon</a> and <a href="https://bsky.app/profile/openscad.bsky.social">Bluesky</a></div></div>
123115
<div class="ticker-item"><div class="ticker-content">Find OpenSCAD Designs on <a href="https://www.printables.com/search/models?q=tag:openscad">Printables</a> and <a href="https://www.thingiverse.com/tag:openscad">Thingiverse</a></div></div>
124116
<div class="ticker-item"><div class="ticker-content"><a href="https://openscad.org/documentation-books.html">OpenSCAD Books</a></div></div>
125-
<div class="ticker-item"><div class="ticker-content"><big><a href="/advent-calendar-2024">OpenSCAD Advent Calendar 2024</a></big></div></div>
117+
<div class="ticker-item"><div class="ticker-content">Prototype: OpenSCAD <a href="https://ochafik.com/openscad2/">Playground</a> directly in your WebBrowser</div></div>
118+
<div class="ticker-item"><div class="ticker-content">OpenSCAD Discussion, talk with Humans: <a target="_blank" href="https://web.libera.chat/?channel=#openscad">#openscad</a> (on IRC network <a target="_blank" href="https://libera.chat/">libera.chat</a>)</div></div>
126119
</div>
127120
</div>
128121
</section-area>
129-
</div>
130122

131123
<section>
132124
<h1><strong><span class="green">Open</span>SCAD</strong> is software for creating solid 3D CAD objects.</h1>

0 commit comments

Comments
 (0)