From 8d85b35c25ea52df37c7679daacad05c9060f122 Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Wed, 11 Dec 2024 15:49:22 -0400 Subject: [PATCH 1/9] pkp/pkp-lib#10200 remove editorial team, add editorial masthead and history templates --- styles/bootstrap.less | 41 ++++++++++ templates/frontend/pages/editorialHistory.tpl | 61 ++++++++++++++ .../frontend/pages/editorialMasthead.tpl | 82 +++++++++++++++++++ templates/frontend/pages/editorialTeam.tpl | 27 ------ 4 files changed, 184 insertions(+), 27 deletions(-) create mode 100644 templates/frontend/pages/editorialHistory.tpl create mode 100644 templates/frontend/pages/editorialMasthead.tpl delete mode 100644 templates/frontend/pages/editorialTeam.tpl diff --git a/styles/bootstrap.less b/styles/bootstrap.less index bed3a6b..6018026 100644 --- a/styles/bootstrap.less +++ b/styles/bootstrap.less @@ -314,3 +314,44 @@ footer[role="contentinfo"] { -ms-word-break: break-all; word-break: break-word; } + +// Editorial Masthead +.page_masthead { + .user_listing { + margin-top: 1em; + list-style-type: none; + padding: 0; + + li { + margin-bottom: 1.5em; + } + + li > span { + display: block; + } + + .name { + font-weight: bold; + } + + .affiliation { + color: @text-muted; + } + + .date_start { + color: @text-muted; + } + + .orcid { + font-size: @font-size-small; + margin-left: 0.2rem; + margin-right: 0.2rem; + } + + .orcid_icon { + width: 1.4rem; + height: 1.4rem; + margin: 0; + } + } +} diff --git a/templates/frontend/pages/editorialHistory.tpl b/templates/frontend/pages/editorialHistory.tpl new file mode 100644 index 0000000..6e7314e --- /dev/null +++ b/templates/frontend/pages/editorialHistory.tpl @@ -0,0 +1,61 @@ +{** + * templates/frontend/pages/editorialHistory.tpl + * + * Copyright (c) 2024 Simon Fraser University + * Copyright (c) 2024 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"} + +
+ {include file="frontend/components/breadcrumbs.tpl" currentTitleKey="common.editorialHistory"} + + {* Page Title *} +
+

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

+
+ {* /Page Title *} + +

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

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

{$mastheadRole->getLocalizedName()|escape}

+ + {/if} + {/foreach} + + {include file="frontend/components/editLink.tpl" page="management" op="settings" path="context" anchor="masthead" sectionTitleKey="common.editorialHistory"} + {$currentContext->getLocalizedData('editorialHistory')} + +
+ +{include file="common/frontend/footer.tpl"} diff --git a/templates/frontend/pages/editorialMasthead.tpl b/templates/frontend/pages/editorialMasthead.tpl new file mode 100644 index 0000000..a0eeb52 --- /dev/null +++ b/templates/frontend/pages/editorialMasthead.tpl @@ -0,0 +1,82 @@ +{** + * templates/frontend/pages/editorialMasthead.tpl + * + * Copyright (c) 2024 Simon Fraser University + * Copyright (c) 2024 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"} + +
+ {include file="frontend/components/breadcrumbs.tpl" currentTitleKey="common.editorialMasthead"} + + {* Page Title *} +
+

{translate key="common.editorialMasthead"}

+
+ {* /Page Title *} + + {foreach from=$mastheadRoles item="mastheadRole"} + {if array_key_exists($mastheadRole->getId(), $mastheadUsers)} +

{$mastheadRole->getLocalizedName()|escape}

+ + {/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 !empty($reviewers)} +

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

+

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

+ + {/if} +
+ +{include file="common/frontend/footer.tpl"} diff --git a/templates/frontend/pages/editorialTeam.tpl b/templates/frontend/pages/editorialTeam.tpl deleted file mode 100644 index 0de789c..0000000 --- a/templates/frontend/pages/editorialTeam.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{** - * templates/frontend/pages/editorialTeam.tpl - * - * Copyright (c) 2014-2023 Simon Fraser University - * Copyright (c) 2003-2023 John Willinsky - * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. - * - * @brief Display the page to view the editorial team. - * - * @uses $currentJournal Journal The current journal - *} -{include file="frontend/components/header.tpl" pageTitle="about.editorialTeam"} - -
- - {include file="frontend/components/breadcrumbs.tpl" currentTitleKey="about.editorialTeam"} - - {* Page Title *} -
-

{translate key="about.editorialTeam"}

-
- {* /Page Title *} - - {$currentJournal->getLocalizedData('editorialTeam')} -
- -{include file="common/frontend/footer.tpl"} From 763b0d62d23510b2298c3fa9115c2eb009c999d7 Mon Sep 17 00:00:00 2001 From: Kaitlin Newson Date: Wed, 11 Dec 2024 16:56:45 -0400 Subject: [PATCH 2/9] update announcement templates, remove deprecated submission functions --- .../frontend/objects/announcement_full.tpl | 14 ++++++------ .../frontend/objects/announcement_summary.tpl | 12 +++++----- .../frontend/objects/article_details.tpl | 10 +++++++++ .../frontend/objects/article_summary.tpl | 22 +++++++++---------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/templates/frontend/objects/announcement_full.tpl b/templates/frontend/objects/announcement_full.tpl index c1747c1..54096c7 100644 --- a/templates/frontend/objects/announcement_full.tpl +++ b/templates/frontend/objects/announcement_full.tpl @@ -1,8 +1,8 @@ {** * templates/frontend/objects/announcement_full.tpl * - * Copyright (c) 2014-2023 Simon Fraser University - * Copyright (c) 2003-2023 John Willinsky + * Copyright (c) 2014-2024 Simon Fraser University + * Copyright (c) 2003-2024 John Willinsky * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. * * @brief Display the full view of an announcement, when the announcement is @@ -14,18 +14,18 @@

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

- {translate key="announcement.postedOn" postDate=$announcement->getDatePosted()|escape} + {translate key="announcement.postedOn" postDate=$announcement->datePosted|escape}
- {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/objects/announcement_summary.tpl b/templates/frontend/objects/announcement_summary.tpl index 53eb12e..0607e7e 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-2023 Simon Fraser University Library - * Copyright (c) 2003-2023 John Willinsky + * Copyright (c) 2014-2024 Simon Fraser University Library + * Copyright (c) 2003-2024 John Willinsky * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING. * * @brief Display a summary view of an announcement @@ -12,14 +12,14 @@ diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl index 20ca10c..676725b 100644 --- a/templates/frontend/objects/article_details.tpl +++ b/templates/frontend/objects/article_details.tpl @@ -16,6 +16,13 @@ *}
+ {* Indicate if this is only a preview *} + {if $publication->getData('status') !== PKP\submission\PKPSubmission::STATUS_PUBLISHED} + + {/if} {* Notification that this is an old version *} {if $currentPublication->getId() !== $publication->getId()}