From 63caf646fa72121852eeb4944b6b9ce606665ba0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 27 Mar 2013 10:27:16 -0400 Subject: find templates -type f -exec sed -i 's/\({% block title %}\)Arch Linux/\1{{ BRANDING_DISTRONAME }}/' {} + --- templates/public/about.html | 2 +- templates/public/art.html | 2 +- templates/public/blank.html | 2 +- templates/public/donate.html | 2 +- templates/public/download.html | 2 +- templates/public/feeds.html | 2 +- templates/public/keys.html | 2 +- templates/public/svn.html | 2 +- templates/public/userlist.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'templates/public') diff --git a/templates/public/about.html b/templates/public/about.html index bf38e8a1..f5751d42 100644 --- a/templates/public/about.html +++ b/templates/public/about.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Arch Linux - About{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - About{% endblock %} {% block content %}

About Arch Linux

diff --git a/templates/public/art.html b/templates/public/art.html index 96312971..1ced35e7 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Arch Linux - Artwork{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Artwork{% endblock %} {% block content %}
diff --git a/templates/public/blank.html b/templates/public/blank.html index 2a8c83f4..3bf2cb2b 100644 --- a/templates/public/blank.html +++ b/templates/public/blank.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Arch Linux - Sample Page Title{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Sample Page Title{% endblock %} {% block content %}
diff --git a/templates/public/donate.html b/templates/public/donate.html index 3b3ee108..0c20e289 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -2,7 +2,7 @@ {% load cache %} {% load static from staticfiles %} -{% block title %}Arch Linux - Donate{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Donate{% endblock %} {% block content %} {% cache 600 donations secure %} diff --git a/templates/public/download.html b/templates/public/download.html index f57e565a..614a4100 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -3,7 +3,7 @@ {% load url from future %} {% load static from staticfiles %} -{% block title %}Arch Linux - Downloads{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Downloads{% endblock %} {% block navbarclass %}anb-download{% endblock %} {% block content %} diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 0f80e1c2..9f62c4b7 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Arch Linux - RSS Feeds{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %} {% block content %}
diff --git a/templates/public/keys.html b/templates/public/keys.html index 05524c48..1a21827a 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load pgp %} -{% block title %}Arch Linux - Master Signing Keys{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Master Signing Keys{% endblock %} {% block content %}
diff --git a/templates/public/svn.html b/templates/public/svn.html index 0d067098..38e20ec9 100644 --- a/templates/public/svn.html +++ b/templates/public/svn.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Arch Linux - SVN{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - SVN{% endblock %} {% block content %}

SVN Repositories

diff --git a/templates/public/userlist.html b/templates/public/userlist.html index 0077f611..66c63400 100644 --- a/templates/public/userlist.html +++ b/templates/public/userlist.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load cache %} -{% block title %}Arch Linux - {{ user_type }}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ user_type }}{% endblock %} {% block content %} {% cache 600 dev-tu-profiles user_type %} -- cgit v1.2.3-2-g168b From fcf5c3aaf087b2131bae34bdb7f1e08b292a0357 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 19 Apr 2013 18:06:13 -0400 Subject: replace a bunch more instances of "Arch" in templates manually --- templates/public/index.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'templates/public') diff --git a/templates/public/index.html b/templates/public/index.html index de77b47f..86c0be05 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -4,8 +4,8 @@ {% load static from staticfiles %} {% block head %} - - + + {% endblock %} {% block content_left %} @@ -33,7 +33,7 @@ if you want to learn more about Arch.

Learn more...

+ title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...

@@ -42,7 +42,7 @@ - RSS Feed {% for news in news_updates %} @@ -95,7 +95,7 @@

Recent Updates (more)

- RSS Feed @@ -139,7 +139,8 @@

Support

-

Existing Arch Users

+

Existing {{BRANDING_SHORTNAME}} Users

-

If you are an existing Arch user, there is no need to download a new ISO +

If you are an existing {{BRANDING_SHORTNAME}} user, there is no need to download a new ISO to update your existing system. You may be looking for an updated mirrorlist instead.

diff --git a/templates/public/index.html b/templates/public/index.html index 4b2bdfa3..de8a5fe8 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -133,7 +133,7 @@
  • Planet Arch
  • International Communities
    • + title="{{DISTRO_SHORTNAME}} communities in your native language">International Communities

    Support

    -- cgit v1.2.3-2-g168b From ae9ee14ff153698dd90c6560437e42ff124a6d0b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 19 Apr 2013 21:46:51 -0400 Subject: Abstract ArchWiki URLs and references. Notable things: * Standardize on "ArchWiki", instead of also having "Arch Wiki", via BRANDING_WIKINAME * Link to the article "Install_Guide" instead of "Official_Arch_Linux_Install_Guide", it's a redirect anyway. * On the download page, it assumes the that the version is just appended to the URL for the wiki link. * For the wiki RSS link, It now uses "/${title}?feed=rss" instead of "?title=${title}&feed=rss". --- templates/public/art.html | 2 +- templates/public/download.html | 7 ++++--- templates/public/feeds.html | 10 +++++----- templates/public/index.html | 19 ++++++++++--------- templates/public/svn.html | 4 ++-- 5 files changed, 22 insertions(+), 20 deletions(-) (limited to 'templates/public') diff --git a/templates/public/art.html b/templates/public/art.html index f013a040..89f1f81e 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -11,7 +11,7 @@

    Logos for Press Usage

    The following {{BRANDING_DISTRONAME}} logos are available for press and other use, subject to - the restrictions of our trademark policy.

    Two-color standard version
    diff --git a/templates/public/download.html b/templates/public/download.html index fdfe8e57..72d21736 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -2,6 +2,7 @@ {% load cache %} {% load url from future %} {% load static from staticfiles %} +{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - Downloads{% endblock %} {% block navbarclass %}anb-download{% endblock %} @@ -20,7 +21,7 @@ can always be updated with `pacman -Syu`.

      -
    • Current Release: {{ version }}
      • +
    • Current Release: {{ version }}
    • Included Kernel: 3.0.3
    • Resources:
        @@ -37,7 +38,7 @@ @@ -167,7 +168,7 @@ {% endwith %}

        If you want to become an Official Arch Linux Mirror please follow the - instructions listed here.

        + instructions listed here.

        {% endblock %} diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 764ebd90..f298de7f 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base.html" %}{% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %} {% block content %} @@ -15,10 +15,10 @@

        Grab the news item feed to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.

        -

        The Arch Wiki: Recent changes feed - is also available to track document changes from the Arch Wiki.

        +

        The {{ BRANDING_WIKINAME }}: Recent changes feed + is also available to track document changes from the {{ BRANDING_WIKINAME }}.

        Package Feeds

        diff --git a/templates/public/index.html b/templates/public/index.html index de8a5fe8..7c22c251 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -2,6 +2,7 @@ {% load markup cache %} {% load url from future %} {% load static from staticfiles %} +{% load wiki %} {% block head %} @@ -28,8 +29,8 @@ check out our forums and mailing lists - to get your feet wet. Also glance through our wiki + to get your feet wet. Also glance through our wiki if you want to learn more about Arch.

        Documentation

        @@ -128,11 +129,11 @@ @@ -168,7 +169,7 @@ title="Official Arch projects (git)">Projects in Git
      • SVN Repositories
        • -
      • Developer Wiki
      • Package Groups
        • @@ -187,7 +188,7 @@
      • Signing Master Keys New
        • -
      • Press Coverage
      • Logos & Artwork
      • News Archives
        • diff --git a/templates/public/svn.html b/templates/public/svn.html index 38e20ec9..88c6df93 100644 --- a/templates/public/svn.html +++ b/templates/public/svn.html @@ -5,7 +5,7 @@

        SVN Repositories

        The PKGBUILD files can be fetched via the ABS utility. To learn more - about ABS, see the ABS wiki page. + about ABS, see the ABS wiki page.

        The SVN repositories have been cloned into git repositories and can be viewed via the cgit interface. @@ -31,7 +31,7 @@ cd community svn update <your-package-name>

        - Visit the wiki + Visit the wiki for more tips on checking out and updating svn PKGBUILDs.

        -- cgit v1.2.3-2-g168b From 55b52a92806e4e76b1db17178f323362e3ddfe09 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 20 Apr 2013 00:24:29 -0400 Subject: add MAILMAN_BASE_URL to abstract mailing list links --- templates/public/download.html | 2 +- templates/public/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'templates/public') diff --git a/templates/public/download.html b/templates/public/download.html index 72d21736..f473915a 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -27,7 +27,7 @@ diff --git a/templates/public/index.html b/templates/public/index.html index 7c22c251..aeeff175 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -27,7 +27,7 @@

        Our strong community is diverse and helpful, and we pride ourselves on the range of skillsets and uses for Arch that stem from it. Please check out our forums - and mailing lists to get your feet wet. Also glance through our wiki @@ -127,7 +127,7 @@

        Community

          -
        • Mailing Lists
        • IRC Channels
          • -- cgit v1.2.3-2-g168b From f9fb5909bbcb5f5ff727a2d8f0081a4185138414 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 20 Apr 2013 13:42:30 -0400 Subject: remove /mailman from the MAILMAN_BASE_URL, use it every time --- templates/public/download.html | 2 +- templates/public/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'templates/public') diff --git a/templates/public/download.html b/templates/public/download.html index f473915a..70b27b73 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -27,7 +27,7 @@ diff --git a/templates/public/index.html b/templates/public/index.html index aeeff175..8856fd95 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -27,7 +27,7 @@

          Our strong community is diverse and helpful, and we pride ourselves on the range of skillsets and uses for Arch that stem from it. Please check out our forums - and mailing lists to get your feet wet. Also glance through our wiki @@ -127,7 +127,7 @@

          Community

            -
          • Mailing Lists
          • IRC Channels
            • -- cgit v1.2.3-2-g168b From 753784954794259c6a674a7b33e8b1e0105f55d1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 21 Apr 2013 01:01:35 -0400 Subject: add BUGTRACKER_URL --- templates/public/feeds.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/public') diff --git a/templates/public/feeds.html b/templates/public/feeds.html index f298de7f..91cd9e71 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -61,7 +61,7 @@

            Development Feeds

            Subscribe to any of the following to track bug tickets and feature - requests from the Arch Linux Bugtracker:

            + requests from the {{BRANDING_DISTRONAME}} Bugtracker:

    -- cgit v1.2.3-2-g168b