Update macros usage with vanilla patterns

canonical · Dec 5, 2024 · 119eb73 · 119eb73
1 parent c6faafb
commit 119eb73
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 48 deletions.
diff --git a/templates/ai/mlops-workshop.html b/templates/ai/mlops-workshop.html
@@ -14,12 +14,12 @@
   is-paper
 {% endblock body_class %}
 
-{% from "macros/_macros-hero.jinja" import hero %}
+{% from "_macros/vf_hero.jinja" import vf_hero %}
 
 {% block content %}
 
-  {%- call(slot) hero(
-    title="Accelerate your AI/ML projects with an MLOps workshop",
+  {%- call(slot) vf_hero(
+    title_text="Accelerate your AI/ML projects with an MLOps workshop",
     layout='50/50',
     is_split_on_medium="true"
     ) -%}

diff --git a/templates/case-study/esa.html b/templates/case-study/esa.html
@@ -1,9 +1,11 @@
 {% extends "case-study/base_case-study.html" %}
-{% from "macros/_macros-hero.jinja" import hero %}
+
+{% from "_macros/vf_hero.jinja" import vf_hero %}
+{% from "_macros/vf_quote-wrapper.jinja" import vf_quote_wrapper %}
+
 {% from "macros/_macros-text-list.jinja" import text_list %}
 {% from "macros/_macros-highlights.jinja" import highlights %}
 {% from "macros/_macros-text.jinja" import text %}
-{% from "macros/_macros-quote.jinja" import quote_wrapper %}
 {% from "macros/_macros-image.jinja" import image_wrapper %}
 
 {% block title %}Canonical deploys infrastructure solutions and managed IT services for critical space mission operations{% endblock %}
@@ -13,7 +15,9 @@
 
 {% block content %}
   <!-- Hero section -->
-  {%- call(slot) hero(title="Canonical deploys infrastructure solutions and managed IT services for critical space mission operations", layout="25/75") -%}
+  {%- call(slot) vf_hero(
+    title_text="Canonical deploys infrastructure solutions and managed IT services for critical space mission operations",
+    layout="25/75" ) -%}
     {% if slot == "signpost_image" %}
       {{ image(url="https://assets.ubuntu.com/v1/17238501-esa-with-whitespace.png",
                   alt="European Space Agency",
@@ -114,10 +118,11 @@
     {%- endif -%}
   {%- endcall -%}
 
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="For me, personally I saw it as a good stepping stone for moving toward a better future, not just in this particular project, but also for other space programmes and projects that ESA has. Being able to scale and take advantage of the public cloud, while being able to keep critical infrastructure here on site - these are all advantages.",
     citation_source_name_text="Michael Hawkshaw",
-    citation_source_title_text=" ESA Mission Operations Infrastructure IT Service Manager"
+    citation_source_title_text=" ESA Mission Operations Infrastructure IT Service Manager",
+    is_shallow=True
     ) 
   -%}
   {%- endcall -%}
@@ -155,10 +160,11 @@
     {%- endif -%}
   {%- endcall -%}
 
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="For ESA it is key to have service providers who can support its ambitious space programme into the 2030s and beyond to help secure Europe’s role in space exploration.",
     citation_source_name_text="Michael Hawkshaw",
-    citation_source_title_text="ESA Mission Operations Infrastructure IT Service Manager"
+    citation_source_title_text="ESA Mission Operations Infrastructure IT Service Manager",
+    is_shallow=True
     ) 
   -%}
   {%- endcall -%}

diff --git a/templates/case-study/grundium-ubuntu-pro-for-devices.html b/templates/case-study/grundium-ubuntu-pro-for-devices.html
@@ -1,10 +1,11 @@
 {% extends "case-study/base_case-study.html" %}
 
-{% from "macros/_macros-hero.jinja" import hero %}
+{% from "_macros/vf_hero.jinja" import vf_hero %}
+{% from "_macros/vf_quote-wrapper.jinja" import vf_quote_wrapper %}
+
 {% from "macros/_macros-text-list.jinja" import text_list %}
 {% from "macros/_macros-highlights.jinja" import highlights %}
 {% from "macros/_macros-text.jinja" import text %}
-{% from "macros/_macros-quote.jinja" import quote_wrapper %}
 {% from "macros/_macros-image.jinja" import image_wrapper %}
 {% from "macros/_macros-cta.jinja" import cta %}
 
@@ -21,7 +22,8 @@
 {% endblock %}
 
 {% block content %}
-  {%- call(slot) hero(title="Grundium secures critical systems and improves health outcomes with Ubuntu Pro for Devices",
+  {%- call(slot) vf_hero(
+    title_text="Grundium secures critical systems and improves health outcomes with Ubuntu Pro for Devices",
     layout="25/75",
     is_split_on_medium="true") -%}
     {% if slot == "signpost_image" %}      
@@ -140,11 +142,12 @@
     {%- endif -%}
   {%- endcall -%}
 
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="Nowadays, most complicated systems are built using open source. There’s no point in doing everything on your own: if there’s knowledge out there, we should draw on it.",
     citation_source_name_text="Kimmo Alanen",
     citation_source_title_text=" Vice President",
-    citation_source_organisation_text="Grundium"
+    citation_source_organisation_text="Grundium",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}
@@ -160,11 +163,12 @@
     {%- endif -%}
   {%- endcall -%}
 
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="We looked at alternatives to an Ubuntu Pro subscription, but they were, without exception, far more laborious. With Ubuntu Pro, we can meet our customers’ expectations around security, because Canonical guarantees patching for all open source components that we are using.",
     citation_source_name_text="Kimmo Alanen",
     citation_source_title_text=" Vice President",
-    citation_source_organisation_text="Grundium"
+    citation_source_organisation_text="Grundium",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}
@@ -177,11 +181,12 @@
     {%- endif -%}
   {%- endcall -%}
 
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="Our customers in the medical industry require a security scan of any technical product they are using. If you don’t have an OS that is continuously patched and maintained, you don’t pass. Ubuntu Pro for Devices ensures that we can meet the requirements of our clients.",
     citation_source_name_text="Kimmo Alanen",
     citation_source_title_text=" Vice President",
-    citation_source_organisation_text="Grundium"
+    citation_source_organisation_text="Grundium",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}

