Update various brand instances in code

pull/14502/head
J. Ryan Stinnett 2 years ago
parent 0667ede7b7
commit ffab08bd60
  1. 2
      src/components/structures/VectorEmbeddedPage.js
  2. 8
      src/vector/index.html
  3. 2
      src/vector/index.ts
  4. 2
      src/vector/jitsi/index.ts
  5. 6
      src/vector/mobile_guide/index.html
  6. 10
      src/vector/mobile_guide/index.js
  7. 2
      src/vector/platform/WebPlatform.ts
  8. 6
      src/vector/static/incompatible-browser.html
  9. 4
      src/vector/static/unable-to-load.html

@ -25,7 +25,7 @@ import { _t } from 'matrix-react-sdk/src/languageHandler';
export default class VectorEmbeddedPage extends EmbeddedPage {
static replaces = 'EmbeddedPage';
// we're overriding the base component here, for Riot-specific tweaks
// we're overriding the base component here, for Element-specific tweaks
translate(s) {
s = sanitizeHtml(_t(s));
// ugly fix for https://github.com/vector-im/riot-web/issues/4243

@ -2,7 +2,7 @@
<html lang="en" style="height: 100%;">
<head>
<meta charset="utf-8">
<title>Riot</title>
<title>Element</title>
<link rel="apple-touch-icon" sizes="57x57" href="<%= require('../../res/vector-icons/apple-touch-icon-57.png') %>">
<link rel="apple-touch-icon" sizes="60x60" href="<%= require('../../res/vector-icons/apple-touch-icon-60.png') %>">
<link rel="apple-touch-icon" sizes="72x72" href="<%= require('../../res/vector-icons/apple-touch-icon-72.png') %>">
@ -16,8 +16,8 @@
<meta name="referrer" content="no-referrer">
<link rel="shortcut icon" href="<%= require('../../res/vector-icons/favicon.ico') %>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="apple-mobile-web-app-title" content="Riot">
<meta name="application-name" content="Riot">
<meta name="apple-mobile-web-app-title" content="Element">
<meta name="application-name" content="Element">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="<%= require('../../res/vector-icons/mstile-150.png') %>">
<meta name="msapplication-config" content="<%= require('../../res/vector-icons/browserconfig.xml') %>">
@ -51,7 +51,7 @@
} %>
</head>
<body style="height: 100%; margin: 0;" data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.chunks['indexeddb-worker'].entry %>">
<noscript>Sorry, Riot requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
<noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
<section id="matrixchat" style="height: 100%; overflow: auto;" class="notranslate"></section>
<script src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>

@ -121,7 +121,7 @@ async function start() {
const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
const isAndroid = /Android/.test(navigator.userAgent);
if (isIos || isAndroid) {
if (document.cookie.indexOf("riot_mobile_redirect_to_guide=false") === -1) {
if (document.cookie.indexOf("element_mobile_redirect_to_guide=false") === -1) {
window.location.href = "mobile_guide/";
return;
}

@ -55,7 +55,7 @@ let widgetApi: WidgetApi;
const parentUrl = qsParam('parentUrl', true);
const widgetId = qsParam('widgetId', true);
// Set this up as early as possible because Riot will be hitting it almost immediately.
// Set this up as early as possible because Element will be hitting it almost immediately.
if (parentUrl && widgetId) {
widgetApi = new WidgetApi(qsParam('parentUrl'), qsParam('widgetId'), [
Capability.AlwaysOnScreen,

@ -162,7 +162,7 @@ body {
</g>
</svg>
</span>
<p>Set up Riot on iOS or Android</p>
<p>Set up Element on iOS or Android</p>
</div>
<div class="mx_HomePage_col">
<div class="mx_HomePage_row">
@ -330,7 +330,7 @@ body {
<div class="mx_HomePage_row">
<div>
<h2>2: Configure your app</h2>
<a class="mx_Button" id="configure_riot_button" href="#">Configure</a>
<a class="mx_Button" id="configure_element_button" href="#">Configure</a>
<p class="mx_Subtext mx_SubtextTop">Tap the button above, or manually enable <em>Use custom server</em> and enter:</p>
<p class="mx_Subtext">Homeserver: <em id="hs_url"></em></p>
<p class="mx_Subtext" id="custom_is">Identity Server: <em id="is_url"></em></p>
@ -339,7 +339,7 @@ body {
</div>
<div class="mx_HomePage_row mx_Center mx_Spacer">
<p class="mx_Spacer">
<a id="back_to_riot_button" href="#" class="mx_FooterLink">
<a id="back_to_element_button" href="#" class="mx_FooterLink">
Go to Desktop Site
</a>
</p>

@ -1,8 +1,8 @@
import {getVectorConfig} from '../getconfig';
function onBackToRiotClick() {
function onBackToElementClick() {
// Cookie should expire in 4 hours
document.cookie = 'riot_mobile_redirect_to_guide=false;path=/;max-age=14400';
document.cookie = 'element_mobile_redirect_to_guide=false;path=/;max-age=14400';
window.location.href = '../';
}
@ -10,7 +10,7 @@ function onBackToRiotClick() {
function renderConfigError(message) {
const contactMsg = "If this is unexpected, please contact your system administrator " +
"or technical support representative.";
message = `<h2>Error loading Riot</h2><p>${message}</p><p>${contactMsg}</p>`;
message = `<h2>Error loading Element</h2><p>${message}</p><p>${contactMsg}</p>`;
const toHide = document.getElementsByClassName("mx_HomePage_container");
const errorContainers = document.getElementsByClassName("mx_HomePage_errorContainer");
@ -27,7 +27,7 @@ function renderConfigError(message) {
}
async function initPage() {
document.getElementById('back_to_riot_button').onclick = onBackToRiotClick;
document.getElementById('back_to_element_button').onclick = onBackToElementClick;
let config = await getVectorConfig('..');
@ -92,7 +92,7 @@ async function initPage() {
if (isUrl && !isUrl.endsWith('/')) isUrl += '/';
if (hsUrl !== 'https://matrix.org/') {
document.getElementById('configure_riot_button').href =
document.getElementById('configure_element_button').href =
"https://app.element.io/config/config?hs_url=" + encodeURIComponent(hsUrl) +
"&is_url=" + encodeURIComponent(isUrl);
document.getElementById('step1_heading').innerHTML= '1: Install the app';

@ -186,7 +186,7 @@ export default class WebPlatform extends VectorBasePlatform {
let appName = u.format();
// Remove leading slashes if present
appName = appName.replace(/^\/\//, "");
// `appName` is now in the format `riot.im/develop`.
// `appName` is now in the format `develop.element.io`.
const ua = new UAParser();
const browserName = ua.getBrowser().name || "unknown browser";

@ -168,8 +168,8 @@
<div class="mx_HomePage_col">
<div class="mx_HomePage_row">
<div>
<h2 id="step1_heading">Your browser can't run Riot</h2>
<p>Riot uses many advanced browser features, some of which are not available or experimental in your current browser.</p>
<h2 id="step1_heading">Your browser can't run Element</h2>
<p>Element uses many advanced browser features, some of which are not available or experimental in your current browser.</p>
<p>Please install <a href="https://www.google.com/chrome">Chrome</a>, <a href="https://firefox.com">Firefox</a>,
or <a href="https://apple.com/safari">Safari</a> for the best experience.</p>
</div>
@ -178,7 +178,7 @@
<div class="mx_HomePage_col">
<div class="mx_HomePage_row">
<div>
<h2 id="step2_heading">Use Riot on mobile</h2>
<h2 id="step2_heading">Use Element on mobile</h2>
<p><strong>iOS</strong> (iPhone or iPad)</p>
<a href="https://itunes.apple.com/app/riot-im/id1083446067?mt=8" target="_blank"
class="mx_ClearDecoration">

@ -182,8 +182,8 @@
<div class="mx_HomePage_col">
<div class="mx_HomePage_row">
<div>
<h2 id="step1_heading">Riot can't load</h2>
<p>Something went wrong and Riot was unable to load.</p>
<h2 id="step1_heading">Element can't load</h2>
<p>Something went wrong and Element was unable to load.</p>
</div>
</div>
</div>

Loading…
Cancel
Save