diff --git a/config.json b/config.json new file mode 100644 index 00000000000..effc545321d --- /dev/null +++ b/config.json @@ -0,0 +1,29 @@ +{ + "default_hs_url": "https://matrix.openastronomy.org", + "default_is_url": "https://matrix.openastronomy.org", + "disable_guests": false, + "brand": "OpenAstronomy", + "integrations_ui_url": "https://scalar.vector.im/", + "integrations_rest_url": "https://scalar.vector.im/api", + "bug_report_endpoint_url": "https://riot.im/bugreports/submit", + "features": { + "feature_groups": "labs", + "feature_pinning": "labs" + }, + "default_federate": true, + "roomDirectory": { + "servers": [ + "openastronomy.org", + "matrix.org" + ] + }, + "default_theme": "light", + "analyticsOptOut": true, + "piwik": { + "url": "https://aderyn.home.cadair.com/piwik/", + "whitelistedHSUrls": ["https://matrix.openastronomy.org", "https://matrix.org"], + "whitelistedISUrls": ["https://matrix.openastronomy.org", "https://vector.im", "https://matrix.org"], + "siteId": 2 + } + +} diff --git a/res/home.html b/res/home.html index 934e491ecda..fe51a2e1e4b 100644 --- a/res/home.html +++ b/res/home.html @@ -31,6 +31,7 @@ .mx_HomePage_header { border: 1px solid #76CFA6; background-color: #eaf5f0; + border-radius: 5px; align-items: center; } @@ -109,9 +110,9 @@ margin: 20px; } -.mx_HomePage_container h1, -.mx_HomePage_container h2, -.mx_HomePage_container h3, +.mx_HomePage_container h1, +.mx_HomePage_container h2, +.mx_HomePage_container h3, .mx_HomePage_container h4 { font-weight: 600; } @@ -119,174 +120,195 @@
- +
-

_t("Welcome to Riot.im")

-

_t("Decentralised, encrypted chat & collaboration powered by [matrix]")

+

Welcome to chat.openastronomy.org

+

_t("Decentralised, open chat & collaboration powered by [matrix]")

-
+ +
+

+ To get started join one or more rooms and communities below. +

+

+ Communities in Matrix are a collection of rooms, most of the + OpenAstronomy communties below are publically join able, from the + community page you can see all the rooms in that community and join + as many as you wish. You can be a memeber of as many communities as + you wish, and use them to filter your rooms. +

+
+ +
-
-

_t("Search the room directory")

- - +
+

OpenAstronomy

+
+
+ + + OpenAstronomy - - _t("Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!") - + The general OpenAstronomy chat. +
+
+ + + OpenAstronomy Community + + The matrix community for OpenAstronomy. +
+
+ + + OpenAstronomy [matrix] + + A room to discuss and ask questions about chat.openastronomy.org
-
-

_t("Chat with Riot Bot")

- - +
+

Python in Astronomy

+
+
+ + + PyAstro18 General - - _t("Get started with some tips from Riot Bot!") - + The main PyAstro18 chat room. +
+
+ + + PyAstro18 Community + + The Python in Astronomy 2018 community.
-

_t("General discussion about Matrix and Riot")

+

Member Projects on Matrix

-
-
- - - Matrix HQ - - _t("Discussion of all things Matrix!") -
-
- - - Riot - - _t("Riot/Web & Desktop chat") -
-
- - - #riot-ios - - _t("Riot/iOS & matrix-ios-sdk chat") +
+
+
+

SunPy

+
+
+ + + SunPy + + The main SunPy chat room. +
+
+ + + SunPy Community + + The SunPy Matrix community. +
-
- - - #riot-android - - _t("Riot/Android & matrix-android-sdk chat") +
+
+

Astropy

+
+
+ + + Astropy + + The main Astropy chat room. +
+
+ + + Astropy Community + + The Astropy Matrix community. +
-

_t("Matrix technical discussions")

-

_t("Running Matrix services")

- -
-
- - - Synapse Support Community - - _t("Community-run support for Synapse") -
-
- - - #dendrite:matrix.org - - _t("Admin support for Dendrite") -
-
- - - Synapse Homeowners - - _t("Announcements about Synapse releases") +
+
+
+

PlasmaPy

+
+
+ + + PlasmaPy + + The main PlasmaPy chat room. +
+
+ + + PlasmaPy Community + + The PlasmaPy Matrix community. +
-
- - - IRC Matrix Bridges - - _t("Support for those using and running matrix-appservice-irc") +
+
+

Poliastro

+
+
+ + + Poliastro + + The main Poliastro chat room. +
+
+ + + Poliastro Community + + The Poliastro Matrix community. +
- -

_t("Building services on Matrix")

- -
-
- - - #matrix-dev:matrix.org - - _t("Support for those using the Matrix spec") -
-
- - - End-to-end crypto in Matrix - - _t("Design and implementation of E2E in Matrix") -
-
- - - #vr:matrix.org - - _t("Implementing VR services with Matrix") -
-
- - - #webrtc:matrix.org - - _t("Implementing VoIP services with Matrix") -
-
- - - Matrix Identity - - _t("Discussion of the Identity Service API") +
+
+
+

Heliopy

+
+
+ + + Heliopy + + The main Heliopy chat room. +
-
- - - Matrix Bridging - - _t("Support for those using, running and writing other bridges") +
+
+

yt

+
+
+ + + yt + + The yt IRC chat room +
-

_t("Contributing code to Matrix and Riot")

- -
-
- - - #riot-dev - - _t("Dev chat for the Riot/Web dev team") -
-
- - - #dendrite-dev - - _t("Dev chat for the Dendrite dev team") -
-
- - - Riot Translations - - _t("Co-ordination for Riot translators") +
+
+
+

_t("Search the room directory")

+ + + + + Lots of other rooms exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory! + +
diff --git a/res/home/images/astropy.png b/res/home/images/astropy.png new file mode 100644 index 00000000000..648c4c8cc04 Binary files /dev/null and b/res/home/images/astropy.png differ diff --git a/res/home/images/heliopy.png b/res/home/images/heliopy.png new file mode 100644 index 00000000000..e4a5a0259c0 Binary files /dev/null and b/res/home/images/heliopy.png differ diff --git a/res/home/images/logo.svg b/res/home/images/logo.svg index a5f70e5e4c7..2d4e4f0d364 100644 --- a/res/home/images/logo.svg +++ b/res/home/images/logo.svg @@ -1,76 +1,169 @@ - - - - -New_logo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + image/svg+xml + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/home/images/logoOA.png b/res/home/images/logoOA.png new file mode 100644 index 00000000000..3dc2f989f55 Binary files /dev/null and b/res/home/images/logoOA.png differ diff --git a/res/home/images/logoOA.svg b/res/home/images/logoOA.svg new file mode 100644 index 00000000000..20af1e3d130 --- /dev/null +++ b/res/home/images/logoOA.svg @@ -0,0 +1,123 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + Open + Astronomy + + + + diff --git a/res/home/images/logoOA_full.png b/res/home/images/logoOA_full.png new file mode 100644 index 00000000000..ae064c8b1ad Binary files /dev/null and b/res/home/images/logoOA_full.png differ diff --git a/res/home/images/plasmapy.png b/res/home/images/plasmapy.png new file mode 100644 index 00000000000..d46ea0b3f61 Binary files /dev/null and b/res/home/images/plasmapy.png differ diff --git a/res/home/images/plasmapy.svg b/res/home/images/plasmapy.svg new file mode 100644 index 00000000000..40930b37d9a --- /dev/null +++ b/res/home/images/plasmapy.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/res/home/images/poliastro.png b/res/home/images/poliastro.png new file mode 100644 index 00000000000..305414d4569 Binary files /dev/null and b/res/home/images/poliastro.png differ diff --git a/res/home/images/pyastro_logo.png b/res/home/images/pyastro_logo.png new file mode 100644 index 00000000000..d567103c2df Binary files /dev/null and b/res/home/images/pyastro_logo.png differ diff --git a/res/home/images/riot_logo.svg b/res/home/images/riot_logo.svg new file mode 100644 index 00000000000..9306c8bbb96 --- /dev/null +++ b/res/home/images/riot_logo.svg @@ -0,0 +1,206 @@ + + + +image/svg+xmlNew_logo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +New_logo + + + \ No newline at end of file diff --git a/res/home/images/sunpy_icon.svg b/res/home/images/sunpy_icon.svg new file mode 100644 index 00000000000..9944024ae2d --- /dev/null +++ b/res/home/images/sunpy_icon.svg @@ -0,0 +1,184 @@ + +image/svg+xml \ No newline at end of file diff --git a/res/home/images/yt-logo.png b/res/home/images/yt-logo.png new file mode 100644 index 00000000000..e6a26bbea66 Binary files /dev/null and b/res/home/images/yt-logo.png differ diff --git a/res/manifest.json b/res/manifest.json index 75b182122d5..cf97d1937a9 100644 --- a/res/manifest.json +++ b/res/manifest.json @@ -1,5 +1,5 @@ { - "name": "Riot - open team collaboration", + "name": "Riot - openastronomy.org", "short_name": "Riot", "display": "standalone", "theme_color": "#76CFA6", diff --git a/scripts/oa-version.sh b/scripts/oa-version.sh new file mode 100755 index 00000000000..49ab2fd77ca --- /dev/null +++ b/scripts/oa-version.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +split=$(git describe --dirty --tags | tr -d v | tr "-" "\n") +split=($split) +split=${split[0]} + +echo "${split}-openastronomy" diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9641f0dd71c..e9f5fafc9c9 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1,4 +1,5 @@ { + "Decentralised, open chat & collaboration powered by [matrix]": "Decentralised, open chat & collaboration powered by [matrix]", "Riot is not supported on mobile web. Install the app?": "Riot is not supported on mobile web. Install the app?", "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s", "Unknown device": "Unknown device", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 7803498a73f..e794deeb13e 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -9,6 +9,7 @@ "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.", "Welcome to Riot.im": "Welcome to Riot.im", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralised, encrypted chat & collaboration powered by [matrix]", + "Decentralised, open chat & collaboration powered by [matrix]": "Decentralised, open chat & collaboration powered by [matrix]", "Chat with Riot Bot": "Chat with Riot Bot", "Search the room directory": "Search the room directory", "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",