From 6dfb9da032073ad7aafaad5a0f01d8764af55c16 Mon Sep 17 00:00:00 2001 From: Aaryan Porwal Date: Tue, 24 Sep 2024 22:27:36 +0530 Subject: [PATCH 1/5] feat: Add ubuntu summit 24 page Co-authored-by: Aaron Prisk --- templates/summit/_base_summit.html | 8 + templates/summit/index.html | 356 +++++++++++++++++++++++++++++ 2 files changed, 364 insertions(+) create mode 100644 templates/summit/_base_summit.html create mode 100644 templates/summit/index.html diff --git a/templates/summit/_base_summit.html b/templates/summit/_base_summit.html new file mode 100644 index 00000000000..d8a63ed5bc9 --- /dev/null +++ b/templates/summit/_base_summit.html @@ -0,0 +1,8 @@ +{% extends "templates/base.html" %} + +{% set hide_nav = True %} + +{% block outer_content %} + + {% block content %}{% endblock %} +{% endblock %} diff --git a/templates/summit/index.html b/templates/summit/index.html new file mode 100644 index 00000000000..91c4f39a2a5 --- /dev/null +++ b/templates/summit/index.html @@ -0,0 +1,356 @@ +{% extends "summit/_base_summit.html" %} + +{% block title %}Ubuntu Summit 2024{% endblock %} + +{% block meta_description %} + The Ubuntu Summit is a showcase for the innovative and the ambitious. We invite all experts, builders, engineers, tinkerers, designers and dreamers to join us for an unforgettable three days. +{% endblock %} + +{% block meta_image %} + https://assets.ubuntu.com/v1/9e91caf9-Canonical%20Ubuntu%20Summit%20Logo%202024%20with%20text.svg +{% endblock %} + +{% block outer_content %} + + {% block content %} + + + +
+
+
+

Ubuntu Summit 2024

+

Oct 25-27, 2024

+

The Hague, Netherlands

+
    +
  • +

    + The Ubuntu Summit is a showcase for the innovative and the ambitious. We invite all experts, builders, engineers, tinkerers, designers and dreamers to join us for an unforgettable three days. +

    +
    • +
  • + Register for Free +
    • +
+
+
+ Ubuntu Summit 2024 Logo +
+
+
+
+
+
+

An event for makers

+

+ The Ubuntu Summit is a showcase of open source innovation. Bringing developers, engineers, designers and tinkerers from all over the world to shape the world through open code. +

+

Unsure if the Summit is for you? Listen to attendees from last year.

+
+
+ +
+
+
+
+
+

Featured Speakers

+
+
+
+ Mark Jackels +
+ +

Mark Jackels

+ +

Dreamworks

+
+
+
+
+
+ David Morin +
+ +

David Morin

+ +

Academy Software Foundation

+
+
+
+
+
+ Jose Blanquicet +
+ +

Jose Blanquicet

+ +

Microsoft

+
+
+
+
+
+ Thomas Crider +
+ +

Thomas Crider

+ +

Red Hat / Proton-GE

+
+
+
+
+
+ Carl Richell +
+ +

Carl Richell

+ +

System76

+
+
+
+
+
+ Dr. Kevin Ottens +
+ +

Dr. Kevin Ottens

+ +

KDE

+
+
+
+
+
+
+
+ Dongge Liu +
+ +

Dongge Liu

+ +

Google

+
+
+
+
+
+ Matthew Hodgson +
+ +

Matthew Hodgson

+ +

Matrix Foundation

+
+
+
+
+
+ Eric Holk +
+ +

Eric Holk

+ +

Rust Leadership Council

+
+
+
+
+
+ Rakhi Sharma +
+ +

Rakhi Sharma

+ +

Servo Project

+
+
+
+
+
+ Vinodh Raghunathan +
+ +

Vinodh Raghunathan

+ +

Intel / OPEA

+
+
+
+
+
+ Nirav Patel +
+ +

