From bcb5b3e01efedf9ebc277440e803701ac0b44c00 Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Tue, 12 Nov 2024 15:11:49 -0400 Subject: [PATCH 01/19] fix tests --- .github/actions/tests.sh | 3 +-- .github/workflows/main.yml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/tests.sh b/.github/actions/tests.sh index fe3d231..b69c1ee 100755 --- a/.github/actions/tests.sh +++ b/.github/actions/tests.sh @@ -4,5 +4,4 @@ set -e npx cypress run --spec "cypress/tests/data/10-ApplicationSetup/*.cy.js,cypress/tests/data/60-content/VkarbasizaedSubmission.cy.js" -npx cypress run --config specPattern=plugins/themes/pragma/cypress/tests/functional - +npx cypress run --headless --browser chrome --config '{"specPattern":["plugins/themes/pragma/cypress/tests/functional/*.cy.js"]}' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 73b586d..8090a87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,4 +28,3 @@ jobs: branch: main repository: pkp plugin: true - From 4d79bc5128cddcb78913e579d166e7d7cd833345 Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Fri, 3 Jan 2025 13:31:59 -0400 Subject: [PATCH 02/19] update announcement template functions --- .../frontend/objects/announcement_summary.tpl | 16 ++++++++-------- templates/frontend/pages/announcement.tpl | 16 ++++++++-------- templates/frontend/pages/indexJournal.tpl | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/frontend/objects/announcement_summary.tpl b/templates/frontend/objects/announcement_summary.tpl index 5047311..7aca60d 100644 --- a/templates/frontend/objects/announcement_summary.tpl +++ b/templates/frontend/objects/announcement_summary.tpl @@ -1,8 +1,8 @@ {** * templates/frontend/objects/announcement_summary.tpl * - * Copyright (c) 2014-2020 Simon Fraser University - * Copyright (c) 2003-2020 John Willinsky + * Copyright (c) 2014-2025 Simon Fraser University + * Copyright (c) 2003-2025 John Willinsky * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. * * @brief Display a summary view of an announcement @@ -15,21 +15,21 @@ {/if} <{$heading}> - getId()}"> - {$announcement->getLocalizedTitle()|escape} + id}"> + {$announcement->getLocalizedData('title')|escape}
- {$announcement->getDatePosted()|date_format:$dateFormatShort} + {$announcement->datePosted|date_format:$dateFormatShort}
- {$announcement->getLocalizedDescriptionShort()|strip_unsafe_html} + {$announcement->getLocalizedData('descriptionShort')|strip_unsafe_html}
-getId()}" class="btn btn-secondary"> +id}" class="btn btn-secondary"> diff --git a/templates/frontend/pages/announcement.tpl b/templates/frontend/pages/announcement.tpl index 7e6c0e0..741da19 100644 --- a/templates/frontend/pages/announcement.tpl +++ b/templates/frontend/pages/announcement.tpl @@ -1,15 +1,15 @@ {** * templates/frontend/pages/announcements.tpl * - * Copyright (c) 2014-2020 Simon Fraser University - * Copyright (c) 2003-2020 John Willinsky + * Copyright (c) 2014-2025 Simon Fraser University + * Copyright (c) 2003-2025 John Willinsky * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. * * @brief Display the page which represents a single announcement * * @uses $announcement Announcement The announcement to display *} -{include file="frontend/components/header.tpl" pageTitleTranslated=$announcement->getLocalizedTitle()|escape} +{include file="frontend/components/header.tpl" pageTitleTranslated=$announcement->getLocalizedData('title')|escape}
@@ -19,17 +19,17 @@

{translate key="announcement.announcements"}

- {$announcement->getLocalizedTitle()|escape} + {$announcement->getLocalizedData('title')|escape}

- {$announcement->getDatePosted()|date_format:$dateFormatShort} + {$announcement->datePosted|date_format:$dateFormatShort}

