From 0b412e0ba35e44883a2e4cda07fc69ceae1019b5 Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Tue, 9 Apr 2024 13:59:01 +0000
Subject: [PATCH] Added right sidebar

---
 www/docs/style/sass/app.scss                  |  1 +
 www/docs/style/sass/pages/_business.scss      |  2 ++
 www/docs/style/sass/pages/_search.scss        |  1 -
 www/docs/style/sass/parts/_sidebar_right.scss |  9 +++++
 .../_sidebar_right_announcements.php          | 33 +++++++++++++++++++
 .../templates/html/divisions/index.php        |  1 +
 .../templates/html/people/index.php           |  4 +++
 .../html/section/_business_section.php        |  1 +
 8 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 www/docs/style/sass/parts/_sidebar_right.scss
 create mode 100644 www/includes/easyparliament/templates/html/announcements/_sidebar_right_announcements.php

diff --git a/www/docs/style/sass/app.scss b/www/docs/style/sass/app.scss
index 3484e5c59f..e0d038d7c3 100644
--- a/www/docs/style/sass/app.scss
+++ b/www/docs/style/sass/app.scss
@@ -267,5 +267,6 @@ form {
 @import "parts/regional-headers";
 @import "parts/toc";
 @import "parts/donate_form";
+@import "parts/sidebar_right";
 
 @import "print";
diff --git a/www/docs/style/sass/pages/_business.scss b/www/docs/style/sass/pages/_business.scss
index 155cc7ddc3..c97ecc4b2b 100644
--- a/www/docs/style/sass/pages/_business.scss
+++ b/www/docs/style/sass/pages/_business.scss
@@ -98,6 +98,7 @@
 
     .rss-feed {
         font-size: 0.8em;
+        margin-bottom: 1rem;
     }
 
     .calendar {
@@ -106,6 +107,7 @@
 }
 
 .business-section__secondary__item {
+    margin-bottom: 1em;
     h3 {
         color: $colour_grey;
         margin: 0;
diff --git a/www/docs/style/sass/pages/_search.scss b/www/docs/style/sass/pages/_search.scss
index 608aaeffe3..da29d6fe79 100644
--- a/www/docs/style/sass/pages/_search.scss
+++ b/www/docs/style/sass/pages/_search.scss
@@ -695,7 +695,6 @@ table.search-results-grouped {
 
   a {
     display: block;
-    border-bottom: 1px solid darken($body-bg, 5%);
     padding: 0.3em 0;
   }
 
diff --git a/www/docs/style/sass/parts/_sidebar_right.scss b/www/docs/style/sass/parts/_sidebar_right.scss
new file mode 100644
index 0000000000..de4ddf5e11
--- /dev/null
+++ b/www/docs/style/sass/parts/_sidebar_right.scss
@@ -0,0 +1,9 @@
+.sidebar__unit__featured_side--right {
+  padding: 2rem 1.5rem;
+  border-top: 1px solid #f3f1eb;
+  border-bottom: 1px solid #f3f1eb;
+  margin: -1px -1.5rem; // 1px Allows the horizontal borders at the top and bottom to collapse with each other when two boxes stack with each other .
+  & *:last-child {
+    margin-bottom: 0; 
+  }
+}
diff --git a/www/includes/easyparliament/templates/html/announcements/_sidebar_right_announcements.php b/www/includes/easyparliament/templates/html/announcements/_sidebar_right_announcements.php
new file mode 100644
index 0000000000..6de44d86bf
--- /dev/null
+++ b/www/includes/easyparliament/templates/html/announcements/_sidebar_right_announcements.php
@@ -0,0 +1,33 @@
+
+
+<?php $featured_item = $announcement_manager->get_random_valid_item("sidebar_right_donation"); ?>
+
+<?php if ( $featured_item ) { ?>
+
+<div class="sidebar__unit__featured_side sidebar__unit__featured_side--right">
+  <div class="featured_side__content">
+  <a href="<?= $featured_item->url ?>"><h3 class="content__title"><?= $featured_item->title ?></h3></a>
+  <p class="content__description"><?= $featured_item->content ?></p>  
+  <?php if (isset($featured_item->button_text)) { ?>
+  <a class="button content__button <?= $featured_item->button_class ?>" href="<?= $featured_item->url ?>"><?= (isset($featured_item->button_text) ? $featured_item->button_text : "Read more") ?></a>
+  <?php } ?>
+  </div>
+</div>
+
+<?php }; ?>
+
+<?php $featured_item = $announcement_manager->get_random_valid_item("sidebar_right_subscribe"); ?>
+
+<?php if ( $featured_item ) { ?>
+
+<div class="sidebar__unit__featured_side sidebar__unit__featured_side--right">
+  <div class="featured_side__content">
+  <a href="<?= $featured_item->url ?>"><h3 class="content__title"><?= $featured_item->title ?></h3></a>
+  <p class="content__description"><?= $featured_item->content ?></p>  
+  <?php if (isset($featured_item->button_text)) { ?>
+  <a class="button content__button <?= $featured_item->button_class ?>" href="<?= $featured_item->url ?>"><?= (isset($featured_item->button_text) ? $featured_item->button_text : "Read more") ?></a>
+  <?php } ?>
+  </div>
+</div>
+
+<?php }; ?>
diff --git a/www/includes/easyparliament/templates/html/divisions/index.php b/www/includes/easyparliament/templates/html/divisions/index.php
index 40759de6c2..7d4ebd0292 100644
--- a/www/includes/easyparliament/templates/html/divisions/index.php
+++ b/www/includes/easyparliament/templates/html/divisions/index.php
@@ -72,6 +72,7 @@
                         <a href="/voting-information"><?= gettext('Learn more about our voting records and what they mean.') ?></a>
                     </p>
                 </div>
+                <?php include dirname(__FILE__) . '/../announcements/_sidebar_right_announcements.php'; ?>
             </div>
         </div>
     </div>
diff --git a/www/includes/easyparliament/templates/html/people/index.php b/www/includes/easyparliament/templates/html/people/index.php
index f3d71791ba..5b07a9b23d 100644
--- a/www/includes/easyparliament/templates/html/people/index.php
+++ b/www/includes/easyparliament/templates/html/people/index.php
@@ -295,7 +295,11 @@
                     <a href="<?= $urls['plain'] ?>?all=1"><?= sprintf(gettext('Historical list of all %s'), $rep_plural) ?></a>
                     </p>
                 <?php } ?>
+
+                <?php include dirname(__FILE__) . '/../announcements/_sidebar_right_announcements.php'; ?>
+
             </div>
+
         </div>
 
     </div>
diff --git a/www/includes/easyparliament/templates/html/section/_business_section.php b/www/includes/easyparliament/templates/html/section/_business_section.php
index dfc62b5b70..451b74146d 100644
--- a/www/includes/easyparliament/templates/html/section/_business_section.php
+++ b/www/includes/easyparliament/templates/html/section/_business_section.php
@@ -29,6 +29,7 @@
                         <p class="rss-feed">
                             <a href="<?= WEBPATH . $content['rssurl'] ?>"><?= sprintf(gettext('RSS feed of %s'), $title) ?></a>
                         </p>
+                        <?php include dirname(__FILE__) . '/../announcements/_sidebar_right_announcements.php'; ?>
                     </div>
                   <?php } ?>
                 </div>