Skip to content

Commit

Permalink
Reduce Smarty warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
asmecher committed May 30, 2024
1 parent e012948 commit 78ed384
Show file tree
Hide file tree
Showing 32 changed files with 73 additions and 73 deletions.
6 changes: 3 additions & 3 deletions plugins/blocks/browse/templates/block.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

{if $browseNewReleases}
<li>
<a href="{url router=PKPApplication::ROUTE_PAGE page="catalog" op="newReleases"}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="catalog" op="newReleases"}">
{translate key="navigation.newReleases"}
</a>
</li>
Expand All @@ -36,7 +36,7 @@
<ul>
{foreach from=$browseCategories item="browseCategory"}
<li class="category_{$browseCategory->getId()}{if $browseCategory->getParentId()} is_sub{/if}{if $browseBlockSelectedCategory == $browseCategory->getPath()} current{/if}">
<a href="{url router=PKPApplication::ROUTE_PAGE page="catalog" op="category" path=$browseCategory->getPath()|escape}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="catalog" op="category" path=$browseCategory->getPath()|escape}">
{$browseCategory->getLocalizedTitle()|escape}
</a>
</li>
Expand All @@ -52,7 +52,7 @@
{foreach from=$browseSeries item=browseSeriesItem}
{if !$browseSeriesItem->getIsInactive()}
<li class="series_{$browseSeriesItem->getId()}{if $browseBlockSelectedSeries == $browseSeriesItem->getPath() && $browseBlockSelectedSeries != ''} current{/if}">
<a href="{url router=PKPApplication::ROUTE_PAGE page="catalog" op="series" path=$browseSeriesItem->getPath()|escape}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="catalog" op="series" path=$browseSeriesItem->getPath()|escape}">
{$browseSeriesItem->getLocalizedTitle()|escape}
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion plugins/blocks/browse/templates/settingsForm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
$('#browseBlockSettingsForm').pkpHandler('$.pkp.plugins.blocks.browse.BrowseBlockSettingsFormHandler');
{rdelim});
</script>
<form class="pkp_form" id="browseBlockSettingsForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT op="manage" category="blocks" plugin=$pluginName verb="settings" save="true"}">
<form class="pkp_form" id="browseBlockSettingsForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT op="manage" category="blocks" plugin=$pluginName verb="settings" save="true"}">
{csrf}
{include file="common/formErrors.tpl"}
{fbvFormArea id="browseBlockSettingsFormArea" class="border" title="plugins.block.browse.settings.title"}
Expand Down
6 changes: 3 additions & 3 deletions plugins/blocks/information/templates/block.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
<ul>
{if !empty($forReaders)}
<li>
<a href="{url router=PKPApplication::ROUTE_PAGE page="information" op="readers"}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="information" op="readers"}">
{translate key="navigation.infoForReaders"}
</a>
</li>
{/if}
{if !empty($forAuthors)}
<li>
<a href="{url router=PKPApplication::ROUTE_PAGE page="information" op="authors"}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="information" op="authors"}">
{translate key="navigation.infoForAuthors"}
</a>
</li>
{/if}
{if !empty($forLibrarians)}
<li>
<a href="{url router=PKPApplication::ROUTE_PAGE page="information" op="librarians"}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="information" op="librarians"}">
{translate key="navigation.infoForLibrarians"}
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion plugins/blocks/languageToggle/templates/block.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ul>
{foreach from=$languageToggleLocales item=localeName key=localeKey}
<li class="locale_{$localeKey|escape}{if $localeKey == $currentLocale} current{/if}" lang="{$localeKey|replace:"_":"-"}">
<a href="{url router=PKPApplication::ROUTE_PAGE page="user" op="setLocale" path=$localeKey}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="user" op="setLocale" path=$localeKey}">
{$localeName}
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions plugins/importexport/users/templates/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@
<form id="exportXmlForm" class="pkp_form" action="{plugin_url path="export"}" method="post">
{csrf}
{fbvFormArea id="exportForm"}
{capture assign=usersGridUrl}{url router=PKPApplication::ROUTE_COMPONENT component="grid.users.exportableUsers.ExportableUsersGridHandler" pluginName="UserImportExportPlugin" op="fetchGrid" escape=false}{/capture}
{capture assign=usersGridUrl}{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.users.exportableUsers.ExportableUsersGridHandler" pluginName="UserImportExportPlugin" op="fetchGrid" escape=false}{/capture}
{load_url_in_div id="usersGridContainer" url=$usersGridUrl}
{fbvFormButtons submitText="plugins.importexport.users.export.exportUsers" hideCancel="true"}
{/fbvFormArea}
</form>
</div>
</div>

{/block}
{/block}
2 changes: 1 addition & 1 deletion plugins/pubIds/urn/templates/settingsForm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$('#urnSettingsForm').pkpHandler('$.pkp.plugins.pubIds.urn.js.URNSettingsFormHandler');
{rdelim});
</script>
<form class="pkp_form" id="urnSettingsForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT op="manage" category="pubIds" plugin=$pluginName verb="save"}">
<form class="pkp_form" id="urnSettingsForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT op="manage" category="pubIds" plugin=$pluginName verb="save"}">
{csrf}
{include file="common/formErrors.tpl"}
{fbvFormArea id="urnObjectsFormArea" title="plugins.pubIds.urn.manager.settings.urnObjects"}
Expand Down
2 changes: 1 addition & 1 deletion templates/authorDashboard/authorDashboard.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<ul>
{foreach from=$workflowStages item=stage}
<li class="pkp_workflow_{$stage.path} stageId{$stage.id}{if $stage.statusKey} initiated{/if}">
<a name="stage-{$stage.path}" class="{$stage.path} stageId{$stage.id}" href="{url router=PKPApplication::ROUTE_COMPONENT component="tab.authorDashboard.AuthorDashboardTabHandler" op="fetchTab" submissionId=$submission->getId() stageId=$stage.id escape=false}">
<a name="stage-{$stage.path}" class="{$stage.path} stageId{$stage.id}" href="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="tab.authorDashboard.AuthorDashboardTabHandler" op="fetchTab" submissionId=$submission->getId() stageId=$stage.id escape=false}">
{translate key=$stage.translationKey}
{if $stage.statusKey}
<span class="pkp_screen_reader">
Expand Down
2 changes: 1 addition & 1 deletion templates/controllers/grid/catalogEntry/dependentFiles.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
*
* The "dependent files" modal.
*}
{capture assign=dependentFilesGridUrl}{url router=PKPApplication::ROUTE_COMPONENT component="grid.files.dependent.DependentFilesGridHandler" op="fetchGrid" submissionId=$submissionId submissionFileId=$submissionFile->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_PRODUCTION escape=false}{/capture}
{capture assign=dependentFilesGridUrl}{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.files.dependent.DependentFilesGridHandler" op="fetchGrid" submissionId=$submissionId submissionFileId=$submissionFile->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_PRODUCTION escape=false}{/capture}
{load_url_in_div id="dependentFilesGridDiv" url=$dependentFilesGridUrl}
6 changes: 3 additions & 3 deletions templates/controllers/grid/catalogEntry/editFormat.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
<div id="editPublicationFormatMetadataTabs">
<ul>
<li>
<a href="{url router=PKPApplication::ROUTE_COMPONENT op="editFormatTab" submissionId=$submissionId representationId=$representationId publicationId=$publicationId}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT op="editFormatTab" submissionId=$submissionId representationId=$representationId publicationId=$publicationId}">
{translate key="common.edit"}
</a>
</li>

{if isset($representationId)}
<li>
<a href="{url router=PKPApplication::ROUTE_COMPONENT op="editFormatMetadata" submissionId=$submissionId representationId=$representationId publicationId=$publicationId}">
<a href="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT op="editFormatMetadata" submissionId=$submissionId representationId=$representationId publicationId=$publicationId}">
{translate key="submission.informationCenter.metadata"}
</a>
</li>
{/if}

{if !$remoteRepresentation && $representationId}
{if $showIdentifierTab}
<li><a href="{url router=PKPApplication::ROUTE_COMPONENT op="identifiers" submissionId=$submissionId representationId=$representationId publicationId=$publicationId}">{translate key="submission.identifiers"}</a></li>
<li><a href="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT op="identifiers" submissionId=$submissionId representationId=$representationId publicationId=$publicationId}">{translate key="submission.identifiers"}</a></li>
{/if}
{/if}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion templates/controllers/grid/catalogEntry/form/codeForm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{rdelim});
</script>