Nirav Patel

+ +

Framework

+
+
+
+
+
+ Full speaker list +
+
+
+ +
+
+

Community Booths

+

+ We're introducing a new element to the Ubuntu Summit experience. This year, attendees can visit a number of community focused booths stationed throughout the main venue space. +

+
+
+
+
+ Canonical +
+
+ Microsoft +
+
+ Thunderbird +
+
+ Asahi Linux +
+
+ Intel +
+
+ UBPorts +
+
+ System76 +
+
+ Framework +
+
+ Lutris +
+
+ Fairphone +
+
+ OpenSearch +
+
+ Snapcrafters +
+
+
+
+
+
+ +
+
+
+

Latest Summit News

+
+
+ +

Ubuntu Summit 2024: A logo takes flight

+ +

+ +

+
+
+ +

Ubuntu Summit 2024

+ +

+ +

+
+
+
+
+
+ + {% endblock content %} + +{% endblock outer_content %} From e96b06c9f9fcc1947481ea2e2584c8b6e69ef760 Mon Sep 17 00:00:00 2001 From: Aaryan Porwal Date: Fri, 27 Sep 2024 12:59:12 +0530 Subject: [PATCH 2/5] fix(summit) Align page body with navigation --- templates/summit/index.html | 569 ++++++++++++++++++------------------ 1 file changed, 282 insertions(+), 287 deletions(-) diff --git a/templates/summit/index.html b/templates/summit/index.html index 91c4f39a2a5..fb79c2b5ce2 100644 --- a/templates/summit/index.html +++ b/templates/summit/index.html @@ -10,14 +10,13 @@ https://assets.ubuntu.com/v1/9e91caf9-Canonical%20Ubuntu%20Summit%20Logo%202024%20with%20text.svg {% endblock %} -{% block outer_content %} +{% block content %} - {% block content %} - - -
-
-
-

Ubuntu Summit 2024

-

Oct 25-27, 2024

-

The Hague, Netherlands

-
    -
  • -

    - The Ubuntu Summit is a showcase for the innovative and the ambitious. We invite all experts, builders, engineers, tinkerers, designers and dreamers to join us for an unforgettable three days. -

    -
    • -
  • - Register for Free -
    • -
-
-
- Ubuntu Summit 2024 Logo -
+
+
+
+

Ubuntu Summit 2024

+

October 25-27

+

The Hague, Netherlands

+
    +
  • +

    + The Ubuntu Summit is a showcase for the innovative and the ambitious. We invite all experts, builders, engineers, tinkerers, designers and dreamers to join us for an unforgettable three days. +

    +
    • +
  • + Register for free +
    • +
+
+
+ Ubuntu Summit 2024 Logo
-
-
-
-

An event for makers

-

- The Ubuntu Summit is a showcase of open source innovation. Bringing developers, engineers, designers and tinkerers from all over the world to shape the world through open code. -

-

Unsure if the Summit is for you? Listen to attendees from last year.

-
-
- -
+
+
+
+
+

An event for makers

+

+ The Ubuntu Summit is a showcase of open source innovation. Bringing developers, engineers, designers and tinkerers from all over the world to shape the world through open code. +

+

Unsure if the Summit is for you? Listen to attendees from last year.

-
-
-
-

Featured Speakers

-
-
-
- Mark Jackels -
- -

Mark Jackels

- -

Dreamworks

+
+ +
+
+
+
+
+

Featured Speakers

+
+
+
+ Mark Jackels
+ +

Mark Jackels

+ +

Dreamworks

-
-
-
- David Morin -
- -

David Morin

- -

Academy Software Foundation

+
+
+
+
+ David Morin
+ +

David Morin

+ +

Academy Software Foundation

-
-
-
- Jose Blanquicet -
- -

Jose Blanquicet

- -

Microsoft

+
+
+
+
+ Jose Blanquicet
+ +

Jose Blanquicet

+ +

Microsoft

