diff --git a/_data/chats.yml b/_data/chats.yml new file mode 100644 index 00000000..b3688cec --- /dev/null +++ b/_data/chats.yml @@ -0,0 +1,42 @@ +chats: +- monero: + matrix: https://matrix.to/#/!psOvWRiQkyosOPKvaO:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero + +- monero-community: + matrix: https://matrix.to/#/!WzzKmkfUkXPHFERgvm:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-community + +- monero-dev: + matrix: https://matrix.to/#/!VDQXWJoFsesLtbGdTT:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-dev + +- monero-markets: + matrix: https://matrix.to/#/!TlVgUtVNZychNpMzKW:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-markets + +- monero-offtopic: + matrix: https://matrix.to/#/!qqRhJzAUfTJRpMHqIP:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-offtopic + +- monero-otc: + +- monero-pools: + matrix: https://matrix.to/#/!ELYTQCXXdbEHObdtNR:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-pools + +- monero-research-lab: + matrix: https://matrix.to/#/!toFcRZtpaiwiyapgVO:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-research-lab + +- monero-translations: + matrix: https://matrix.to/#/!gOsXdgyxhvIygdtBpS:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-translations + +- monero-hardware: + matrix: https://matrix.to/#/!HoCZRUWeTZDNBfUcDr:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-hardware + +- monero-site: + matrix: https://matrix.to/#/!txpwSzQzkuUaVbtsIx:matrix.org + mattermost: https://mattermost.getmonero.org/monero/channels/monero-site \ No newline at end of file diff --git a/_i18n/en.yml b/_i18n/en.yml index d142d7cf..13d299a5 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -88,6 +88,7 @@ hangouts: resources_para: In an effort to support organic workgroups, Monero has several resources that the community can use to meet and plan projects. Mattermost even has relays into the most popular Monero-related IRC channels. irc: IRC Channels irc_para: The Monero community utilizes a lot of IRC channels that each serve different purposes. Some to work, and some just to hang out. You'll find the more popular ones below. + bridges: These channels are bridged to a number of other platforms, allowing the community to communicate using their favourite chat service/protocol. mailing_list: Mailing List mailing_list1: Do you want to receive important announcements directly on your email address? join our mailing lists! subscribe: Subscribe @@ -103,8 +104,6 @@ hangouts: monero-translations: Localizing Monero into other languages. monero-hardware: Building hardware wallets to keep your Monero safe. monero-site: Where the development of this website is coordinated - kovri: This channel is used to discuss all things Kovri related. - kovri-dev: The many contributors and developers come here to discuss Kovri dev-y things. merchants: intro1: Merchants of all kinds have come to value the financial privacy that Monero brings. Below is a list of the merchants that we know of that currently accept Monero for their goods and services. These merchants are not endorsed by the community, see disclaimer at the bottom of this page. If a company no longer accepts Monero or you would like your business to be listed, please diff --git a/community/hangouts/index.md b/community/hangouts/index.md index b5a9c419..9ff1fa06 100644 --- a/community/hangouts/index.md +++ b/community/hangouts/index.md @@ -74,12 +74,24 @@ permalink: /community/hangouts/index.html

{% t hangouts.irc %}

-

{% t hangouts.irc_para %}

+

{% t hangouts.irc_para %} {% t hangouts.bridges %}

{% for channel in site.translations[site.lang].hangouts.irc_channels %}
- #{{ channel[0] }} + #{{ channel[0] }} + {% for rooms_list in site.data.chats.chats %} + {% for room in rooms_list %} + {% if room[0] == channel[0] %} + {% if rooms_list.mattermost %} + Mattermost logo + {% endif %} + {% if rooms_list.matrix %} + Matrix logo + {% endif %} + {% endif %} + {% endfor %} + {% endfor %}

{% t hangouts.irc_channels.{{ channel[0] }} %}

{% endfor %} diff --git a/css/custom.css b/css/custom.css index 1b8543da..642e6dc0 100644 --- a/css/custom.css +++ b/css/custom.css @@ -4118,6 +4118,23 @@ p.hangouts-social { margin-right: auto; } +.hangouts a.chats-img { + text-decoration: none; + border-bottom: none; +} + +.hangouts img.mattermost { + display: inline-block; + vertical-align: middle; + width: 1.5rem; +} + +.hangouts img.matrix { + display: inline-block; + vertical-align: middle; + width: 3rem; +} + @media only screen and (max-width: 75rem) { } diff --git a/img/matrix-logo.svg b/img/matrix-logo.svg new file mode 100644 index 00000000..d4a95e24 --- /dev/null +++ b/img/matrix-logo.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/img/mattermost.png b/img/mattermost.png new file mode 100644 index 00000000..eca06bb2 Binary files /dev/null and b/img/mattermost.png differ