<form class="pkp_form" id="addIdentificationCodeForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.IdentificationCodeGridHandler" op="updateCode"}">
<form class="pkp_form" id="addIdentificationCodeForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.IdentificationCodeGridHandler" op="updateCode"}">
{csrf}
<input type="hidden" name="submissionId" value="{$submissionId|escape}" />
<input type="hidden" name="publicationId" value="{$publicationId|escape}" />
Expand Down
4 changes: 2 additions & 2 deletions templates/controllers/grid/catalogEntry/form/formatForm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{rdelim});
</script>

<form class="pkp_form" id="addPublicationFormatForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationFormatGridHandler" op="updateFormat"}">
<form class="pkp_form" id="addPublicationFormatForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationFormatGridHandler" op="updateFormat"}">
{csrf}
<input type="hidden" name="submissionId" value="{$submissionId|escape}" />
<input type="hidden" name="representationId" value="{$representationId|escape}" />
Expand Down Expand Up @@ -52,4 +52,4 @@
{/fbvFormArea}
<p><span class="formRequired">{translate key="common.requiredField"}</span></p>
{fbvFormButtons}
</form>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{rdelim});
</script>

<form class="pkp_form" id="marketForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.MarketsGridHandler" op="updateMarket"}">
<form class="pkp_form" id="marketForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.MarketsGridHandler" op="updateMarket"}">
{csrf}
<input type="hidden" name="submissionId" value="{$submissionId|escape}" />
<input type="hidden" name="publicationId" value="{$publicationId|escape}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{rdelim});
</script>

