diff --git a/InlineHtmlGalleySidebarBlockPlugin.php b/InlineHtmlGalleySidebarBlockPlugin.php index a36cdee..6c9f88c 100644 --- a/InlineHtmlGalleySidebarBlockPlugin.php +++ b/InlineHtmlGalleySidebarBlockPlugin.php @@ -61,24 +61,6 @@ class InlineHtmlGalleyDoiSidebarBlockPlugin extends InlineHtmlGalleySidebarBlock function blockName() { return "doi"; } - - /** - * @copydoc BlockPlugin::getContents() - */ - function getContents($templateMgr, $request = null) { - if ($templateMgr && $request) { - $pubIdPlugins = $templateMgr->getTemplateVars('pubIdPlugins'); - if ($pubIdPlugins) { - foreach ($pubIdPlugins as $pubIdPlugin) { - if ($pubIdPlugin->getPubIdType() == 'doi') { - return parent::getContents($templateMgr, $request); - } - } - } - } - - return false; - } } class InlineHtmlGalleyCoverImageSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { diff --git a/templates/blockDoi.tpl b/templates/blockDoi.tpl index 93e7a68..49d1eb6 100644 --- a/templates/blockDoi.tpl +++ b/templates/blockDoi.tpl @@ -10,26 +10,18 @@ * *}
- {translate key="plugins.pubIds.doi.readerDisplayName"} - {* DOI (requires plugin) *} - {foreach from=$pubIdPlugins item=pubIdPlugin} - {if $pubIdPlugin->getPubIdType() != 'doi'} - {continue} - {/if} - {if $issue->getPublished()} - {assign var=pubId value=$article->getStoredPubId($pubIdPlugin->getPubIdType())} - {else} - {assign var=pubId value=$pubIdPlugin->getPubId($article)}{* Preview pubId *} - {/if} - {if $pubId} - {assign var="doiUrl" value=$pubIdPlugin->getResolvingURL($currentJournal->getId(), $pubId)|escape} + {translate key="doi.readerDisplayName"} + {* DOI *} + {assign var=doiObject value=$article->getCurrentPublication()->getData('doiObject')} + {if $doiObject} + {assign var="doi" value=$doiObject->getData('doi')} + {assign var="doiUrl" value=$doiObject->getData('resolvingUrl')|escape}
- {capture assign=translatedDoi}{translate key="plugins.pubIds.doi.readerDisplayName"}{/capture} + {capture assign=translatedDoi}{translate key="doi.readerDisplayName"}{/capture} {translate key="semicolon" label=$translatedDoi} - {$doiUrl} + {$doi}
- {/if} - {/foreach} + {/if}
\ No newline at end of file diff --git a/templates/blockPublishedDate.tpl b/templates/blockPublishedDate.tpl index 04e864d..45c6cf9 100644 --- a/templates/blockPublishedDate.tpl +++ b/templates/blockPublishedDate.tpl @@ -18,7 +18,7 @@
{capture assign=translatedDatePublished}{translate key="submissions.published"}{/capture} {translate key="semicolon" label=$translatedDatePublished} - {$publication->getData('datePublished')|date_format} + {$publication->getData('datePublished')|date_format:$dateFormatShort}
{* If this is an updated version *} {if $firstPublication->getID() !== $publication->getId()}