Support formatted text in publication title & reduce use of getCurren…

…tPublication
pkp · Feb 28, 2023 · 74094c7 · 74094c7
1 parent 654f4e1
commit 74094c7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/resources/less/components/article.less b/resources/less/components/article.less
@@ -19,6 +19,12 @@
 	font-weight: 400;
 }
 
+.article__subtitle {
+	display: block;
+	font-size: smaller;
+	margin-top: 0.25em;
+}
+
 .article__img {
 	margin: 0 0 2.5vh 0;
 	min-width: 100%;

diff --git a/resources/less/components/metadata.less b/resources/less/components/metadata.less
@@ -26,3 +26,7 @@
     text-decoration: none;
   }
 }
+
+.subtitle {
+	margin-top: 0;
+}
diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl
@@ -60,9 +60,15 @@
 
 			{* Article title *}
 			<h1 class="main__title">
-				{$publication->getLocalizedFullTitle()|escape}
+				{$publication->getLocalizedTitle(null, 'html')|strip_unsafe_html}
 			</h1>
 
+			{if $publication->getLocalizedData('subtitle')}
+				<h2 class="subtitle">
+					{$publication->getLocalizedSubTitle(null, 'html')|strip_unsafe_html}
+				</h2>
+			{/if}
+
 			{* DOI *}
 			{foreach from=$pubIdPlugins item=pubIdPlugin}
 				{if $pubIdPlugin->getPubIdType() != 'doi'}

diff --git a/templates/frontend/objects/article_summary.tpl b/templates/frontend/objects/article_summary.tpl
@@ -16,20 +16,25 @@
  * @uses $primaryGenreIds array List of file genre ids for primary file types
  *}
 {assign var=articlePath value=$article->getBestArticleId()}
+{assign var="publication" value=$article->getCurrentPublication()}
 
-{if (!$section.hideAuthor && $article->getHideAuthor() == $smarty.const.AUTHOR_TOC_DEFAULT) || $article->getHideAuthor() == $smarty.const.AUTHOR_TOC_SHOW}
+{if (!$section.hideAuthor && $publication->getData('hideAuthor') == \APP\submission\Submission::AUTHOR_TOC_DEFAULT) || $publication->getData('hideAuthor') == \APP\submission\Submission::AUTHOR_TOC_SHOW}
 	{assign var="showAuthor" value=true}
 {/if}
 
 <article class="row article">
 	<div class="col-sm-{if $requestedPage == "catalog"}12{else}8{/if}">
 		<h4 class="article__title">
 			<a {if $journal}href="{url journal=$journal->getPath() page="article" op="view" path=$articlePath}"{else}href="{url page="article" op="view" path=$articlePath}"{/if}>
-				{$article->getLocalizedFullTitle()|escape}
+				{$publication->getLocalizedTitle(null, 'html')|strip_unsafe_html}
+				{assign var=localizedSubtitle value=$publication->getLocalizedSubtitle(null, 'html')|strip_unsafe_html}
+				{if $localizedSubtitle}
+					<span class="article__subtitle">{$localizedSubtitle}</span>
+				{/if}
 			</a>
 		</h4>
 		{if $showAuthor}
-			<p class="metadata">{$article->getCurrentPublication()->getAuthorString($authorUserGroups)|escape}</p>
+			<p class="metadata">{$publication->getAuthorString($authorUserGroups)|escape}</p>
 		{/if}
 		{call_hook name="Templates::Issue::Issue::Article"}
 	</div>
@@ -43,10 +48,10 @@
 					{/if}
 				{/if}
 				{assign var="hasArticleAccess" value=$hasAccess}
-				{if $currentContext->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_OPEN || $article->getCurrentPublication()->getData('accessStatus') == $smarty.const.ARTICLE_ACCESS_OPEN}
+				{if $currentContext->getSetting('publishingMode') == \APP\journal\Journal::PUBLISHING_MODE_OPEN || $publication->getData('accessStatus') == \APP\submission\Submission::ARTICLE_ACCESS_OPEN}
 					{assign var="hasArticleAccess" value=1}
 				{/if}
-				{include file="frontend/objects/galley_link.tpl" parent=$article hasAccess=$hasArticleAccess purchaseFee=$currentJournal->getSetting('purchaseArticleFee') purchaseCurrency=$currentJournal->getSetting('currency')}
+				{include file="frontend/objects/galley_link.tpl" parent=$article publication=$publication hasAccess=$hasArticleAccess purchaseFee=$currentJournal->getSetting('purchaseArticleFee') purchaseCurrency=$currentJournal->getSetting('currency')}
 			{/foreach}
 		{/if}
 	</div>

diff --git a/templates/frontend/objects/galley_link.tpl b/templates/frontend/objects/galley_link.tpl
@@ -40,7 +40,7 @@
 {else}
     {assign var="page" value="article"}
     {assign var="parentId" value=$parent->getBestArticleId()}
-    {if $publication && $publication->getId() !== $parent->getCurrentPublication()->getId()}
+    {if $publication && $publication->getId() !== $parent->getData('currentPublicationId')}
         {assign var="path" value=$parentId|to_array:"version":$publication->getId():$galley->getBestGalleyId()}
     {else}
         {assign var="path" value=$parentId|to_array:$galley->getBestGalleyId()}
@@ -56,7 +56,6 @@
     {/if}
 {/if}
 
-{* Don't be frightened. This is just a link *}
 <a class="{if $isSupplementary}btn btn-secondary galley_supplementary{else}btn btn-secondary{/if} {$type|escape}{if $restricted} restricted{/if}"
    href="{url page=$page op="view" path=$path}">