diff --git a/website/_data/anyat.yml b/website/_data/anyat.yml index 4153ec7..5aef554 100644 --- a/website/_data/anyat.yml +++ b/website/_data/anyat.yml @@ -17,6 +17,13 @@ settings: # you want to process. process_collections: true +# Default linker to use if no platform is specified. +# This allows @'s of the format [platform]@username[@domain], allowing +# implicit platform. +# For example, if default_platform was twitter, then @user would be +# equivalent to twitter@user. +#default_platform: email + # Linkers configuration # Each linker defines how to format and link a specific platform or service. # The badge will display an icon showing what the link is for. @@ -51,7 +58,7 @@ linkers: format_domain: "@^u@^d" link: "https://w.linuxposting.xyz/blog/^u" link_domain: "https://w.linuxposting.xyz/blog/@^u@^d" - fedi: mainwafrn # alias fedi to use wafrn + fedi: mainwafrn mainwafrn: # For less clunky main wafrn links badge: "w" format: "@^u" @@ -61,9 +68,14 @@ linkers: matrix: badge: "[M]" domain: "linuxposting.xyz" # default domain is local - format: "@^u" + # format: "@^u" format_domain: "@^u:^d" link_domain: "https://matrix.to/#/@^u:^d" + mroom: # matrix room + badge: "[M]" + domain: "linuxposting.xyz" + format_domain: "#^u:^d" + link_domain: "https://matrix.to/#/#^u:^d" mail: email email: badge: "\U000f01ee" # nf-md-email @@ -92,8 +104,4 @@ linkers: reddit: badge: "\U000f044d" # nf-md-reddit format: "u/^u" - link: "https://reddit.com/u/^u" - subreddit: - badge: "\U000f044d" # nf-md-reddit - format: "r/^u" - link: "https://reddit.com/r/^u" + link: "https://reddit.com/u/^u" \ No newline at end of file diff --git a/website/_data/nav.yml b/website/_data/nav.yml index 9298f7c..078d6d2 100644 --- a/website/_data/nav.yml +++ b/website/_data/nav.yml @@ -30,8 +30,11 @@ sub: url: /register/ idn: 'reg' - title: Contact Us - url: "#" + url: "/contact/" idn: 'msg' - - title: Theme Selection - url: "#" - idn: 'theme' \ No newline at end of file + # - title: Theme Selection + # url: "#" + # idn: 'theme' + - title: Get a prize + url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ" + target: _blank \ No newline at end of file diff --git a/website/_layouts/default.html b/website/_layouts/default.html index 66fc0f7..8c13583 100644 --- a/website/_layouts/default.html +++ b/website/_layouts/default.html @@ -32,23 +32,29 @@
- - Members + + Tumblr List + {% comment %} + This should be the list for accounts on linuxposting later + {% endcomment %} - - Wafrn + + Wafrn - - Mail + + Web Mail - + {% comment %} + + Forum + {% endcomment %}
diff --git a/website/_plugins/anyat.rb b/website/_plugins/anyat.rb index 027f8e1..5dd4c4c 100644 --- a/website/_plugins/anyat.rb +++ b/website/_plugins/anyat.rb @@ -48,27 +48,40 @@ module Jekyll # platform@username@domain # or platform@username with domain N/A or default domain # Example: twitter@user, email@john@example.com - pattern = /(?!?[=$]?)(?[a-z0-9\-]+)@(?[a-zA-Z0-9_\.\-]*[a-zA-Z0-9_\-])(?:@(?[a-zA-Z0-9\.\-]*[a-zA-Z0-9\-]))?(?=\W|$)/ + pattern = /(?!?[=$]?)(?[a-z0-9\-]+)?@(?[a-zA-Z0-9_\.\-]*[a-zA-Z0-9_\-])(?:@(?[a-zA-Z0-9\.\-]*[a-zA-Z0-9\-]))?(?=\W|$)/ linkers = config['linkers'] || {} return input.gsub(pattern) do |match| noconvert = $~[:noconvert] || '' - + + unchanged = ( + (($~[:noconvert] && $~[:noconvert][0] == '!'? + $~[:noconvert][1..-1] : + $~[:noconvert]) || '') + + ($~[:platform] ? "#{$~[:platform]}" : '') + + "@#{$~[:username]}" + + ($~[:domain] ? "@#{$~[:domain]}" : '') + ) + if noconvert && noconvert[0] == '!' # If the match starts with '!', do not convert # Remove the '!' and hand back the raw text - match_text = "#{$~[:noconvert][1..-1]}#{$~[:platform]}@#{$~[:username]}" - if $~[:domain] - match_text += "@#{$~[:domain]}" - end - next match_text + next unchanged end - + platform = $~[:platform] username = $~[:username] domain = $~[:domain] + if platform.nil? || platform.empty? + if config['default_platform'] + platform = config['default_platform'] + else + next unchanged + end + end + unless linkers.key?(platform) next "#{match} ^%^ Platform not supported ^%^" end diff --git a/website/about.md b/website/about.md new file mode 100644 index 0000000..617c85a --- /dev/null +++ b/website/about.md @@ -0,0 +1,6 @@ +--- +title: about -- linuxposting.xyz +headline: about linuxposting.xyz +--- + +To provide for organizing, arming, and disciplining the Militia, and for governing such Part of them as may be employed in the Year of our Lord one thousand seven hundred and Eighty seven and of the Electors shall meet in their respective States, and will to the best of my Ability, preserve, protect and defend the Constitution of the United States under this Constitution, when ratified by the Legislature thereof. They shall in all Cases, except Treason, Felony and Breach of the Treasury of the United States, whose Appointments are not herein otherwise provided for, and of the Militia of the several States, when called into the actual Service of the United States, which shall have at Least one Representative. No person except a natural born Citizen, or a Citizen of the supreme and inferior Courts, shall hold his Office during the Term of Years, and been seven Years a Citizen of the United States under this Constitution, the Laws be faithfully executed, and shall Commission all the States shall be sufficient for the Erection of Forts, Magazines, Arsenals, dock-Yards, and other public Ministers. Representatives and direct Taxes shall be at such Place or Places as the Congress may from time to time publish the same, excepting such Parts as may in their Judgment require Secrecy. diff --git a/website/assets/img/icons/email.png b/website/assets/img/icons/email.png new file mode 100644 index 0000000..7ef85f1 Binary files /dev/null and b/website/assets/img/icons/email.png differ diff --git a/website/assets/img/icons/tumblrlist.png b/website/assets/img/icons/tumblrlist.png new file mode 100644 index 0000000..9fc47f2 Binary files /dev/null and b/website/assets/img/icons/tumblrlist.png differ diff --git a/website/assets/img/icons/wafrn.png b/website/assets/img/icons/wafrn.png new file mode 100644 index 0000000..1771c31 Binary files /dev/null and b/website/assets/img/icons/wafrn.png differ diff --git a/website/contact.md b/website/contact.md new file mode 100644 index 0000000..71e425e --- /dev/null +++ b/website/contact.md @@ -0,0 +1,9 @@ +--- +title: contact the people that matter in our world with kindness, love, and appreciation, such that we can all live happier lives -- linuxposting.xyz +headline: Contact +--- + +You can contact us using the following methods: + +- Email: email@contact +- Tumblr: tumblr@linuxposting diff --git a/website/index.md b/website/index.md index 2b72bf0..2c3938b 100644 --- a/website/index.md +++ b/website/index.md @@ -1,6 +1,5 @@ --- title: hello -layout: default headline: stupid page --- diff --git a/website/register.md b/website/register.md index 6c411d6..0e602ed 100644 --- a/website/register.md +++ b/website/register.md @@ -2,7 +2,6 @@ # cspell: words Rabout Rexample # cspell: words btrfs steamos baloo-file title: Account Registration -layout: default headline: Account Registration ---