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 994cc44..cd30fdc 100644 --- a/templates/frontend/objects/article_details.tpl +++ b/templates/frontend/objects/article_details.tpl @@ -32,6 +32,17 @@
+ {* Notification that this is an old version *} + {if $currentPublication->getId() !== $publication->getId()} + + {/if} + {* Title and issue details *}
getBestIssueId()}">{$issue->getIssueSeries()|escape}{if $section}, {$section->getLocalizedTitle()|escape}{/if} @@ -42,7 +53,7 @@

- {$article->getLocalizedFullTitle()|escape} + {$publication->getLocalizedFullTitle()|escape}

{if $section} @@ -63,16 +74,23 @@ {/if} {/foreach} - {* Date published *} - {if $article->getDatePublished()} + {* Date published & updated *} + {if $publication->getData('datePublished')}
- {translate key="plugins.themes.healthSciences.currentIssuePublished" date=$article->getDatePublished()|date_format:$dateFormatLong} + {translate key="submissions.published"} + {* If this is the original version *} + {if $firstPublication->getID() === $publication->getId()} + {$firstPublication->getData('datePublished')|date_format:$dateFormatShort} + {* If this is an updated version *} + {else} + {translate key="submission.updatedOn" datePublished=$firstPublication->getData('datePublished')|date_format:$dateFormatShort dateUpdated=$publication->getData('datePublished')|date_format:$dateFormatShort} + {/if}
{/if} - {if $article->getAuthors()} + {if $publication->getData('authors')}
    - {foreach from=$article->getAuthors() item=authorString key=authorStringKey} + {foreach from=$publication->getData('authors') item=authorString key=authorStringKey} {strip}
  • {if $authorString->getLocalizedAffiliation() or $authorString->getLocalizedBiography()} @@ -93,10 +111,10 @@
{* Authors *} - {assign var="authorCount" value=$article->getAuthors()|@count} + {assign var="authorCount" value=$publication->getData('authors')|@count} {assign var="authorBioIndex" value=0}
- {foreach from=$article->getAuthors() item=author key=authorKey} + {foreach from=$publication->getData('authors') item=author key=authorKey}
{$author->getFullName()|escape} @@ -157,13 +175,22 @@
{* Article/Issue cover image *} - {if $article->getLocalizedCoverImage() || $issue->getLocalizedCoverImage()} + {if $publication->getLocalizedData('coverImage') || ($issue && $issue->getLocalizedCoverImage())}
- {if $article->getLocalizedCoverImage()} - getLocalizedCoverImageAltText()} alt="{$article->getLocalizedCoverImageAltText()|escape}"{/if}> + {if $publication->getLocalizedData('coverImage')} + {assign var="coverImage" value=$publication->getLocalizedData('coverImage')} + {$coverImage.altText|escape|default:''} {else} getBestIssueId()}"> - getLocalizedCoverImageAltText()} alt="{$issue->getLocalizedCoverImageAltText()|escape}"{/if}> + {$issue->getLocalizedCoverImageAltText()|escape|default:''} {/if}
@@ -176,6 +203,30 @@ {/foreach} {/capture} + {* Display other versions *} + {if $publication->getData('datePublished')} + {if count($article->getPublishedPublications()) > 1} +
+

+ {translate key="submission.versions"} +

+
    + {foreach from=array_reverse($article->getPublishedPublications()) item=iPublication} + {capture assign="name"}{translate key="submission.versionIdentity" datePublished=$iPublication->getData('datePublished')|date_format:$dateFormatShort version=$iPublication->getData('version')}{/capture} +
  • + {if $iPublication->getId() === $publication->getId()} + {$name} + {elseif $iPublication->getId() === $currentPublication->getId()} + getBestId()}">{$name} + {else} + getBestId()|to_array:"version":$iPublication->getId()}">{$name} + {/if} +
    • + {/foreach} +
+
+ {/if} + {/if} {* Article Galleys (sidebar -- only visible on small devices) *} {if $primaryGalleys} @@ -287,10 +338,10 @@
{* Abstract *} - {if $article->getLocalizedAbstract()} + {if $publication->getLocalizedData('abstract')}

{translate key="article.abstract"}

- {$article->getLocalizedAbstract()|strip_unsafe_html} + {$publication->getLocalizedData('abstract')|strip_unsafe_html}
{/if} @@ -320,18 +371,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} - {elseif $article->getCitations()} - {$article->getCitations()|nl2br} + {/foreach} + {else} + {$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/objects/issue_toc.tpl b/templates/frontend/objects/issue_toc.tpl index b24e682..59124dd 100644 --- a/templates/frontend/objects/issue_toc.tpl +++ b/templates/frontend/objects/issue_toc.tpl @@ -12,14 +12,14 @@ * @uses $issueSeries string Vol/No/Year string for the issue * @uses $issueGalleys array Galleys for the entire issue * @uses $hasAccess bool Can this user access galleys for this context? - * @uses $publishedArticles array Lists of articles published in this issue + * @uses $publishedSubmissions array Lists of articles published in this issue * sorted by section. * @uses $primaryGenreIds array List of file genre ids for primary file types * @uses $sectionHeading string Tag to use (h2, h3, etc) for section headings *}
- {foreach name=sections from=$publishedArticles item=section} + {foreach name=sections from=$publishedSubmissions item=section}
{if $section.articles} {if $section.title} 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} + {if !$isLatestPublication} + + {/if}