- {if $announcement->getLocalizedDescription()} - {$announcement->getLocalizedDescription()|strip_unsafe_html} + {if $announcement->getLocalizedData('description')} + {$announcement->getLocalizedData('description')|strip_unsafe_html} {else} - {$announcement->getLocalizedDescriptionShort()|strip_unsafe_html} + {$announcement->getLocalizedData('descriptionShort')|strip_unsafe_html} {/if}
diff --git a/templates/frontend/pages/indexJournal.tpl b/templates/frontend/pages/indexJournal.tpl index db1ddf7..7a5a5b7 100644 --- a/templates/frontend/pages/indexJournal.tpl +++ b/templates/frontend/pages/indexJournal.tpl @@ -60,14 +60,14 @@ {break} {/if}
-

{$announcement->getLocalizedTitle()|escape}

-

{$announcement->getDatePosted()|date_format:$dateFormatLong}

-

{$announcement->getLocalizedDescriptionShort()|strip_unsafe_html}

-

- {capture assign="announcementPageUrl"}{url router=$smarty.const.ROUTE_PAGE page="announcement" op="view" path=$announcement->getId()}{/capture} - {translate key="common.more"} -

-
+

{$announcement->getLocalizedData('title')|escape}

+

{$announcement->datePosted|date_format:$dateFormatLong}

+

{$announcement->getLocalizedData('descriptionShort')|strip_unsafe_html}

+

+ {capture assign="announcementPageUrl"}{url router=$smarty.const.ROUTE_PAGE page="announcement" op="view" path=$announcement->id}{/capture} + {translate key="common.more"} +

+ {/foreach}
{if $numAnnouncementsHomepage > 1 && $announcements|@count > 1} From 5fe4533f46ede8c3c6a182f83419467b1023be1b Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Fri, 3 Jan 2025 14:04:59 -0400 Subject: [PATCH 03/19] pkp/pkp-lib#10200 remove editorial team, add editorial masthead and history templates --- resources/less/import.less | 4 +- resources/less/pages/masthead.less | 34 ++++++++ templates/frontend/pages/editorialHistory.tpl | 61 ++++++++++++++ .../frontend/pages/editorialMasthead.tpl | 84 +++++++++++++++++++ templates/frontend/pages/editorialTeam.tpl | 30 ------- 5 files changed, 182 insertions(+), 31 deletions(-) create mode 100644 resources/less/pages/masthead.less create mode 100644 templates/frontend/pages/editorialHistory.tpl create mode 100644 templates/frontend/pages/editorialMasthead.tpl delete mode 100755 templates/frontend/pages/editorialTeam.tpl diff --git a/resources/less/import.less b/resources/less/import.less index cf5a530..7011c14 100644 --- a/resources/less/import.less +++ b/resources/less/import.less @@ -9,7 +9,7 @@ * */ -// styleshets +// stylesheets @import "fonts"; @import "variables"; @import "general"; @@ -31,3 +31,5 @@ @import "components/modal"; @import "components/recent-issues"; @import "components/catalog-category"; + +@import "pages/masthead"; diff --git a/resources/less/pages/masthead.less b/resources/less/pages/masthead.less new file mode 100644 index 0000000..2169ed5 --- /dev/null +++ b/resources/less/pages/masthead.less @@ -0,0 +1,34 @@ +/* + * @file less/pages/masthead.less + * + * Copyright (c) 2025 Simon Fraser University + * Copyright (c) 2025 John Willinsky + * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. + * + * @brief Styles applying to the masthead and editorial history page + * @link templates/frontend/pages/editorialMasthead.tpl + * @link templates/frontend/pages/editorialHistory.tpl + */ + +.page_masthead { + .user_listing { + list-style-type: none; + padding: 2em 0; + + li { + margin-bottom: 35px; + } + + li > span { + display: block; + } + + .name { + font-weight: bold; + } + + .orcid_icon { + margin-left: 5px; + } + } +} diff --git a/templates/frontend/pages/editorialHistory.tpl b/templates/frontend/pages/editorialHistory.tpl new file mode 100644 index 0000000..88f8c8d --- /dev/null +++ b/templates/frontend/pages/editorialHistory.tpl @@ -0,0 +1,61 @@ +{** + * templates/frontend/pages/editorialHistory.tpl + * + * Copyright (c) 2025 Simon Fraser University + * Copyright (c) 2025 John Willinsky + * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. + * + * @brief Display context's editorial history page. + * + *} +{include file="frontend/components/header.tpl" pageTitle="common.editorialHistory"} + +
+
+
+
+