diff --git a/templates/case-study/lucid-aws-fedramp-compliance-case-study.html b/templates/case-study/lucid-aws-fedramp-compliance-case-study.html
@@ -1,10 +1,11 @@
 {% extends "case-study/base_case-study.html" %}
 
-{% from "macros/_macros-hero.jinja" import hero %}
+{% from "_macros/vf_hero.jinja" import vf_hero %}
+{% from "_macros/vf_quote-wrapper.jinja" import vf_quote_wrapper %}
+
 {% from "macros/_macros-text-list.jinja" import text_list %}
 {% from "macros/_macros-highlights.jinja" import highlights %}
 {% from "macros/_macros-text.jinja" import text %}
-{% from "macros/_macros-quote.jinja" import quote_wrapper %}
 {% from "macros/_macros-image.jinja" import image_wrapper %}
 {% from "macros/_macros-cta.jinja" import cta %}
 
@@ -20,7 +21,8 @@
 
 {% block content %}
   <!-- Hero section -->
-  {%- call(slot) hero(title="Ubuntu Pro helps Lucid meet FedRAMP compliance for government contracts", layout="25/75") -%}
+  {%- call(slot) vf_hero(
+    title_text="Ubuntu Pro helps Lucid meet FedRAMP compliance for government contracts", layout="25/75") -%}
     {% if slot == "signpost_image" %}
       {{ image(url="https://assets.ubuntu.com/v1/78188986-lucid-logo.png",
             alt="",
@@ -82,10 +84,11 @@
   {%- endcall -%}
 
   <!-- Quote section -->
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="If your goal is to achieve FedRAMP compliance, Ubuntu Pro with FIPS is the way to go.",
     citation_source_name_text="Rocky Olson",
-    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software"
+    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}
@@ -125,10 +128,11 @@
   {%- endcall -%}
 
   <!-- Quote section -->
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="We use Ubuntu in our internal environments, so for our certified packages, it was a no-brainer to use Ubuntu Pro.",
     citation_source_name_text="Rocky Olson",
-    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software"
+    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}
@@ -166,10 +170,11 @@
   {%- endcall -%}
 
   <!-- Quote section -->
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="We built our FEDRamp environment at breakneck speeds.  We got everything up and running in six months, and mirroring and understanding the Ubuntu Pro packages took less than two weeks. It was just so fast.",
     citation_source_name_text="Rocky Olson",
-    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software"
+    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}
@@ -199,10 +204,11 @@
   {%- endcall -%}
 
   <!-- Quote section -->
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="Ubuntu Pro didn't just help us with FIPs compliance. We also used the Ubuntu Security Guide tool to generate our CIS benchmarks. It was so easy that even our junior engineers could run with it.",
     citation_source_name_text="Rocky Olson",
-    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software"
+    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}
@@ -221,10 +227,11 @@
   {%- endcall -%}
 
   <!-- Quote section -->
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="Ultimately the project was straightforward. We needed FedRAMP compliance. We love using Ubuntu, making Ubuntu Pro a natural choice. It was easy to set up and we had great support, so there was no dragon to slay.",
     citation_source_name_text="Rocky Olson",
-    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software"
+    citation_source_title_text="Principal Software Engineer, SRE Operations, Lucid Software",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}

diff --git a/templates/case-study/sbi-bits.html b/templates/case-study/sbi-bits.html
@@ -1,10 +1,11 @@
 {% extends "case-study/base_case-study.html" %}
 
-{% from "macros/_macros-hero.jinja" import hero %}
+{% from "_macros/vf_hero.jinja" import vf_hero %}
+{% from "_macros/vf_quote-wrapper.jinja" import vf_quote_wrapper %}
+
 {% from "macros/_macros-text-list.jinja" import text_list %}
 {% from "macros/_macros-highlights.jinja" import highlights %}
 {% from "macros/_macros-text.jinja" import text %}
-{% from "macros/_macros-quote.jinja" import quote_wrapper %}
 {% from "macros/_macros-image.jinja" import image_wrapper %}
 {% from "macros/_macros-cta.jinja" import cta %}
 
