Skip to content

Commit 04f0c9c

Browse files
committed
📝 Update Discord links, widget
1 parent 0237499 commit 04f0c9c

File tree

8 files changed

+19
-9
lines changed

8 files changed

+19
-9
lines changed

_basics/install_platformio_vscode.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Visit the [Setting up Visual Studio Code](//code.visualstudio.com/docs/setup/set
1919

2020
You can download the latest Marlin source code from the [Downloads](/meta/download/) page. Older versions and detailed Release Notes can be downloaded from the [Marlin Releases](//github.com/MarlinFirmware/Marlin/releases) page on GitHub.
2121

22-
The 'latest' version might not always be the 'greatest' version for your setup. Be sure to ask around in our [Discord community](//discord.gg/n5NJ59y) if you need assistance with any version of Marlin Firmware.
22+
The 'latest' version might not always be the 'greatest' version for your setup. Be sure to ask around in our [Discord community](//discord.gg/marlin-firmware-461605380783472640) if you need assistance with any version of Marlin Firmware.
2323

2424
### 3. Install PlatformIO IDE
2525

_basics/reporting_bugs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ In addition to following the guidelines above, we ask that you follow a thorough
7070
- [Issue Queue](//github.com/MarlinFirmware/Marlin/issues)
7171
- [Post a New Issue](//github.com/MarlinFirmware/Marlin/issues/new?labels=Bug%3A+Potential+%3F&template=bug_report.yml&title=%5BBUG%5D+%28bug+summary%29)
7272
- [Bug Fix branch](//github.com/MarlinFirmware/Marlin/tree/bugfix-2.1.x)
73-
- [MarlinFirmware on Discord](//discord.gg/n5NJ59y) - Realtime chat with users and developers
73+
- [MarlinFirmware on Discord](//discord.gg/marlin-firmware-461605380783472640) - Realtime chat with users and developers
7474
- [Marlin Firmware](//www.facebook.com/groups/1049718498464482/) and [Marlin Firmware for 3D Printers](//www.facebook.com/groups/3Dtechtalk/) Facebook Groups
7575
- [Marlin Forum](//forums.reprap.org/list.php?415) at RepRap.org
7676
- [Marlin YouTube Videos](//youtube.com/results?search_query=marlin+firmware)

_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ social:
2424
- https://fosstodon.org/@marlinfirmware
2525
- https://www.facebook.com/groups/1049718498464482/
2626
- http://forums.reprap.org/list.php?415
27-
- https://discord.gg/n5NJ59y
27+
- https://discord.gg/marlin-firmware-461605380783472640
2828

2929
repository:
3030
main: 'https://github.com/MarlinFirmware/Marlin'

_configuration/config-ini.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Marlin configurations include `#if` blocks to group dependent options, although
1818

1919
It can be tricky to migrate from older versions of Marlin as settings change. Marlin checks for old settings and tells you what to change during the build, but the final result is never fully up to date. Wouldn't it be nice if Marlin would automatically migrate old settings to a new configuration for you?
2020

21-
We're currently working on tools to improve the situation, with the goal to build a schema and a database of configurations across all Marlin versions so we can generate complete configuration headers, perform migrations, and even generate searchable documentation for this website. That is a big project unto itself, so feel free to [get involved on Discord](https://discord.gg/n5NJ59y)!
21+
We're currently working on tools to improve the situation, with the goal to build a schema and a database of configurations across all Marlin versions so we can generate complete configuration headers, perform migrations, and even generate searchable documentation for this website. That is a big project unto itself, so feel free to [get involved on Discord](https://discord.gg/marlin-firmware-461605380783472640)!
2222

2323
## Meta Configuration
2424

_development/contributing.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The core Marlin team consists of a few maintainers who review contributions, dis
1515
## Ways to contribute
1616

1717
### Donate
18-
The current maintainer of Marlin is [Scott Lahteine](//www.thinkyhead.com/donate-to-marlin) aka [@thinkyhead](https://github.com/thinkyhead/). Scott has been writing software since 1977 mostly focusing on shareware and open source. He reviews every contribution before it goes into Marlin, maintains documentation, hosts the [Facebook](https://www.facebook.com/groups/marlinfirmware) and [Marlin Discord](https://discord.gg/n5NJ59y), and maintains a test lab in Austin, TX.
18+
The current maintainer of Marlin is [Scott Lahteine](//www.thinkyhead.com/donate-to-marlin) aka [@thinkyhead](https://github.com/thinkyhead/). Scott has been writing software since 1977 mostly focusing on shareware and open source. He reviews every contribution before it goes into Marlin, maintains documentation, hosts the [Facebook](https://www.facebook.com/groups/marlinfirmware) and [Marlin Discord](https://discord.gg/marlin-firmware-461605380783472640), and maintains a test lab in Austin, TX.
1919

2020
Your sponsorship accelerates development, testing, and advancement of the most ambitious open source multi-platform 3D printing firmware in the world. Several support options are available:
2121

@@ -46,11 +46,11 @@ Are you skilled in information design? This website is far from complete, and it
4646
4747
### Join the Community
4848
49-
<iframe id="discord-frame" src="https://discordapp.com/widget?id=461605380783472640&theme=light" width="350" height="350" allowtransparency="true" frameborder="0"></iframe>
49+
<iframe id="discord-frame" src="https://discord.com/widget?id=461605380783472640" width="350" height="500" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>
5050
5151
There are now many community resources for users of Marlin. If you're looking for help installing or troubleshooting these are the best places to go.
5252
53-
- [MarlinFirmware on Discord](//discord.gg/n5NJ59y) - Realtime chat with users and developers
53+
- [MarlinFirmware on Discord](//discord.gg/marlin-firmware-461605380783472640) - Realtime chat with users and developers
5454
- [Marlin Firmware](//www.facebook.com/groups/1049718498464482/) and [Marlin Firmware for 3D Printers](//www.facebook.com/groups/3Dtechtalk/) Facebook Groups
5555
- [Marlin Forum](//forums.reprap.org/list.php?415) at RepRap.org
5656
- [Marlin YouTube Videos](//youtube.com/results?search_query=marlin+firmware)

_meta/releases.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
- The `2.1.x` branch will be copied to `lts-2.1.3` and branch `2.1.x` will go dormant.
3434

3535
The release process will work like this:
36-
- Ahead of each release we'll make a snapshot of `dev` as a pre-release intended only for testers and announce it on [Discord](//discord.gg/n5NJ59y).
36+
- Ahead of each release we'll make a snapshot of `dev` as a pre-release intended only for testers and announce it on [Discord](//discord.gg/marlin-firmware-461605380783472640).
3737
- During the testing period all development within `dev` will take the lead from the pre-release branch, so nothing will go into `dev` that isn't also going into the pending release. New features and other non-bug-fixing PRs will be held during this period.
3838
- Once the pre-release is certified by testers (or at least hasn't exploded dramatically) it will be tagged and released to the world.
3939
- Releases may be followed up with "fixup" patches within the first week after a release. Volunteer testers catch a lot of bugs, but they don't always catch 'em all!

assets/javascript/custom.js

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Marlin custom Javascript
33
//
44

5+
var discord_widget_url = 'https://discord.com/widget?id=461605380783472640';
6+
57
// Cookie Helpers
68

79
function setCookie(cname, cvalue, exdays) {
@@ -32,6 +34,7 @@ function setDarkMode(dark) {
3234
$('#daynite')
3335
.attr('src', q + 'btn-' + (dark ? 'day' : 'night') + '.svg')
3436
.css('visibility', 'visible');
37+
$('#discord-frame').attr('src', `${discord_widget_url}&theme=` + (dark ? 'dark' : 'light'));
3538
}
3639

3740
function toggleDarkMode() {
@@ -40,6 +43,12 @@ function toggleDarkMode() {
4043
return dark;
4144
}
4245

46+
// If a Discord widget exists store its URL (for dark/light theming)
47+
48+
discord_widget_url = $('#discord-frame').attr('src');
49+
50+
// Set dark / light theme as soon as possible
51+
4352
var nightMode = getCookie('nightMode');
4453
if (nightMode === '') {
4554
var d = new Date(), h = d.getHours();
@@ -157,6 +166,7 @@ $(function() {
157166

158167
$(window).resize(shiftSubMenu, resizeImage);
159168

169+
// Toggle dark / light theme on click
160170
$('#daynite').click(function(){
161171
const dark = toggleDarkMode();
162172
setCookie('nightMode', dark);

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ <h2 id="tagline">Open Source 3D Printer Driver</h2>
9696
<div class="panel-body">Contribute to our ever expanding open source Marlin project on GitHub!</div>
9797
</div>
9898
</a>
99-
<a class="col-sm-4 animation-element slide-up panel-wrapper" href="//discord.gg/n5NJ59y">
99+
<a class="col-sm-4 animation-element slide-up panel-wrapper" href="//discord.gg/marlin-firmware-461605380783472640">
100100
<div class="panel">
101101
<div class="panel-heading panel-discord"><h4><em class="fa-brands fa-discord" aria-hidden="true"></em> Join Our Discord</h4></div>
102102
<div class="panel-body">Get help, chat, and share with other Marlin users on our Discord channel.</div>

0 commit comments

Comments
 (0)