+ {translate key="common.editorialHistory.page"} +

+
+ +

{translate key="common.editorialHistory.page.description"}

+ {foreach from=$mastheadRoles item="mastheadRole"} + {if array_key_exists($mastheadRole->id, $mastheadUsers)} +

{$mastheadRole->getLocalizedData('name')|escape}

+
    + {foreach from=$mastheadUsers[$mastheadRole->id] item="mastheadUser"} +
  • + {strip} + + {foreach name="services" from=$mastheadUser['services'] item="service"} + {translate key="common.fromUntil" from=$service['dateStart'] until=$service['dateEnd']} + {if !$smarty.foreach.services.last}{translate key="common.commaListSeparator"}{/if} + {/foreach} + + + {$mastheadUser['user']->getFullName()|escape} + {if $mastheadUser['user']->getData('orcid') && $mastheadUser['user']->getData('orcidAccessToken')} + + getFullName()|escape}"> + {$orcidIcon} + + + {/if} + + {if !empty($mastheadUser['user']->getLocalizedData('affiliation'))} + {$mastheadUser['user']->getLocalizedData('affiliation')|escape} + {/if} + {/strip} +
    • + {/foreach} +
+ {/if} + {/foreach} +
+
+ {include file="frontend/components/editLink.tpl" page="management" op="settings" path="context" anchor="masthead" sectionTitleKey="common.editorialHistory"} + {$currentContext->getLocalizedData('editorialHistory')} +
+ +{include file="frontend/components/footer.tpl"} diff --git a/templates/frontend/pages/editorialMasthead.tpl b/templates/frontend/pages/editorialMasthead.tpl new file mode 100644 index 0000000..59dd1de --- /dev/null +++ b/templates/frontend/pages/editorialMasthead.tpl @@ -0,0 +1,84 @@ +{** + * templates/frontend/pages/editorialMasthead.tpl + * + * Copyright (c) 2025 Simon Fraser University + * Copyright (c) 2025 John Willinsky + * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. + * + * @brief Display context's editorial masthead page. + * + *} +{include file="frontend/components/header.tpl" pageTitle="common.editorialMasthead"} + +
+
+
+
+

+ {translate key="common.editorialMasthead"} +

+
+ + {foreach from=$mastheadRoles item="mastheadRole"} + {if array_key_exists($mastheadRole->id, $mastheadUsers)} +

{$mastheadRole->getLocalizedData('name')|escape}

+
    + {foreach from=$mastheadUsers[$mastheadRole->id] item="mastheadUser"} +
  • + {strip} + {translate key="common.fromUntil" from=$mastheadUser['dateStart'] until=""} + + {$mastheadUser['user']->getFullName()|escape} + {if $mastheadUser['user']->getData('orcid') && $mastheadUser['user']->getData('orcidAccessToken')} + + getFullName()|escape}"> + {$orcidIcon} + + + {/if} + + {if !empty($mastheadUser['user']->getLocalizedData('affiliation'))} + {$mastheadUser['user']->getLocalizedData('affiliation')|escape} + {/if} + {/strip} +
    • + {/foreach} +
+ {/if} + {/foreach} +
+

+ {capture assign=editorialHistoryUrl}{url page="about" op="editorialHistory" router=\PKP\core\PKPApplication::ROUTE_PAGE}{/capture} + {translate key="about.editorialMasthead.linkToEditorialHistory" url=$editorialHistoryUrl} +

+ + {if $reviewers->count()} +