@@ -21,7 +22,8 @@
 {% endblock %}
 
 {% block content %}
-  {%- call(slot) hero(title="SBI BITS puts business continuity at the heart of its OpenStack migration with hands-on support from Canonical",
+  {%- call(slot) vf_hero(
+    title_text="SBI BITS puts business continuity at the heart of its OpenStack migration with hands-on support from Canonical",
     layout="25/75",
     is_split_on_medium="true") -%}
     {% if slot == "signpost_image" %}
@@ -170,10 +172,11 @@
     {%- endif -%}
   {%- endcall -%}
 
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="[Our Dedicated Support Engineer] is like another member of my team – and I’m picky about my team members. He knows how the finserv industry works; he understands that we have to go through a process and can’t just fix things like a cowboy",
     citation_source_name_text="Spokesperson",
-    citation_source_organisation_text="SBI BITS"
+    citation_source_organisation_text="SBI BITS",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}
@@ -209,10 +212,11 @@
     {%- endif -%}
   {%- endcall -%}
 
-  {%- call(slot) quote_wrapper(
+  {%- call(slot) vf_quote_wrapper(
     quote_text="We’ve never considered switching providers. No other vendor could give us a perfect solution. We’ve built a great relationship with Canonical and the economics are good",
     citation_source_name_text="Spokesperson",
-    citation_source_organisation_text="SBI BITS"
+    citation_source_organisation_text="SBI BITS",
+    is_shallow=True
     )
     -%}
   {%- endcall -%}

diff --git a/templates/case-study/ubuntu-pro-support-for-games-developer.html b/templates/case-study/ubuntu-pro-support-for-games-developer.html
@@ -1,9 +1,10 @@
 {% extends "case-study/base_case-study.html" %}
 
-{% from "macros/_macros-hero.jinja" import hero %}
+{% from "_macros/vf_hero.jinja" import vf_hero %}
+{% from "_macros/vf_quote-wrapper.jinja" import vf_quote_wrapper %}
+
 {% from "macros/_macros-highlights.jinja" import highlights %}
 {% from "macros/_macros-text.jinja" import text %}
-{% from "macros/_macros-quote.jinja" import quote_wrapper %}
 {% from "macros/_macros-image.jinja" import image_wrapper %}
 {% from "macros/_macros-cta.jinja" import cta %}
 
@@ -22,8 +23,8 @@
 {% endblock %}
 
 {% block content %}
-    {%- call(slot) hero(title="Ubuntu Pro helps large games publisher secure code dependencies and avoid costly migration",
-        layout="",
+    {%- call(slot) vf_hero(
+        title_text="Ubuntu Pro helps large games publisher secure code dependencies and avoid costly migration",
         is_split_on_medium="true") -%}
     {%- endcall -%}
 
@@ -59,9 +60,10 @@
         {%- endif -%}
     {%- endcall -%}
 
-    {%- call(slot) quote_wrapper(
+    {%- call(slot) vf_quote_wrapper(
         quote_text="After the implementation it was pretty flawless. We did some measurements and there was no change in performance, so we were happy. The product is simply running and doing its job.",
         citation_source_name_text="Company spokesperson",
+        is_shallow=True
         )
         -%}
     {%- endcall -%}
@@ -99,16 +101,18 @@
         {%- endif -%}
     {%- endcall -%}
 
-    {%- call(slot) quote_wrapper(
+    {%- call(slot) vf_quote_wrapper(
         quote_text="Keeping all software maintained is expensive, and hiring new developers with proficiency in older versions of PHP can be very expensive and difficult.",
         citation_source_name_text="Company spokesperson",
+        is_shallow=True
         )
         -%}
     {%- endcall -%}
 
-    {%- call(slot) quote_wrapper(
+    {%- call(slot) vf_quote_wrapper(
         quote_text="If we had focused all the developers into migrating to a newer OS version, we would in that time also have no developers left to bring out new game content for 6 to 8 months. That would have been devastating.",
         citation_source_name_text="Company spokesperson",
+        is_shallow=True
         )
         -%}
     {%- endcall -%}
@@ -143,9 +147,10 @@
         {%- endif -%}
     {%- endcall -%}
 
-    {%- call(slot) quote_wrapper(
+    {%- call(slot) vf_quote_wrapper(
         quote_text="We had considered Ubuntu Pro before. Once it became clear that Ubuntu Pro's per-server cost included hypervisors with unlimited VMs, we did our cost analysis and it ended up being the go-to solution.",
         citation_source_name_text="Company spokesperson",
+        is_shallow=True
         )
         -%}
     {%- endcall -%}
@@ -167,9 +172,10 @@
         {%- endif -%}
     {%- endcall -%}
 
-    {%- call(slot) quote_wrapper(
+    {%- call(slot) vf_quote_wrapper(
         quote_text="The biggest surprise was that there was no surprise. The systems just work as before, and the developers got an extra two years added to their time frame for migration. It was amazing.",
         citation_source_name_text="Company spokesperson",
+        is_shallow=True
         )
         -%}
     {%- endcall -%}