diff --git a/templates/frontend/components/headerHead.tpl b/templates/frontend/components/headerHead.tpl deleted file mode 100644 index 4fcd1d8..0000000 --- a/templates/frontend/components/headerHead.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{** - * templates/frontend/components/headerHead.tpl - * - * Copyright (c) 2014-2019 Simon Fraser University - * Copyright (c) 2000-2019 John Willinsky - * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. - * - * Common site header tag and contents. - *} - - - - - {$pageTitleTranslated|strip_tags} - {* Add the journal name to the end of page titles *} - {if $requestedPage|escape|default:"index" != 'index' && $currentContext && $currentContext->getLocalizedName()} - | {$currentContext->getLocalizedName()} - {/if} - - - {load_header context="frontend"} - {load_stylesheet context="frontend"} - \ No newline at end of file diff --git a/templates/frontend/components/navigationMenu.tpl b/templates/frontend/components/navigationMenu.tpl deleted file mode 100644 index 228c40f..0000000 --- a/templates/frontend/components/navigationMenu.tpl +++ /dev/null @@ -1,49 +0,0 @@ -{** - * templates/frontend/components/navigationMenu.tpl - * - * Copyright (c) 2014-2017 Simon Fraser University - * Copyright (c) 2003-2017 John Willinsky - * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. - * - * @brief Primary navigation menu list for OJS - * - * @uses navigationMenu array Hierarchical array of navigation menu item assignments - * @uses id string Element ID to assign the outer
    - * @uses ulClass string Class name(s) to assign the outer
      - * @uses liClass string Class name(s) to assign all
    • elements - *} - -{if $navigationMenu} - -{/if} diff --git a/templates/frontend/components/searchForm_simple.tpl b/templates/frontend/components/searchForm_simple.tpl deleted file mode 100644 index 20f6573..0000000 --- a/templates/frontend/components/searchForm_simple.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{** - * templates/frontend/components/searchForm_simple.tpl - * - * Copyright (c) 2014-2017 Simon Fraser University Library - * Copyright (c) 2003-2017 John Willinsky - * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. - * - * @brief Simple display of a search form with just text input and search button - * - * @uses $searchQuery string Previously input search query - *} -{if !$currentJournal || $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE} - -{/if} diff --git a/templates/settingsForm.tpl b/templates/settingsForm.tpl index 8a8c2c8..706f9a7 100644 --- a/templates/settingsForm.tpl +++ b/templates/settingsForm.tpl @@ -7,19 +7,19 @@ * InlineHtmlGalley plugin settings *}
      - {csrf} + {csrf} - {fbvFormArea id="inlineHtmlGalleySettingsFormArea"} - {fbvFormSection title="plugins.generic.inlineHtmlGalley.settings.xpath" description="plugins.generic.inlineHtmlGalley.settings.xpath.description"} - {fbvElement type="text" id="xpath" value=$xpath size=$fbvStyles.size.MEDIUM} - {/fbvFormSection} - {/fbvFormArea} + {fbvFormArea id="inlineHtmlGalleySettingsFormArea"} + {fbvFormSection title="plugins.generic.inlineHtmlGalley.settings.xpath" description="plugins.generic.inlineHtmlGalley.settings.xpath.description"} + {fbvElement type="text" id="xpath" value=$xpath size=$fbvStyles.size.MEDIUM} + {/fbvFormSection} + {/fbvFormArea} {fbvFormButtons id="inlineHtmlGalleySettingsFormSubmit" submitText="common.save"}
      From f093357d259fed076404a4a36daa31f9483035cb Mon Sep 17 00:00:00 2001 From: trp89 Date: Mon, 9 Sep 2024 15:11:23 -0400 Subject: [PATCH 3/5] Fixed an issue causing empty blocks to appear --- templates/blockAuthors.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/blockAuthors.tpl b/templates/blockAuthors.tpl index 2106322..9207422 100644 --- a/templates/blockAuthors.tpl +++ b/templates/blockAuthors.tpl @@ -9,7 +9,7 @@ * @uses $boolAuthorInfo bool to check whether at least one author has additional info *} - {if $publication->getData('authors')} + {if count($publication->getData('authors'))}
      {translate key="submission.authors"} From 2a077e05620b02d6867dbddc7eea3341f49757b4 Mon Sep 17 00:00:00 2001 From: trp89 Date: Thu, 19 Dec 2024 13:40:36 -0500 Subject: [PATCH 4/5] Reverted tabs to spaces in several files --- InlineHtmlGalleySidebarBlockPlugin.php | 142 ++++++++++++------------- templates/blockGalleys.tpl | 34 +++--- templates/settingsForm.tpl | 22 ++-- 3 files changed, 99 insertions(+), 99 deletions(-) diff --git a/InlineHtmlGalleySidebarBlockPlugin.php b/InlineHtmlGalleySidebarBlockPlugin.php index 3f5af70..a36cdee 100644 --- a/InlineHtmlGalleySidebarBlockPlugin.php +++ b/InlineHtmlGalleySidebarBlockPlugin.php @@ -17,108 +17,108 @@ abstract class InlineHtmlGalleySidebarBlockPlugin extends InlineHtmlGalleyBlockPlugin { - abstract function blockName(); - - /** - * Get the display name of this plugin. - * @return String - */ - function getDisplayName() { - return __('plugins.generic.inlineHtmlGalley.block.' . $this->blockName() . '.displayName'); + abstract function blockName(); + + /** + * Get the display name of this plugin. + * @return String + */ + function getDisplayName() { + return __('plugins.generic.inlineHtmlGalley.block.' . $this->blockName() . '.displayName'); + } + + /** + * Get a description of the plugin. + * @return String + */ + function getDescription() { + return __('plugins.generic.inlineHtmlGalley.block.' . $this->blockName() . '.description'); } - /** - * Get a description of the plugin. - * @return String - */ - function getDescription() { - return __('plugins.generic.inlineHtmlGalley.block.' . $this->blockName() . '.description'); - } - - /** - * Get the name of the block template file. - * @return String - */ - function getBlockTemplateFilename() { - return 'block' . ucfirst($this->blockName()) . '.tpl'; - } + /** + * Get the name of the block template file. + * @return String + */ + function getBlockTemplateFilename() { + return 'block' . ucfirst($this->blockName()) . '.tpl'; + } } class InlineHtmlGalleyAuthorsSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "authors"; - } + function blockName() { + return "authors"; + } } class InlineHtmlGalleyKeywordsSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "keywords"; - } + function blockName() { + return "keywords"; + } } class InlineHtmlGalleyDoiSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - 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; - } + 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 { - function blockName() { - return "coverImage"; - } + function blockName() { + return "coverImage"; + } } class InlineHtmlGalleyDetailsSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "details"; - } + function blockName() { + return "details"; + } } class InlineHtmlGalleyPublishedDateSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "publishedDate"; - } + function blockName() { + return "publishedDate"; + } } class InlineHtmlGalleyHowToCiteSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "howToCite"; - } + function blockName() { + return "howToCite"; + } } class InlineHtmlGalleyLicenseSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "license"; - } + function blockName() { + return "license"; + } } class InlineHtmlGalleyReferencesSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "references"; - } + function blockName() { + return "references"; + } } class InlineHtmlGalleyGalleysSidebarBlockPlugin extends InlineHtmlGalleySidebarBlockPlugin { - function blockName() { - return "galleys"; - } + function blockName() { + return "galleys"; + } } diff --git a/templates/blockGalleys.tpl b/templates/blockGalleys.tpl index d097b0b..644d369 100644 --- a/templates/blockGalleys.tpl +++ b/templates/blockGalleys.tpl @@ -1,20 +1,20 @@ {if $primaryGalleys || $supplementaryGalleys} -
      -
      - {translate key="common.download"} -
      -
      - {if $primaryGalleys} - {foreach from=$primaryGalleys item=galley} - {include file="frontend/objects/galley_link.tpl" parent=$article purchaseFee=$currentJournal->getSetting('purchaseArticleFee') purchaseCurrency=$currentJournal->getSetting('currency')} - {/foreach} - {/if} - {if $supplementaryGalleys} - {foreach from=$supplementaryGalleys item=galley} - {include file="frontend/objects/galley_link.tpl" parent=$article isSupplementary="1"} - {/foreach} - {/if} -
      -
      +
      +
      + {translate key="common.download"} +
      +
      + {if $primaryGalleys} + {foreach from=$primaryGalleys item=galley} + {include file="frontend/objects/galley_link.tpl" parent=$article purchaseFee=$currentJournal->getSetting('purchaseArticleFee') purchaseCurrency=$currentJournal->getSetting('currency')} + {/foreach} + {/if} + {if $supplementaryGalleys} + {foreach from=$supplementaryGalleys item=galley} + {include file="frontend/objects/galley_link.tpl" parent=$article isSupplementary="1"} + {/foreach} + {/if} +
      +
      {/if} \ No newline at end of file diff --git a/templates/settingsForm.tpl b/templates/settingsForm.tpl index 706f9a7..a2e61be 100644 --- a/templates/settingsForm.tpl +++ b/templates/settingsForm.tpl @@ -7,19 +7,19 @@ * InlineHtmlGalley plugin settings *}
      - {csrf} + {csrf} - {fbvFormArea id="inlineHtmlGalleySettingsFormArea"} - {fbvFormSection title="plugins.generic.inlineHtmlGalley.settings.xpath" description="plugins.generic.inlineHtmlGalley.settings.xpath.description"} - {fbvElement type="text" id="xpath" value=$xpath size=$fbvStyles.size.MEDIUM} - {/fbvFormSection} - {/fbvFormArea} - {fbvFormButtons id="inlineHtmlGalleySettingsFormSubmit" submitText="common.save"} + {fbvFormArea id="inlineHtmlGalleySettingsFormArea"} + {fbvFormSection title="plugins.generic.inlineHtmlGalley.settings.xpath" description="plugins.generic.inlineHtmlGalley.settings.xpath.description"} + {fbvElement type="text" id="xpath" value=$xpath size=$fbvStyles.size.MEDIUM} + {/fbvFormSection} + {/fbvFormArea} + {fbvFormButtons id="inlineHtmlGalleySettingsFormSubmit" submitText="common.save"}
      From 24abf237a2153570178314dec6824caaaf687567 Mon Sep 17 00:00:00 2001 From: trp89 Date: Thu, 19 Dec 2024 15:20:50 -0500 Subject: [PATCH 5/5] More tabs reverted to spaces --- InlineHtmlGalleySettingsForm.php | 84 ++++++++++++++++---------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/InlineHtmlGalleySettingsForm.php b/InlineHtmlGalleySettingsForm.php index 5abd284..c4f6993 100644 --- a/InlineHtmlGalleySettingsForm.php +++ b/InlineHtmlGalleySettingsForm.php @@ -20,55 +20,55 @@ class InlineHtmlGalleySettingsForm extends Form { - /** @var $plugin InlineHtmlGalleyPlugin */ - var $plugin; + /** @var $plugin InlineHtmlGalleyPlugin */ + var $plugin; - /** @var $contextId int */ - var $contextId; + /** @var $contextId int */ + var $contextId; - /** - * Constructor - * @param $plugin InlineHtmlGalleyPlugin - * @param $contextId int - */ - function __construct($plugin, $contextId) { - $this->plugin = $plugin; - $this->contextId = $contextId; + /** + * Constructor + * @param $plugin InlineHtmlGalleyPlugin + * @param $contextId int + */ + function __construct($plugin, $contextId) { + $this->plugin = $plugin; + $this->contextId = $contextId; - parent::__construct(method_exists($plugin, 'getTemplateResource') ? $plugin->getTemplateResource('settingsForm.tpl') : $plugin->getTemplatePath() . 'settingsForm.tpl'); + parent::__construct(method_exists($plugin, 'getTemplateResource') ? $plugin->getTemplateResource('settingsForm.tpl') : $plugin->getTemplatePath() . 'settingsForm.tpl'); - $this->addCheck(new FormValidatorPost($this)); - $this->addCheck(new FormValidatorCSRF($this)); - } + $this->addCheck(new FormValidatorPost($this)); + $this->addCheck(new FormValidatorCSRF($this)); + } - /** - * @copydoc Form::initData() - */ - function initData() { - $this->setData('xpath', $this->plugin->getSetting($this->contextId, 'xpath')); - } + /** + * @copydoc Form::initData() + */ + function initData() { + $this->setData('xpath', $this->plugin->getSetting($this->contextId, 'xpath')); + } - /** - * @copydoc Form::readInputData() - */ - function readInputData() { - $this->readUserVars(array('xpath')); - } + /** + * @copydoc Form::readInputData() + */ + function readInputData() { + $this->readUserVars(array('xpath')); + } - /** - * @copydoc Form::fetch() - */ - function fetch($request, $template = null, $display = false) { - $templateMgr = TemplateManager::getManager($request); - $templateMgr->assign('pluginName', $this->plugin->getName()); + /** + * @copydoc Form::fetch() + */ + function fetch($request, $template = null, $display = false) { + $templateMgr = TemplateManager::getManager($request); + $templateMgr->assign('pluginName', $this->plugin->getName()); - return parent::fetch($request, $template, $display); - } + return parent::fetch($request, $template, $display); + } - /** - * @copydoc Form::execute() - */ - function execute(...$functionArgs) { - $this->plugin->updateSetting($this->contextId, 'xpath', $this->getData('xpath')); - } + /** + * @copydoc Form::execute() + */ + function execute(...$functionArgs) { + $this->plugin->updateSetting($this->contextId, 'xpath', $this->getData('xpath')); + } }