-
-
-
- Thomas Crider -
- -

Thomas Crider

- -

Red Hat / Proton-GE

+
+
+
+
+ Thomas Crider
+ +

Thomas Crider

+ +

Red Hat / Proton-GE

-
-
-
- Carl Richell -
- -

Carl Richell

- -

System76

+
+
+
+
+ Carl Richell
+ +

Carl Richell

+ +

System76

-
-
-
- Dr. Kevin Ottens -
- -

Dr. Kevin Ottens

- -

KDE

+
+
+
+
+ Dr. Kevin Ottens
+ +

Dr. Kevin Ottens

+ +

KDE

-
-
-
-
- Dongge Liu -
- -

Dongge Liu

- -

Google

+
+
+
+
+
+ Dongge Liu
+ +

Dongge Liu

+ +

Google

-
-
-
- Matthew Hodgson -
- -

Matthew Hodgson

- -

Matrix Foundation

+
+
+
+
+ Matthew Hodgson
+ +

Matthew Hodgson

+ +

Matrix Foundation

-
-
-
- Eric Holk -
- -

Eric Holk

- -

Rust Leadership Council

+
+
+
+
+ Eric Holk
+ +

Eric Holk

+ +

Rust Leadership Council

-
-
-
- Rakhi Sharma -
- -

Rakhi Sharma

- -

Servo Project

+
+
+
+
+ Rakhi Sharma
+ +

Rakhi Sharma

+ +

Servo Project

-
-
-
- Vinodh Raghunathan -
- -

Vinodh Raghunathan

- -

Intel / OPEA

+
+
+
+
+ Vinodh Raghunathan
+ +

Vinodh Raghunathan

+ +

Intel / OPEA

-
-
-
- Nirav Patel -
- -

Nirav Patel

- -

Framework

+
+
+
+
+ Nirav Patel
+ +

Nirav Patel

+ +

Framework

-
-
- Full speaker list -
+
+
+
+ Full speaker list
-
+
+ -
-
-

Community Booths

-

- We're introducing a new element to the Ubuntu Summit experience. This year, attendees can visit a number of community focused booths stationed throughout the main venue space. -

-
-
-
-
- Canonical -
-
- Microsoft -
-
- Thunderbird -
-
- Asahi Linux -
-
- Intel -
-
- UBPorts -
-
- System76 -
-
- Framework -
-
- Lutris -
-
- Fairphone -
-
- OpenSearch -
-
- Snapcrafters -
+
+
+

Community booths

+

+ We're introducing a new element to the Ubuntu Summit experience. This year, attendees can visit a number of community focused booths stationed throughout the main venue space. +

+
+
+
+
+ Canonical +
+
+ Microsoft +
+
+ Thunderbird +
+
+ Asahi Linux +
+
+ Intel +
+
+ UBPorts +
+
+ System76 +
+
+ Framework +
+
+ Lutris +
+
+ Fairphone +
+
+ OpenSearch +
+
+ Snapcrafters
-
+
+
-
-
-
-

Latest Summit News

-
-
- -

Ubuntu Summit 2024: A logo takes flight

- -

- -

-
-
- -

Ubuntu Summit 2024

- -

- -

-
+
+
+
+

Latest Summit News

+
+
+ +

Ubuntu Summit 2024: A logo takes flight

+ +

+ +

+
+
+ +

Ubuntu Summit 2024

+ +

+ +

-
- - {% endblock content %} +
+
-{% endblock outer_content %} +{% endblock content %} From 95b17e4193dd81a09d5c5548811b03106d91b704 Mon Sep 17 00:00:00 2001 From: Aaryan Porwal Date: Mon, 30 Sep 2024 20:55:23 +0530 Subject: [PATCH 3/5] Replace strips, dark strips, updated blog section --- templates/download/cloud/index.html | 2 +- templates/summit/index.html | 192 ++++++++++++---------------- 2 files changed, 86 insertions(+), 108 deletions(-) diff --git a/templates/download/cloud/index.html b/templates/download/cloud/index.html index d4742b63960..2d85e09eb3d 100755 --- a/templates/download/cloud/index.html +++ b/templates/download/cloud/index.html @@ -164,7 +164,7 @@

