pkp/pkp-lib#9253 Add site-level announcements

pkp · Nov 8, 2023 · 553f073 · 553f073
1 parent 3a30647
commit 553f073
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 30 deletions.
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -197,6 +197,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I9197_MigrateAccessKeys"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I9262_Highlights"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I9262_Highlights"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I9253_SiteAnnouncements"/>
 	</upgrade>
 
 	<!-- Update plugin configuration - should be done as the final upgrade task -->

diff --git a/pages/index/IndexHandler.php b/pages/index/IndexHandler.php
@@ -66,6 +66,7 @@ public function index($args, $request)
             'highlights' => $this->getHighlights($press),
         ]);
 
+        $this->_setupAnnouncements($journal ?? $request->getSite(), $templateMgr);
         if ($press) {
             // Display the current press home.
             $this->_displayPressIndexPage($press, $request);

diff --git a/plugins/themes/default/styles/components.less b/plugins/themes/default/styles/components.less
@@ -392,7 +392,8 @@
 }
 
 // Announcements
-.cmp_announcements {
+// Double class rule overrides .pkp_structure_main ul
+.cmp_announcements.cmp_announcements {
 	&:extend(.pkp_unstyled_list);
 	margin-left: -@base;
 	margin-right: -@base;

diff --git a/plugins/themes/default/styles/objects/announcement_summary.less b/plugins/themes/default/styles/objects/announcement_summary.less
@@ -55,3 +55,11 @@
 		.cmp_button_text(@fa-var-chevron-right);
 	}
 }
+
+@media (min-width: @screen-tablet) {
+	.obj_announcement_summary_has_image {
+		display: grid;
+		grid-template-columns: 33% auto;
+		gap: @triple;
+	}
+}
diff --git a/plugins/themes/default/styles/pages/index.less b/plugins/themes/default/styles/pages/index.less
@@ -49,6 +49,7 @@
 		}
 
 		> .obj_announcement_summary {
+			display: block;
 			position: relative;
 			padding: @triple @base;
 		}

diff --git a/templates/frontend/pages/index.tpl b/templates/frontend/pages/index.tpl
@@ -39,35 +39,7 @@
 		{include file="frontend/components/monographList.tpl" monographs=$newReleases titleKey="catalog.newReleases"}
 	{/if}
 
-	{* Announcements *}
-	{if $numAnnouncementsHomepage && $announcements|@count}
-		<div id="homepageAnnouncements" class="cmp_announcements highlight_first">
-			<h2>
-				{translate key="announcement.announcements"}
-			</h2>
-			{foreach name=announcements from=$announcements item=announcement}
-				{if $smarty.foreach.announcements.iteration > $numAnnouncementsHomepage}
-					{break}
-				{/if}
-				{if $smarty.foreach.announcements.iteration == 1}
-					{include file="frontend/objects/announcement_summary.tpl" heading="h3"}
-					<div class="more">
-				{else}
-					<article class="obj_announcement_summary">
-						<h4>
-							<a href="{url router=PKPApplication::ROUTE_PAGE page="announcement" op="view" path=$announcement->getId()}">
-								{$announcement->getLocalizedTitle()|escape}
-							</a>
-						</h4>
-						<div class="date">
-							{$announcement->getDatePosted()|date_format:$dateFormatShort}
-						</div>
-					</article>
-				{/if}
-			{/foreach}
-			</div><!-- .more -->
-		</div>
-	{/if}
+	{include file="frontend/objects/announcements_list.tpl" numAnnouncements=$numAnnouncementsHomepage}
 
 	{* Additional Homepage Content *}
 	{if $additionalHomeContent}

diff --git a/templates/frontend/pages/indexSite.tpl b/templates/frontend/pages/indexSite.tpl
@@ -22,6 +22,8 @@
 		</div>
 	{/if}
 
+	{include file="frontend/objects/announcements_list.tpl" numAnnouncements=$numAnnouncementsHomepage}
+
 	<div class="presses">
 		<h2>
 			{translate key="context.contexts"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ @@
     		</div>
     	{/if}
+    	{include file="frontend/objects/announcements_list.tpl" numAnnouncements=$numAnnouncementsHomepage}
     	<div class="presses">
     		<h2>
     			{translate key="context.contexts"}
@@ Expand Down @@