<form class="pkp_form" id="addPubDateForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationDateGridHandler" op="updateDate"}">
<form class="pkp_form" id="addPubDateForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationDateGridHandler" op="updateDate"}">
{csrf}
<input type="hidden" name="submissionId" value="{$submissionId|escape}" />
<input type="hidden" name="publicationId" value="{$publicationId|escape}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{rdelim});
</script>

<form class="pkp_form" id="representativeForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.RepresentativesGridHandler" op="updateRepresentative"}">
<form class="pkp_form" id="representativeForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.RepresentativesGridHandler" op="updateRepresentative"}">
{csrf}
{include file="controllers/notification/inPlaceNotification.tpl" notificationId="representativesFormNotification"}
<input type="hidden" name="submissionId" value="{$submissionId|escape}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{rdelim});
</script>

<form class="pkp_form" id="addSalesRightsForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.SalesRightsGridHandler" op="updateRights"}">
<form class="pkp_form" id="addSalesRightsForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.SalesRightsGridHandler" op="updateRights"}">
{csrf}
<input type="hidden" name="submissionId" value="{$submissionId|escape}" />
<input type="hidden" name="publicationId" value="{$publicationId|escape}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{rdelim});
</script>

<form class="pkp_form" id="approvedProofForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationFormatGridHandler" op="saveApprovedProof"}">
<form class="pkp_form" id="approvedProofForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationFormatGridHandler" op="saveApprovedProof"}">
{csrf}
{include file="controllers/notification/inPlaceNotification.tpl" notificationId="approvedProofFormNotification"}
{fbvFormArea id="approvedProofInfo"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{rdelim});
</script>

<form class="pkp_form" id="seriesForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.settings.series.SeriesGridHandler" op="updateSeries" seriesId=$seriesId}">
<form class="pkp_form" id="seriesForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.settings.series.SeriesGridHandler" op="updateSeries" seriesId=$seriesId}">
{csrf}
<input type="hidden" name="seriesId" value="{$seriesId|escape}"/>
{include file="controllers/notification/inPlaceNotification.tpl" notificationId="seriesFormNotification"}
Expand All @@ -45,7 +45,7 @@

{if $image}
{capture assign="altTitle"}{translate key="submission.currentCoverImage"}{/capture}
<img class="pkp_helpers_container_center" height="{$image.thumbnailHeight}" width="{$image.thumbnailWidth}" src="{url router=PKPApplication::ROUTE_PAGE page="catalog" op="thumbnail" type="series" id=$seriesId}" alt="{$altTitle|escape}" />
<img class="pkp_helpers_container_center" height="{$image.thumbnailHeight}" width="{$image.thumbnailWidth}" src="{url router=PKP\core\PKPApplication::ROUTE_PAGE page="catalog" op="thumbnail" type="series" id=$seriesId}" alt="{$altTitle|escape}" />
{/if}

{fbvFormArea id="seriesInfo"}
Expand Down Expand Up @@ -107,7 +107,7 @@
{/if}

