Merge branch 'main' into WD-37055-css-styles-broken-on-canonical-com-home-page-on-some-ios-mobile-devices

Author: Skazitron

secondary-navigation.yaml

@@ -123,7 +123,7 @@ lxd:
     - title: Manage
       path: /lxd/manage
     - title: Docs
-      path: https://canonical-lxd.readthedocs-hosted.com/en/
+      path: /lxd/docs
     - title: Forum
       path: https://discourse.ubuntu.com/c/lxd/126?_ga=2.69179345.1978494405.1700868870-354120313.1700868870
 
@@ -522,5 +522,5 @@ events:
   path: /events
 
   children:
-    - title: Roadshow events
+    - title: Canonical Days
       path: /events/canonical-days

templates/academy/exam-content/index.html

@@ -1,6 +1,6 @@
 {% extends 'base_index.html' %}
 
-{% block title %}Canonical Academy -- Exam content{% endblock %}
+{% block title %}Exam content | Academy{% endblock %}
 
 {% block meta_description %}
   The Canonical Academy Exam Content page prepares you to take Canonical Academy exams that count toward achieving professional certifications like the SysAdmin Qualification.

templates/academy/exam-guide.html

@@ -1,5 +1,5 @@
 {% extends 'base_index.html' %} 
-{% block title %}Canonical Academy -- Exam Guide{% endblock %}
+{% block title %}Exam guide | Academy{% endblock %}
 
 {% block meta_description %}
   The Canonical Academy Exam Guide prepares you to take Canonical Academy exams that count toward achieving professional certifications like the SysAdmin Qualification.

templates/academy/index.html

@@ -1,6 +1,6 @@
 {% extends 'base_index.html' %}
 
-{% block title %}Canonical Academy{% endblock %}
+{% block title %}Academy{% endblock %}
 
 {% block meta_description %}
   Get Linux certifications. Take real-world, industry relevant exams from the publisher of Ubuntu.

templates/academy/self-study.html

@@ -1,6 +1,6 @@
 {% extends 'base_index.html' %}
 
-{% block title %}Canonical Academy -- Self-study resources{% endblock %}
+{% block title %}Self-study resources | Academy{% endblock %}
 
 {% block meta_description %}
   The Canonical Academy Study Guide prepares you to take Canonical Academy exams that count toward achieving professional certifications like the SysAdmin Qualification.

templates/anbox-cloud/index.html

@@ -1,6 +1,6 @@
 {% extends 'base_index.html' %}
 
-{% block title %}Anbox Cloud - Scalable Android in the cloud{% endblock %}
+{% block title %}Anbox Cloud{% endblock %}
 
 {% block meta_description %}
   Scale Android in the cloud on any hardware. Canonical partners with providers and manufacturers to accelerate your time to market with long-term enterprise-grade support.

templates/base_index.html

@@ -22,10 +22,7 @@
           <meta property="og:url" content="{{ request.url }}" />
           <meta property="og:site_name" content="Canonical" />
 
-          <title>
-
-            {% block title %}Canonical | Trusted open source for enterprises{% endblock %}
-          </title>
+          <title>{% block title %}Trusted open source for enterprises{% endblock %} | Canonical</title>
           {% if self.title() %}
             <meta name="twitter:title" content="{{ self.title() }} | Canonical" />
             <meta property="og:title" content="{{ self.title() }} | Canonical" />

templates/blog/archives.html

@@ -1,6 +1,6 @@
 {% extends "base_index.html" %}
 
-{% block title %}Archives{% endblock %}
+{% block title %}Archives | Blog{% endblock %}
 
 {% block content %}
   <section class="p-strip--suru is-shallow">
@@ -33,7 +33,7 @@ <h3 class="p-media-object__title">
                 <a href="/blog/{{ article.slug }}">{{ article.title.rendered|safe }}</a>
               </h3>
               <div class="p-media-object__content">
-                <p>By <a href="/blog/author/{{article.author.slug}}" title="More about {{ article.author.name }}">{{ article.author.name }}</a>, {{ article.date }}</p>
+                <p>By <a href="/blog/author/{{ article.author.slug }}" title="More about {{ article.author.name }}">{{ article.author.name }}</a>, {{ article.date }}</p>
 
                 <p>{{ article.excerpt.raw.replace("[…]", "")|truncate(162) }}</p>
               </div>
@@ -48,11 +48,11 @@ <h3>Archives</h3>
         <ul class="p-list">
           {% for year in descending_years(2006) %}
             <li class="p-list__item">
-              <h5><a class="p-link--soft" href="/blog/archives?year={{year}}">{{year}}</a></h5>
+              <h5><a class="p-link--soft" href="/blog/archives?year={{ year }}">{{ year }}</a></h5>
 
               <ul class="p-inline-list--middot">
                 {% for month in months_list(year) %}
-                  <li class="p-inline-list__item"><a class="p-link--soft" href="/blog/archives?year={{year}}&amp;month={{month.number}}{% if group %}&group={{group.slug}}{% endif %}">{{ month.name }}</a></li>
+                  <li class="p-inline-list__item"><a class="p-link--soft" href="/blog/archives?year={{ year }}&amp;month={{ month.number }}{% if group %}&group={{ group.slug }}{% endif %}">{{ month.name }}</a></li>
                 {% endfor %}
               </ul>
             </li>
@@ -69,5 +69,4 @@ <h5><a class="p-link--soft" href="/blog/archives?year={{year}}">{{year}}</a></h5
       {% include "shared/_pagination.html" %}
     {% endwith %}
   </section>
-</section>
 {% endblock %}

templates/blog/author.html

@@ -1,6 +1,6 @@
 {% extends "base_index.html" %}
 
-{% block title %}Blog posts written by {{ author.name }}{% endblock %}
+{% block title %}{{ author.name }} | Blog{% endblock %}
 
 {% block description %}
   {% if author.id == 217 %}

templates/blog/index.html

@@ -1,5 +1,5 @@
 {% extends "base_index.html" %}
-{% block title %}Canonical Blog{% endblock %}
+{% block title %}Blog{% endblock %}
 
 {% block extra_metatags %}
   <link rel="alternate" type="application/rss+xml"  href="/blog/feed" title="Canonical.com's Blog RSS feed">