From 902a7fbfe9b9942cb2245b560b3394b605c4b18c Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Fri, 12 Aug 2016 14:15:56 -0700 Subject: [PATCH] Change relative paths to absolute paths when we don't want the subdomain. Changes relative path to an absolute path (that doesn't contain the subdomain) for various links to /create_realm, /api, /apps, /integrations, /hello, /terms, and the logged out / (the Zulip in the upper left corner of portico) I typically left links internal to the relevant pages (e.g. a link from integrations.html to a subpage of integrations/) as relative links, and changed external links from within the app to the absolute path (e.g. the link to integrations from the gear menu). --- static/js/tutorial.js | 4 ++-- static/templates/settings_tab.handlebars | 4 ++-- templates/zerver/accounts_accept_terms.html | 2 +- templates/zerver/features.html | 4 ++-- templates/zerver/navbar.html | 6 +++--- templates/zerver/portico.html | 10 +++++----- templates/zerver/register.html | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/static/js/tutorial.js b/static/js/tutorial.js index f38cebd4e2a00..61be24764ba7d 100644 --- a/static/js/tutorial.js +++ b/static/js/tutorial.js @@ -359,7 +359,7 @@ function finale(skip) { if (page_params.prompt_for_invites) { alert_contents = "It's lonely in here! Invite some users."; } else { - alert_contents = "What's better than " + page_params.product_name + " in your browser? The "+ page_params.product_name + " desktop app!"; + alert_contents = "What's better than " + page_params.product_name + " in your browser? The "+ page_params.product_name + " desktop app!"; } show_app_alert(alert_contents); @@ -384,7 +384,7 @@ function finale(skip) { if (stream_data.in_home_view(page_params.notifications_stream)) { send_delayed_stream_message(page_params.notifications_stream, "welcome", "Practice sending sending some messages here, or starting a new topic.", 15); send_delayed_stream_message(page_params.notifications_stream, page_params.product_name + " tips", "Here's a message on a new topic: `" + page_params.product_name + " tips`.\n\nAs you settle into " + page_params.product_name + ", customize your account and notifications on your [Settings page](#settings).", 30); - send_delayed_stream_message(page_params.notifications_stream, page_params.product_name + " tips", "You might also enjoy:\n\n* Our lightweight !modal_link(#markdown-help, message formatting) (including emoji! :thumbsup:)\n* !modal_link(#keyboard-shortcuts, Keyboard shortcuts)\n* [Desktop and mobile apps](/apps)", 40); + send_delayed_stream_message(page_params.notifications_stream, page_params.product_name + " tips", "You might also enjoy:\n\n* Our lightweight !modal_link(#markdown-help, message formatting) (including emoji! :thumbsup:)\n* !modal_link(#keyboard-shortcuts, Keyboard shortcuts)\n* [Desktop and mobile apps](" + page_params.server_uri + "/apps)", 40); } if (work_stream !== undefined) { diff --git a/static/templates/settings_tab.handlebars b/static/templates/settings_tab.handlebars index b5efb2a76de7d..90e7bf3474751 100644 --- a/static/templates/settings_tab.handlebars +++ b/static/templates/settings_tab.handlebars @@ -308,8 +308,8 @@
{{#tr this}} -

Looking for our Integrations - or API documentation?

+

Looking for our Integrations + or API documentation?

{{/tr}}
    diff --git a/templates/zerver/accounts_accept_terms.html b/templates/zerver/accounts_accept_terms.html index 08e2389d46b34..52b6b43d4a5af 100644 --- a/templates/zerver/accounts_accept_terms.html +++ b/templates/zerver/accounts_accept_terms.html @@ -39,7 +39,7 @@

    {{ _("Accept the terms of service") }}

    #} - {{ _("I agree to the") }} {{ _("Terms of Service") }}. + {{ _("I agree to the") }} {{ _("Terms of Service") }}. {% if form.terms.errors %} {% for error in form.terms.errors %} diff --git a/templates/zerver/features.html b/templates/zerver/features.html index 60ee6dda845b8..6541866ddbc5f 100644 --- a/templates/zerver/features.html +++ b/templates/zerver/features.html @@ -138,13 +138,13 @@

    {{ _("API") }}

    {% trans %}Mobile apps{% endtrans %}

    -

    {% trans %}Check Zulip on the go with native iOS and +

    {% trans %}Check Zulip on the go with native iOS and Android apps{% endtrans %}.

    {% trans %}Desktop apps{% endtrans %}

    {% trans %}Prefer Zulip in its own window and rich, OS-level notifications? - Enjoy Zulip on your desktop{% endtrans %}.

    + Enjoy Zulip on your desktop{% endtrans %}.

    {% endblock %} diff --git a/templates/zerver/navbar.html b/templates/zerver/navbar.html index 9d3b320eb4ec9..ecc64daa43ed8 100644 --- a/templates/zerver/navbar.html +++ b/templates/zerver/navbar.html @@ -71,17 +71,17 @@
  2. - + {{ _('Desktop & mobile apps') }}
  3. - + {{ _('Integrations') }}
  4. - + {{ _('API documentation') }}
    5. diff --git a/templates/zerver/portico.html b/templates/zerver/portico.html index cc1bb54184d51..5c5a3d125127e 100644 --- a/templates/zerver/portico.html +++ b/templates/zerver/portico.html @@ -16,9 +16,9 @@
    {% if custom_logo_url %} - + {% else %} - + {% endif %}
    @@ -52,10 +52,10 @@