{translate key="common.editorialMasthead.peerReviewers"}

+

{translate key="common.editorialMasthead.peerReviewers.description" year=$previousYear}

+
    + {foreach from=$reviewers item="reviewer"} +
  • + {strip} + + {$reviewer->getFullName()|escape} + {if $reviewer->getData('orcid') && $reviewer->getData('orcidAccessToken')} + + getFullName()|escape}"> + {$orcidIcon} + + + {/if} + + {if !empty($reviewer->getLocalizedData('affiliation'))} + {$reviewer->getLocalizedData('affiliation')|escape} + {/if} + {/strip} +
    • + {/foreach} +
+ {/if} +
+
+
+ +{include file="frontend/components/footer.tpl"} diff --git a/templates/frontend/pages/editorialTeam.tpl b/templates/frontend/pages/editorialTeam.tpl deleted file mode 100755 index 8e59e66..0000000 --- a/templates/frontend/pages/editorialTeam.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{** - * templates/frontend/pages/editorialTeam.tpl - * - * Copyright (c) 2014-2020 Simon Fraser University - * Copyright (c) 2003-2020 John Willinsky - * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. - * - * @brief Display the page to view the editorial team. - * - * @uses $currentContext Journal|Press The current journal or press - *} -{include file="frontend/components/header.tpl" pageTitle="about.editorialTeam"} - -
-
-
-
-

- {translate key="about.editorialTeam"} -