- {% with title_link="/blog/tag/ubuntu-server", tagId="1610" %} + {% with title_link="/blog/tag/ubuntu-server", tag_id="1610" %} {% include "download/shared/_latest-blogs_download.html" %} {% endwith %} diff --git a/templates/summit/index.html b/templates/summit/index.html index fb79c2b5ce2..9ecf120ac11 100644 --- a/templates/summit/index.html +++ b/templates/summit/index.html @@ -43,23 +43,19 @@
-
+

Ubuntu Summit 2024

October 25-27

The Hague, Netherlands

-
    -
  • -

    - The Ubuntu Summit is a showcase for the innovative and the ambitious. We invite all experts, builders, engineers, tinkerers, designers and dreamers to join us for an unforgettable three days. -

    -
    • -
  • - Register for free -
    • -
+

+ The Ubuntu Summit is a showcase for the innovative and the ambitious. We invite all experts, builders, engineers, tinkerers, designers and dreamers to join us for an unforgettable three days. +

+

+ Register for free +

The Hague, Netherlands
-
-
-
+
+
+
+

An event for makers

The Ubuntu Summit is a showcase of open source innovation. Bringing developers, engineers, designers and tinkerers from all over the world to shape the world through open code.

Unsure if the Summit is for you? Listen to attendees from last year.

-
+
+ allowfullscreen> +
-
+
+

Featured Speakers

@@ -245,107 +244,86 @@

Nirav Patel

class="p-button">Full speaker list
+
-
+
+

Community booths

We're introducing a new element to the Ubuntu Summit experience. This year, attendees can visit a number of community focused booths stationed throughout the main venue space.

-
-
-
-
- Canonical -
-
- Microsoft -
-
- Thunderbird -
-
- Asahi Linux -
-
- Intel -
-
- UBPorts -
-
- System76 -
-
- Framework -
-
- Lutris -
-
- Fairphone -
-
- OpenSearch -
-
- Snapcrafters -
-
-
-
-
-
-
-
-
-

Latest Summit News

-
-
- -

Ubuntu Summit 2024: A logo takes flight

- -

- -

+
+
+
+ Canonical +
+
+ Microsoft +
+
+ Thunderbird
-
- -

Ubuntu Summit 2024

- -

- -

+
+ Asahi Linux +
+
+ Intel +
+
+ UBPorts +
+
+ System76 +
+
+ Framework +
+
+ Lutris +
+
+ Fairphone +
+
+ OpenSearch +
+
+ Snapcrafters
+ {% with title_link="/blog/tag/ubuntu-summit", tag_id="4374" %} + {% include "download/shared/_latest-blogs_download.html" %} + {% endwith %} + {% endblock content %} From aa1b58a9d64649baa99ec7e945fc4ce67157c2a0 Mon Sep 17 00:00:00 2001 From: Aaryan Porwal Date: Thu, 3 Oct 2024 15:06:30 +0530 Subject: [PATCH 4/5] fix: Update heading styles, logo sizes and iframe padding --- templates/summit/index.html | 55 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/templates/summit/index.html b/templates/summit/index.html index 9ecf120ac11..ae6ef9939f3 100644 --- a/templates/summit/index.html +++ b/templates/summit/index.html @@ -46,9 +46,9 @@
-

Ubuntu Summit 2024

-

October 25-27

-

The Hague, Netherlands

+

Ubuntu Summit 2024

+

October 25-27

+

The Hague, Netherlands

The Ubuntu Summit is a showcase for the innovative and the ambitious. We invite all experts, builders, engineers, tinkerers, designers and dreamers to join us for an unforgettable three days.

@@ -77,7 +77,6 @@

An event for makers

+