diff --git a/HealthSciencesThemePlugin.inc.php b/HealthSciencesThemePlugin.inc.php index 37a6aa9..33aa4e0 100644 --- a/HealthSciencesThemePlugin.inc.php +++ b/HealthSciencesThemePlugin.inc.php @@ -150,7 +150,7 @@ public function getDescription() { */ public function loadTemplateData($hookName, $args) { $templateMgr = $args[0]; - $request = Application::getRequest(); + $request = Application::get()->getRequest(); $context = $request->getContext(); if (!defined('SESSION_DISABLE_INIT')) { diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl index b72ba94..3277edf 100644 --- a/templates/frontend/objects/article_details.tpl +++ b/templates/frontend/objects/article_details.tpl @@ -362,18 +362,18 @@ {/if} {* References *} - {if $parsedCitations->getCount() || $article->getCitations()} + {if $parsedCitations || $publication->getData('citationsRaw')}

{translate key="submission.citations"}

- {if $parsedCitations->getCount()} - {iterate from=parsedCitations item=parsedCitation} + {if $parsedCitations} + {foreach from=$parsedCitations item=parsedCitation}

{$parsedCitation->getCitationWithLinks()|strip_unsafe_html}

- {/iterate} + {/foreach} {elseif $article->getCitations()} - {$article->getCitations()|nl2br} + {$publication->getData('citationsRaw')|nl2br} {/if}
diff --git a/templates/frontend/objects/article_summary.tpl b/templates/frontend/objects/article_summary.tpl index d653273..d6008c2 100644 --- a/templates/frontend/objects/article_summary.tpl +++ b/templates/frontend/objects/article_summary.tpl @@ -14,7 +14,7 @@ * @uses $hideGalleys bool Hide the article galleys for this article? * @uses $primaryGenreIds array List of file genre ids for primary file types *} -{assign var=articlePath value=$article->getBestArticleId()} +{assign var=articlePath value=$article->getBestId()} {if (!$section.hideAuthor && $article->getHideAuthor() == $smarty.const.AUTHOR_TOC_DEFAULT) || $article->getHideAuthor() == $smarty.const.AUTHOR_TOC_SHOW} {assign var="showAuthor" value=true} @@ -87,7 +87,7 @@ {/if} {/if} {assign var="hasArticleAccess" value=$hasAccess} - {if ($article->getAccessStatus() == $smarty.const.ARTICLE_ACCESS_OPEN)} + {if $currentContext->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_OPEN || $article->getCurrentPublication()->getData('accessStatus') == $smarty.const.ARTICLE_ACCESS_OPEN} {assign var="hasArticleAccess" value=1} {/if} {include file="frontend/objects/galley_link.tpl" parent=$article hasAccess=$hasArticleAccess} diff --git a/templates/frontend/objects/galley_link.tpl b/templates/frontend/objects/galley_link.tpl index 9a24c69..3ab4835 100644 --- a/templates/frontend/objects/galley_link.tpl +++ b/templates/frontend/objects/galley_link.tpl @@ -37,7 +37,7 @@ {assign var="parentId" value=$parent->getBestIssueId()} {else} {assign var="page" value="article"} - {assign var="parentId" value=$parent->getBestArticleId()} + {assign var="parentId" value=$parent->getBestId()} {/if} {* Get user access flag *} diff --git a/templates/frontend/pages/issueInterstitial.tpl b/templates/frontend/pages/issueInterstitial.tpl index 3e6bd66..a2d185a 100644 --- a/templates/frontend/pages/issueInterstitial.tpl +++ b/templates/frontend/pages/issueInterstitial.tpl @@ -19,7 +19,7 @@ {assign var="parentId" value=$parent->getBestIssueId()} {url op="view" path=$parentId} {else} - {assign var="parentId" value=$parent->getBestArticleId()} + {assign var="parentId" value=$parent->getBestId()} {url page="article" op="view" path=$parentId} {/if} {/capture} diff --git a/templates/frontend/pages/search.tpl b/templates/frontend/pages/search.tpl index 88492ae..349692e 100644 --- a/templates/frontend/pages/search.tpl +++ b/templates/frontend/pages/search.tpl @@ -45,7 +45,7 @@ {* Results pagination *} {else} {iterate from=results item=result} - {include file="frontend/objects/article_summary.tpl" article=$result.publishedArticle journal=$result.journal showDatePublished=true hideGalleys=true} + {include file="frontend/objects/article_summary.tpl" article=$result.publishedSubmission journal=$result.journal showDatePublished=true hideGalleys=true} {/iterate}
- getBestArticleId()}">{$article->getLocalizedTitle()|strip_unsafe_html} + getBestId()}">{$article->getLocalizedTitle()|strip_unsafe_html}
- {if (!$issueUnavailable || $article->getAccessStatus() == $smarty.const.ARTICLE_ACCESS_OPEN)} + {if (!$issueUnavailable || $publication->getData('accessStatus') == $smarty.const.ARTICLE_ACCESS_OPEN}}
{foreach from=$article->getGalleys() item=galley name=galleyList} - getBestArticleId()|to_array:$galley->getBestGalleyId()}" + getBestId()|to_array:$galley->getBestGalleyId()}" class="btn btn-primary">{$galley->getGalleyLabel()|escape} {/foreach}
diff --git a/templates/plugins/generic/htmlArticleGalley/templates/display.tpl b/templates/plugins/generic/htmlArticleGalley/templates/display.tpl index 4571be9..04595a7 100644 --- a/templates/plugins/generic/htmlArticleGalley/templates/display.tpl +++ b/templates/plugins/generic/htmlArticleGalley/templates/display.tpl @@ -17,19 +17,27 @@ {* Header wrapper *}
- getBestArticleId()}" class="return"> + getBestId()}" class="return"> {translate key="article.return"} - - getBestArticleId()}" class="title"> - {$article->getLocalizedTitle()|escape} + {if !$isLatestPublication} + + {else} + getBestId()}" class="title"> + {$galleyPublication->getLocalizedTitle()|escape} + {/if}
- +
{call_hook name="Templates::Common::Footer::PageFooter"} diff --git a/templates/plugins/generic/pdfJsViewer/templates/display.tpl b/templates/plugins/generic/pdfJsViewer/templates/display.tpl index 6d94da0..5189e32 100644 --- a/templates/plugins/generic/pdfJsViewer/templates/display.tpl +++ b/templates/plugins/generic/pdfJsViewer/templates/display.tpl @@ -23,9 +23,19 @@ {translate key="article.return"} {/if} - {$title} + {if $isLatestPublication} + {$title|escape} + {/if} + {if !$isLatestPublication} + + {/if}