- {include file="frontend/components/editLink.tpl" page="management" op="settings" path="context" anchor="masthead" sectionTitleKey="about.editorialTeam"} -
-
- {$currentContext->getLocalizedSetting('editorialTeam')} -
-
-
-
- -{include file="frontend/components/footer.tpl"} From bdd0454b1bc2f4768d26c755a6216dfc142f82db Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Fri, 3 Jan 2025 15:32:06 -0400 Subject: [PATCH 04/19] add and update orcid templates --- resources/less/import.less | 1 + resources/less/pages/orcid.less | 17 ++++ .../frontend/objects/article_details.tpl | 20 +++-- templates/frontend/pages/orcidAbout.tpl | 45 ++++++++++ templates/frontend/pages/orcidVerify.tpl | 85 +++++++++++++++++++ 5 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 resources/less/pages/orcid.less create mode 100644 templates/frontend/pages/orcidAbout.tpl create mode 100644 templates/frontend/pages/orcidVerify.tpl diff --git a/resources/less/import.less b/resources/less/import.less index 7011c14..374a65b 100644 --- a/resources/less/import.less +++ b/resources/less/import.less @@ -32,4 +32,5 @@ @import "components/recent-issues"; @import "components/catalog-category"; +@import "pages/orcid"; @import "pages/masthead"; diff --git a/resources/less/pages/orcid.less b/resources/less/pages/orcid.less new file mode 100644 index 0000000..83e2104 --- /dev/null +++ b/resources/less/pages/orcid.less @@ -0,0 +1,17 @@ +/** + * @file less/pages/orcid.less + * + * Copyright (c) 2025 Simon Fraser University + * Copyright (c) 2025 John Willinsky + * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. + * + * @brief Stylesheet for ORCID pages (orcidAbout.tpl, orcidVerify.tpl) and buttons + * + */ + +.orcid_icon { + display: inline-block; + margin-right: 5px; + width: 24px; + height: 24px; +} diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl index 04c5ff0..ecdb786 100644 --- a/templates/frontend/objects/article_details.tpl +++ b/templates/frontend/objects/article_details.tpl @@ -14,7 +14,7 @@ * Templates::Article::Main * Templates::Article::Details * - * @uses $article Article This article + * @uses $article Submission This article * @uses $publication Publication The publication being displayed * @uses $firstPublication Publication The first published version of this article * @uses $currentPublication Publication The most recently published version of this article @@ -129,14 +129,16 @@ {strip}
  • {$authorString->getFullName()|escape} - {if $authorString->getOrcid()} - - {if $orcidIcon} - {$orcidIcon} - {else} - - {/if} - + {if $authorString->getData('orcid')} + {if $author->getData('orcidAccessToken')} + + {if $orcidIcon} + {$orcidIcon} + {else} + + {/if} + + {/if} {/if}
    • {/strip}{if !$smarty.foreach.authors.last}, {/if} diff --git a/templates/frontend/pages/orcidAbout.tpl b/templates/frontend/pages/orcidAbout.tpl new file mode 100644 index 0000000..a796747 --- /dev/null +++ b/templates/frontend/pages/orcidAbout.tpl @@ -0,0 +1,45 @@ +{** + * templates/frontend/pages/orcidAbout.tpl + * + * Copyright (c) 2014-2024 Simon Fraser University + * Copyright (c) 2000-2024 John Willinsky + * Copyright (c) 2018-2019 University Library Heidelberg + * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. + * + * Page template to display from the OrcidHandler to show information/overview about ORCID functionality for users. + *} +{include file="frontend/components/header.tpl"} + +
    +
    +
    +
    +

    + {translate key="orcid.about.title"} +

    +
    + +
    +

    + {translate key="orcid.about.orcidExplanation"} +

    +

    {translate key="orcid.about.howAndWhy.title"}

    + {if $isMemberApi} +

    + {translate key="orcid.about.howAndWhyMemberAPI"} +

    + {else} +

    + {translate key="orcid.about.howAndWhyPublicAPI"} +

    + {/if} +

    {translate key="orcid.about.display.title"}

    +

    + {translate key="orcid.about.display"} +

    +
    +
    +
    +
    + +{include file="frontend/components/footer.tpl"} diff --git a/templates/frontend/pages/orcidVerify.tpl b/templates/frontend/pages/orcidVerify.tpl new file mode 100644 index 0000000..cde2178 --- /dev/null +++ b/templates/frontend/pages/orcidVerify.tpl @@ -0,0 +1,85 @@ +{** + * templates/frontend/pages/orcidVerify.tpl + * + * Copyright (c) 2014-2024 Simon Fraser University + * Copyright (c) 2000-2024 John Willinsky + * Copyright (c) 2018-2019 University Library Heidelberg + * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. + * + * Page template to display from the OrcidHandler to show ORCID verification success or failure. + *} +{include file="frontend/components/header.tpl"} + +
    +
    +
    +
    +

    + {translate key="orcid.verify.title"} +

    +
    +
    + {if $verifySuccess} +

    + + {$orcidIcon}{$orcid|escape} + +

    +

    + {translate key="orcid.verify.success"} +

    + {if $sendSubmission} + {if $sendSubmissionSuccess} +

    + {translate key="orcid.verify.sendSubmissionToOrcid.success"} +

    + {else} +

    + {translate key="orcid.verify.sendSubmissionToOrcid.failure"} +

    + {/if} + {elseif $submissionNotPublished} + {translate key="orcid.verify.sendSubmissionToOrcid.notpublished"} + {/if} +

    + {translate key="orcid.verify.success.redirect" contextName=$contextName} +

    + {else} +

    + {if $orcidAPIError} + {$orcidAPIError} + {/if} + {if $invalidClient} + {translate key="orcid.invalidClient"} + {elseif $duplicateOrcid} + {translate key="orcid.verify.duplicateOrcid"} + {elseif $denied} + {translate key="orcid.authDenied"} + {elseif $authFailure} + {translate key="orcid.authFailure"} + {else} + {translate key="orcid.verify.failure"} + {/if} +

    + {translate key="orcid.failure.contact"} + {/if} +
    +
    +
    +
    + +{include file="frontend/components/footer.tpl"} + +{if $verifySuccess} + + +{/if} From 250309efaf61e00f3d03834516ec9a033439308c Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Fri, 3 Jan 2025 15:40:42 -0400 Subject: [PATCH 05/19] UserGroup and deprecated function updates --- PragmaThemePlugin.inc.php | 2 +- .../components/registrationFormContexts.tpl | 12 ++++++------ templates/frontend/objects/article_details.tpl | 6 +++--- templates/frontend/objects/article_summary.tpl | 9 +++++---- templates/frontend/objects/galley_link.tpl | 13 +++++++++---- templates/frontend/pages/about.tpl | 4 ++-- templates/frontend/pages/article.tpl | 4 ++-- templates/frontend/pages/editorialHistory.tpl | 5 +++-- templates/frontend/pages/indexSite.tpl | 2 +- templates/frontend/pages/orcidAbout.tpl | 2 +- templates/frontend/pages/privacy.tpl | 2 +- templates/frontend/pages/userRegister.tpl | 8 ++++---- 12 files changed, 38 insertions(+), 31 deletions(-) diff --git a/PragmaThemePlugin.inc.php b/PragmaThemePlugin.inc.php index 9303acf..9183785 100644 --- a/PragmaThemePlugin.inc.php +++ b/PragmaThemePlugin.inc.php @@ -133,7 +133,7 @@ public function addSiteWideData($hookname, $args) { $orcidImageUrl = $this->getPluginPath() . '/templates/images/orcid.png'; if ($request->getContext()) { - $templateMgr->assign('pragmaHomepageImage', $journal->getLocalizedSetting('homepageImage')); + $templateMgr->assign('pragmaHomepageImage', $journal->getLocalizedData('homepageImage')); } $templateMgr->assign(array( diff --git a/templates/frontend/components/registrationFormContexts.tpl b/templates/frontend/components/registrationFormContexts.tpl index c552150..e7cc56d 100755 --- a/templates/frontend/components/registrationFormContexts.tpl +++ b/templates/frontend/components/registrationFormContexts.tpl @@ -43,11 +43,11 @@
    {foreach from=$readerUserGroups[$contextId] item=userGroup} - {if $userGroup->getPermitSelfRegistration()} - {assign var="userGroupId" value=$userGroup->getId()} + {if $userGroup->permitSelfRegistration} + {assign var="userGroupId" value=$userGroup->id} {if in_array($userGroupId, $userGroupIds)} {assign var=isSelected value=true} @@ -57,11 +57,11 @@
    {foreach from=$reviewerUserGroups[$contextId] item=userGroup} - {if $userGroup->getPermitSelfRegistration()} - {assign var="userGroupId" value=$userGroup->getId()} + {if $userGroup->permitSelfRegistration} + {assign var="userGroupId" value=$userGroup->id} {if in_array($userGroupId, $userGroupIds)} {assign var=isSelected value=true} diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl index ecdb786..c137d1d 100644 --- a/templates/frontend/objects/article_details.tpl +++ b/templates/frontend/objects/article_details.tpl @@ -131,7 +131,7 @@ {$authorString->getFullName()|escape} {if $authorString->getData('orcid')} {if $author->getData('orcidAccessToken')} - + {if $orcidIcon} {$orcidIcon} {else} @@ -154,7 +154,7 @@ {else} {translate key="user.affiliation"} {/if} - +

    +
    {/foreach} {/if} diff --git a/templates/frontend/objects/article_summary.tpl b/templates/frontend/objects/article_summary.tpl index 2ed2eb5..a27da42 100755 --- a/templates/frontend/objects/article_summary.tpl +++ b/templates/frontend/objects/article_summary.tpl @@ -1,8 +1,8 @@ {** * templates/frontend/objects/article_summary.tpl * - * Copyright (c) 2014-2020 Simon Fraser University - * Copyright (c) 2003-2020 John Willinsky + * Copyright (c) 2014-2025 Simon Fraser University + * Copyright (c) 2003-2025 John Willinsky * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. * * @brief View of an Article summary which is shown within a list of articles. @@ -15,9 +15,10 @@ * @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="publication" value=$article->getCurrentPublication()} +{assign var=articlePath value=$publication->getData('urlPath')|default:$article->getId()} + {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} @@ -39,7 +40,7 @@ {foreach from=$article->getGalleys() item=galley} {if $primaryGenreIds} {assign var="file" value=$galley->getFile()} - {if !$galley->getRemoteUrl() && !($file && in_array($file->getGenreId(), $primaryGenreIds))} + {if !$galley->getData('urlRemote') && !($file && in_array($file->getGenreId(), $primaryGenreIds))} {continue} {/if} {/if} diff --git a/templates/frontend/objects/galley_link.tpl b/templates/frontend/objects/galley_link.tpl index e5ed4d2..0e39453 100755 --- a/templates/frontend/objects/galley_link.tpl +++ b/templates/frontend/objects/galley_link.tpl @@ -39,11 +39,16 @@ {assign var="path" value=$parentId|to_array:$galley->getBestGalleyId()} {else} {assign var="page" value="article"} - {assign var="parentId" value=$parent->getBestArticleId()} - {if $publication && $publication->getId() !== $parent->getData('currentPublicationId')} - {assign var="path" value=$parentId|to_array:"version":$publication->getId():$galley->getBestGalleyId()} + {if $publication} + {if $publication->getId() !== $parent->getData('currentPublicationId')} + {* Get a versioned link if we have an older publication *} + {assign var="path" value=$parent->getBestId()|to_array:"version":$publication->getId():$galley->getBestGalleyId()} + {else} + {assign var="parentId" value=$publication->getData('urlPath')|default:$article->getId()} + {assign var="path" value=$parentId|to_array:$galley->getBestGalleyId()} + {/if} {else} - {assign var="path" value=$parentId|to_array:$galley->getBestGalleyId()} + {assign var="path" value=$parent->getBestId()|to_array:$galley->getBestGalleyId()} {/if} {/if} diff --git a/templates/frontend/pages/about.tpl b/templates/frontend/pages/about.tpl index e93baf7..feb8b8c 100755 --- a/templates/frontend/pages/about.tpl +++ b/templates/frontend/pages/about.tpl @@ -20,9 +20,9 @@ {include file="frontend/components/editLink.tpl" page="management" op="settings" path="context" anchor="masthead" sectionTitleKey="about.aboutContext"}
    - {$currentContext->getLocalizedSetting('description')} + {$currentContext->getLocalizedData('description')}
    - {$currentContext->getLocalizedSetting('about')} + {$currentContext->getLocalizedData('about')}
    diff --git a/templates/frontend/pages/article.tpl b/templates/frontend/pages/article.tpl index a810c62..710eb50 100644 --- a/templates/frontend/pages/article.tpl +++ b/templates/frontend/pages/article.tpl @@ -7,7 +7,7 @@ * * @brief Display the page to view an article with all of it's details. * - * @uses $article Article This article + * @uses $article Submission This article * @uses $publication Publication The publication being displayed * @uses $firstPublication Publication The first published version of this article * @uses $currentPublication Publication The most recently published version of this article @@ -17,7 +17,7 @@ * @uses $primaryGalleys array List of article galleys that are not supplementary or dependent * @uses $supplementaryGalleys array List of article galleys that are supplementary *} - {include file="frontend/components/header.tpl" pageTitleTranslated=$article->getLocalizedTitle()|escape} + {include file="frontend/components/header.tpl" pageTitleTranslated=$article->getLocalizedData('title')|escape}
    diff --git a/templates/frontend/pages/editorialHistory.tpl b/templates/frontend/pages/editorialHistory.tpl index 88f8c8d..97eaa1a 100644 --- a/templates/frontend/pages/editorialHistory.tpl +++ b/templates/frontend/pages/editorialHistory.tpl @@ -52,10 +52,11 @@ {/if} {/foreach} + + {include file="frontend/components/editLink.tpl" page="management" op="settings" path="context" anchor="masthead" sectionTitleKey="common.editorialHistory"} + {$currentContext->getLocalizedData('editorialHistory')}
    - {include file="frontend/components/editLink.tpl" page="management" op="settings" path="context" anchor="masthead" sectionTitleKey="common.editorialHistory"} - {$currentContext->getLocalizedData('editorialHistory')}
    {include file="frontend/components/footer.tpl"} diff --git a/templates/frontend/pages/indexSite.tpl b/templates/frontend/pages/indexSite.tpl index a7f443d..a947c29 100644 --- a/templates/frontend/pages/indexSite.tpl +++ b/templates/frontend/pages/indexSite.tpl @@ -33,7 +33,7 @@ {assign var="countItems" value=count($journals)} {foreach from=$journals item=journal} {capture assign="url"}{url journal=$journal->getPath()}{/capture} - {assign var="thumb" value=$journal->getLocalizedSetting('journalThumbnail')} + {assign var="thumb" value=$journal->getLocalizedData('journalThumbnail')} {assign var="description" value=$journal->getLocalizedDescription()} {assign var="journalKey" value=$journalKey+1}
    diff --git a/templates/frontend/pages/orcidAbout.tpl b/templates/frontend/pages/orcidAbout.tpl index a796747..4aadeb4 100644 --- a/templates/frontend/pages/orcidAbout.tpl +++ b/templates/frontend/pages/orcidAbout.tpl @@ -29,7 +29,7 @@ {translate key="orcid.about.howAndWhyMemberAPI"}

    {else} -

    +

    {translate key="orcid.about.howAndWhyPublicAPI"}

    {/if} diff --git a/templates/frontend/pages/privacy.tpl b/templates/frontend/pages/privacy.tpl index 475815b..456174c 100755 --- a/templates/frontend/pages/privacy.tpl +++ b/templates/frontend/pages/privacy.tpl @@ -20,7 +20,7 @@
    - {$currentContext->getLocalizedSetting('privacyStatement')} + {$currentContext->getLocalizedData('privacyStatement')}
    diff --git a/templates/frontend/pages/userRegister.tpl b/templates/frontend/pages/userRegister.tpl index f16e84b..1bb3b7f 100755 --- a/templates/frontend/pages/userRegister.tpl +++ b/templates/frontend/pages/userRegister.tpl @@ -63,7 +63,7 @@ {assign var=contextId value=$currentContext->getId()} {assign var=userCanRegisterReviewer value=0} {foreach from=$reviewerUserGroups[$contextId] item=userGroup} - {if $userGroup->getPermitSelfRegistration()} + {if $userGroup->permitSelfRegistration} {assign var=userCanRegisterReviewer value=$userCanRegisterReviewer+1} {/if} {/foreach} @@ -80,16 +80,16 @@
    {foreach from=$reviewerUserGroups[$contextId] item=userGroup} - {if $userGroup->getPermitSelfRegistration()} + {if $userGroup->permitSelfRegistration} - {assign var="userGroupId" value=$userGroup->getId()} + {assign var="userGroupId" value=$userGroup->id} {/if} {/foreach} From 52c620d5e5ccd39aa1507ac408b6dd014d1cd2c5 Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Thu, 23 Jan 2025 15:46:21 -0400 Subject: [PATCH 06/19] add altcha to templates and recaptcha on login form --- templates/frontend/components/loginForm.tpl | 24 +++++++++++++++++++ templates/frontend/pages/userLogin.tpl | 21 ++++++++++++---- templates/frontend/pages/userLostPassword.tpl | 10 ++++++++ templates/frontend/pages/userRegister.tpl | 9 +++++++ 4 files changed, 59 insertions(+), 5 deletions(-) diff --git a/templates/frontend/components/loginForm.tpl b/templates/frontend/components/loginForm.tpl index 9d91c4e..f624d43 100644 --- a/templates/frontend/components/loginForm.tpl +++ b/templates/frontend/components/loginForm.tpl @@ -50,6 +50,30 @@
    + + {* recaptcha spam blocker *} + {if $recaptchaPublicKey} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + {/if} + + {* altcha spam blocker *} + {if $altchaEnabled} +
    +
    + +
    +
    + {/if} +