{capture assign="instruct"}
{capture assign="sampleUrl"}{url router=PKPApplication::ROUTE_PAGE page="catalog" op="series" path="Path"}{/capture}
{capture assign="sampleUrl"}{url router=PKP\core\PKPApplication::ROUTE_PAGE page="catalog" op="series" path="Path"}{/capture}
{translate key="grid.series.urlWillBe" sampleUrl=$sampleUrl}
{/capture}
{fbvFormSection title="series.path" required=true for="path"}
Expand Down
4 changes: 2 additions & 2 deletions templates/controllers/grid/users/chapter/editChapter.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
</script>
<div id="editChapterMetadataTabs">
<ul>
<li><a href="{url router=PKPApplication::ROUTE_COMPONENT op="editChapterTab" submissionId=$submissionId publicationId=$publicationId chapterId=$chapterId}">{translate key="grid.action.editMetadata"}</a></li>
<li><a href="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT op="editChapterTab" submissionId=$submissionId publicationId=$publicationId chapterId=$chapterId}">{translate key="grid.action.editMetadata"}</a></li>
{if $showIdentifierTab}
<li><a href="{url router=PKPApplication::ROUTE_COMPONENT op="identifiers" submissionId=$submissionId publicationId=$publicationId chapterId=$chapterId}">{translate key="submission.identifiers"}</a></li>
<li><a href="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT op="identifiers" submissionId=$submissionId publicationId=$publicationId chapterId=$chapterId}">{translate key="submission.identifiers"}</a></li>
{/if}
</ul>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{rdelim});
</script>

<form class="pkp_form" id="editChapterForm" method="post" action="{url router=PKPApplication::ROUTE_COMPONENT component="grid.users.chapter.ChapterGridHandler" op="updateChapter"}">
<form class="pkp_form" id="editChapterForm" method="post" action="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.users.chapter.ChapterGridHandler" op="updateChapter"}">
{csrf}
<input type="hidden" name="submissionId" value="{$submissionId|escape}" />
<input type="hidden" name="publicationId" value="{$publicationId|escape}" />
Expand Down
2 changes: 1 addition & 1 deletion templates/controllers/monographList/coverImage.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
{assign var=coverImageWidth value=$coverImage.thumbnailWidth}
{assign var=coverImageHeight value=$coverImage.thumbnailHeight}
{/if}
<img class="pkp_catalog_monograph_thumbnail pkp_helpers_container_center" height="{$coverImageHeight}" width="{$coverImageWidth}" alt="{$monograph->getLocalizedFullTitle()|strip_tags|escape}" src="{url router=PKPApplication::ROUTE_COMPONENT component="submission.CoverHandler" op="thumbnail" submissionId=$monograph->getId() random=$monograph->getId()|uniqid}" />
<img class="pkp_catalog_monograph_thumbnail pkp_helpers_container_center" height="{$coverImageHeight}" width="{$coverImageWidth}" alt="{$monograph->getLocalizedFullTitle()|strip_tags|escape}" src="{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="submission.CoverHandler" op="thumbnail" submissionId=$monograph->getId() random=$monograph->getId()|uniqid}" />
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{include file="authorDashboard/reviewRoundTab.tpl" reviewRounds=$reviewRounds reviewRoundTabsId="internalReviewRoundTabs" lastReviewRoundNumber=$lastReviewRoundNumber}

<!-- Display queries grid -->
{capture assign=queriesGridUrl}{url router=PKPApplication::ROUTE_COMPONENT component="grid.queries.QueriesGridHandler" op="fetchGrid" submissionId=$submission->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW escape=false}{/capture}
{capture assign=queriesGridUrl}{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.queries.QueriesGridHandler" op="fetchGrid" submissionId=$submission->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW escape=false}{/capture}
{load_url_in_div id="queriesGrid" url=$queriesGridUrl}
{else}
{translate key="submission.stageNotInitiated"}
Expand Down
4 changes: 2 additions & 2 deletions templates/controllers/tab/authorDashboard/production.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
{include file="authorDashboard/submissionEmails.tpl" submissionEmails=$productionEmails}

<!-- Display queries grid -->
{capture assign=queriesGridUrl}{url router=PKPApplication::ROUTE_COMPONENT component="grid.queries.QueriesGridHandler" op="fetchGrid" submissionId=$submission->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_PRODUCTION escape=false}{/capture}
{capture assign=queriesGridUrl}{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.queries.QueriesGridHandler" op="fetchGrid" submissionId=$submission->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_PRODUCTION escape=false}{/capture}
{load_url_in_div id="queriesGrid" url=$queriesGridUrl}

<!-- Display galleys grid -->
{if $canAccessProductionStage}
{capture assign=representationsGridUrl}{url router=PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationFormatGridHandler" op="fetchGrid" submissionId=$submission->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_PRODUCTION escape=false}{/capture}
{capture assign=representationsGridUrl}{url router=PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.catalogEntry.PublicationFormatGridHandler" op="fetchGrid" submissionId=$submission->getId() stageId=$smarty.const.WORKFLOW_STAGE_ID_PRODUCTION escape=false}{/capture}
{load_url_in_div id="formatsGridContainer"|uniqid url=$representationsGridUrl}
{/if}
{else}
Expand Down
Loading

0 comments on commit 78ed384

Please sign in to comment.