From a877a5886bda22e7a7cfb85fb8e59593584bb95b Mon Sep 17 00:00:00 2001
From: smarcet <smarcet@gmail.com>
Date: Tue, 26 Mar 2024 16:18:06 -0300
Subject: [PATCH] chore: add Announcement banner back

* home page
* software page
* user stories page

fix : updated announcement banner
---
 software/templates/SoftwareHomePage.ss                 |  4 +++-
 software/templates/SoftwareSubPage.ss                  |  2 +-
 .../templates/Layout/Includes/AnnouncementBanner.ss    | 10 ++++++----
 themes/openstack/templates/Layout/NewHomePage.ss       |  1 +
 user-stories/templates/Layout/UserStoriesPage.ss       |  3 +++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/software/templates/SoftwareHomePage.ss b/software/templates/SoftwareHomePage.ss
index 18f5f1b01..62dabb852 100644
--- a/software/templates/SoftwareHomePage.ss
+++ b/software/templates/SoftwareHomePage.ss
@@ -32,7 +32,9 @@
         <% include SiteBanner %>
         <% include Navigation %>
         <!-- Page Content -->
-        
+        <div class="software-announcement-banner">
+            <% include AnnouncementBanner %>
+        </div>s
         $Message
         <div class="container software">
             <div class="row">
diff --git a/software/templates/SoftwareSubPage.ss b/software/templates/SoftwareSubPage.ss
index 65e963c0e..a46189a32 100644
--- a/software/templates/SoftwareSubPage.ss
+++ b/software/templates/SoftwareSubPage.ss
@@ -29,7 +29,7 @@
         <% include SiteBanner %>
         <% include Navigation %>
     <!-- Page Content -->
-   
+        <% include AnnouncementBanner %>
         $Message
     <div class="container software">
         <div class="row">
diff --git a/themes/openstack/templates/Layout/Includes/AnnouncementBanner.ss b/themes/openstack/templates/Layout/Includes/AnnouncementBanner.ss
index 498be4af2..ac2b1c1cf 100644
--- a/themes/openstack/templates/Layout/Includes/AnnouncementBanner.ss
+++ b/themes/openstack/templates/Layout/Includes/AnnouncementBanner.ss
@@ -8,17 +8,19 @@
                 <div class="col-md-12 col-sm-12">
                     <div class="summit-announcement-header-container">
                         <img class="summit-announcement-banner-img-lg" style="height:42px;width: 42px;display: inline-block;" src="https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/OpenInfrastructureFoundation-icon-RGB.svg">
-                        <h2>OpenInfra Summit Vancouver <br/><span>(formerly the OpenStack Summit)</span></h2>
+                        <h2>OpenInfra Summit > Asia'24</h2>
                     </div>
-                    <p style="padding-top:15px;">Join the OpenStack community in <b>Vancouver from June 13 - 15</b> to hear how <b>NVIDIA</b> is running OpenStack for AI, different <b>OpenStack + Kubernetes</b> production use cases, and how organizations like <b>Bloomberg, LINE and CERN</b> continue to scale their OpenStack footprint.</p>
+                    <p style="padding-top:15px;">
+                        Join the OpenStack community in Suwon, South Korea from September 3-4 at the first regional OpenInfra Summit Asia! Hear how OpenStack developers and operators are collaborating to define AI requirements, new OpenStack + Kubernetes production use cases and how organizations continue to scale their OpenStack footprint.
+                    </p>
                 </div>
             </div>
         </div>
         <div class="col-md-4 col-xs-12 col-sm-12 col-lg-4">
             <div class="row">
                 <div class="col-xs-12 col-sm-12 col-lg-12 cta-container">
-                <p>Only <span id="summit-announcement-timer">49</span> days left until the OpenInfra Summit!</p>
-                    <a id="vancouver-banner-btn" href="https://openinfra.dev/summit/vancouver-2023">Register Now
+                <p>Submit to the CFP! Deadline: May 29, 2024</p>
+                    <a id="vancouver-banner-btn" href="https://openinfrafoundation.formstack.com/forms/openinfra_asia_summit_2024">Submit Now
                         <svg width="21" height="11" viewBox="0 0 21 11" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path d="M15.4828 1L19.6207 5.48M19.6207 5.48L15.4828 9.96M19.6207 5.48L1 5.48" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
                         </svg>
diff --git a/themes/openstack/templates/Layout/NewHomePage.ss b/themes/openstack/templates/Layout/NewHomePage.ss
index bf9b5a88c..a7c481821 100644
--- a/themes/openstack/templates/Layout/NewHomePage.ss
+++ b/themes/openstack/templates/Layout/NewHomePage.ss
@@ -29,6 +29,7 @@
 <!-- /.intro-header -->
 
 <!-- Page Content -->
+<% include AnnouncementBanner %>
 <!-- /.news-anniversary -->
 
 <!-- Page Content -->
diff --git a/user-stories/templates/Layout/UserStoriesPage.ss b/user-stories/templates/Layout/UserStoriesPage.ss
index dbd56990f..3f3d7abc0 100644
--- a/user-stories/templates/Layout/UserStoriesPage.ss
+++ b/user-stories/templates/Layout/UserStoriesPage.ss
@@ -1,4 +1,7 @@
 </div> <!-- Killing the main site .container -->
+<div class="user-stories-announcement-banner">
+<% include AnnouncementBanner %>
+</div>
 
 <div class="user-stories-hero container">
     <div class="row">