Merge branch 'addCompatibilityWithClassicTheme-886' into 'main'

Adds compatibility with Classic Theme

See merge request softwares-pkp/plugins_ojs/authorAndSectionSearchFilters!4

.gitlab-ci.yml

@@ -6,5 +6,5 @@ include:
     ref: main
     file:
       - 'templates/groups/pkp_plugin.yml'
-      - 'templates/groups/ojs_3_4_plugins_cypress_tests_model.yml'
+      - 'templates/groups/ojs/cypress_tests.yml'
 

AuthorAndSectionSearchFiltersPlugin.php

@@ -60,15 +60,18 @@ public function replaceAuthorsFilter($hookName, $params)
 
     public function replaceAuthorsInputFieldFilter($output, $templateMgr): string
     {
-        $pattern = '/<input type="text" id="authors" [^>]+>/';
+        $context = Application::get()->getRequest()->getContext();
+        $pattern = '/<input type="text".*name="authors" [^>]+>/';
+        $templateName = $context->getData('themePluginPath') == "classic" ?
+            'newAuthorsFilterClassicTheme.tpl' : 'newAuthorsFilter.tpl';
 
         if (preg_match($pattern, $output, $matches, PREG_OFFSET_CAPTURE)) {
             $match = $matches[0][0];
             $offset = $matches[0][1];
 
             $templateMgr->assign('authorsList', $this->loadAuthors());
             $newOutput = substr($output, 0, $offset);
-            $newOutput .= $templateMgr->fetch($this->getTemplateResource('newAuthorsFilter.tpl'));
+            $newOutput .= $templateMgr->fetch($this->getTemplateResource($templateName));
             $newOutput .= substr($output, $offset + strlen($match));
             $output = $newOutput;
 
@@ -117,7 +120,12 @@ public function createSectionsSearchFilter($hookName, $params): bool
         $templateMgr->addStyleSheet('sectionSearchFilter', $styleUrl, ['contexts' => 'frontend']);
 
         $templateMgr->assign('sectionsList', $this->loadSections());
-        $output .= $templateMgr->fetch($this->getTemplateResource('sectionSearchFilter.tpl'));
+
+        $context = Application::get()->getRequest()->getContext();
+        $templateName = $context->getData('themePluginPath') == "classic" ?
+            'sectionSearchFilterClassicTheme.tpl' : 'sectionSearchFilter.tpl';
+
+        $output .= $templateMgr->fetch($this->getTemplateResource($templateName));
 
         return false;
     }

styles/sectionFilter.css

@@ -12,4 +12,8 @@
         width: 50%;
         margin-top: 1.43rem;
     }
+}
+
+#authorsClassicTheme, #sectionsClassicTheme {
+    width: -webkit-fill-available;
 }

templates/newAuthorsFilterClassicTheme.tpl

@@ -0,0 +1,5 @@
+<div class="search-form-label">
+	<span>{translate key="search.author"}</span>
+</div>
+
+{fbvElement type="select" id="authorsClassicTheme" name="authors" defaultLabel="{translate key="plugins.generic.authorAndSectionSearchFilters.search.noneSelected"}" defaultValue="" selected=$authors from=$authorsList translate="0" size=$fbvStyles.size.MEDIUM}

templates/sectionSearchFilterClassicTheme.tpl

@@ -0,0 +1,6 @@
+<div class="search-form-label">
+    <span>{translate key="plugins.generic.authorAndSectionSearchFilters.search.sections"}</span>
+</div>
+{block name=searchSections}
+    {fbvElement type="select" id="sectionsClassicTheme" name="sections" defaultLabel="{translate key="plugins.generic.authorAndSectionSearchFilters.search.noneSelected"}" defaultValue="" selected=$sections from=$sectionsList translate="0" size=$fbvStyles.size.MEDIUM}
+{/block}

version.xml

@@ -12,8 +12,8 @@ https://www.gnu.org/licenses/gpl-3.0.txt.
 <version>
     <application>authorAndSectionSearchFilters</application>
     <type>plugins.generic</type>
-    <release>1.0.2.0</release>
-    <date>2024-02-19</date>
+    <release>1.0.2.1</release>
+    <date>2024-09-17</date>
     <lazy-load>0</lazy-load>
     <class>AuthorAndSectionSearchFiltersPlugin</class>
 </version>