DONE: #80 Compatability with ojs-3.5

Author: madi-nuralin

MaterialThemePlugin.php

@@ -16,7 +16,7 @@
 use APP\core\Application;
 use APP\file\PublicFileManager;
 use PKP\config\Config;
-use PKP\session\SessionManager;
+use PKP\core\PKPSessionGuard;
 use APP\template\TemplateManager;
 
 class MaterialThemePlugin extends \PKP\plugins\ThemePlugin
@@ -25,7 +25,7 @@ class MaterialThemePlugin extends \PKP\plugins\ThemePlugin
      * @copydoc ThemePlugin::isActive()
      */
     public function isActive() {
-        if (SessionManager::isDisabled()) {
+        if (PKPSessionGuard::isSessionDisable()) {
             return true;
         }
         return parent::isActive();
@@ -263,8 +263,9 @@ public function getDescription() {
      * @return string
      */
     public function getJqueryPath($request) {
+        // Load jQuery from a CDN or, if CDNs are disabled, from a local copy.
         $min = Config::getVar('general', 'enable_minified') ? '.min' : '';
-        return $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jquery/jquery' . $min . '.js';
+        return $request->getBaseUrl() . '/js/build/jquery/jquery' . $min . '.js';
     }
 
     /**
@@ -274,7 +275,7 @@ public function getJqueryPath($request) {
      */
     public function getJqueryUIPath($request) {
         $min = Config::getVar('general', 'enable_minified') ? '.min' : '';
-        return $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jqueryui/jquery-ui' . $min . '.js';
+        return $request->getBaseUrl() . '/js/build/jquery-ui/jquery-ui' . $min . '.js';
     }
 
     public function smartyMaterialButtonPrimary($params, $content, $smarty, &$repeat) {

templates/frontend/objects/article_details.tpl

@@ -123,7 +123,7 @@
 														{$author->getFullName()|escape}
 													</p>
 
-													{if $author->getLocalizedData('affiliation')}
+													{if count($author->getAffiliations()) > 0}
 														<div class="text-sm/6 text-slate-900 dark:text-slate-400 flex space-x-1 items-center">
 															<svg xmlns="http://www.w3.org/2000/svg"
 																viewBox="0 0 24 24" class="w-4 h-4" 
@@ -133,16 +133,19 @@
 																<path d="M9 22V12h6v10M2 10.6L12 2l10 8.6"/>
 															</svg>
 															<div>
-																{$author->getLocalizedData('affiliation')|escape}
-																{if $author->getData('rorId')}
-																	<a href="{$author->getData('rorId')|escape}">{$rorIdIcon}</a>
-																{/if}
+																<span class="affiliation">
+																	{foreach name="affiliations" from=$author->getAffiliations() item="affiliation"}
+																		<span>{$affiliation->getLocalizedName()|escape}</span>
+																		{if $affiliation->getRor()}<a href="{$affiliation->getRor()|escape}">{$rorIdIcon}</a>{/if}
+																		{if !$smarty.foreach.affiliations.last}{translate key="common.commaListSeparator"}{/if}
+																	{/foreach}
+																</span>
 															</div>
 														</div>
 													{/if}
 
 													{assign var=authorUserGroup value=$userGroupsById[$author->getData('userGroupId')]}
-													{if $authorUserGroup->getShowTitle()}
+													{if $authorUserGroup->showTitle}
 														<div class="text-sm/6 text-slate-900 dark:text-slate-400 flex space-x-1 items-center">
 															<svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4"
 																viewBox="0 0 24 24"
@@ -154,20 +157,20 @@
 																<circle cx="12" cy="12" r="10"/>
 															</svg>
 															<div class="userGroup">
-																{$authorUserGroup->getLocalizedName()|escape}
+																{$authorUserGroup->getLocalizedData('name')|escape}
 															</div>
 														</div>
 													{/if}
 
 													{if $author->getData('orcid')}
 														<div class="text-sm/6 text-slate-900 dark:text-slate-400 flex space-x-1 items-center">
-															{if $author->getData('orcidAccessToken')}
+															{if $author->hasVerifiedOrcid()}
 																{$orcidIcon}
 															{else}
 																{include file="frontend/components/ui/material_icon_orcid.tpl"}
 															{/if}
 															<a href="{$author->getData('orcid')|escape}" target="_blank" class="break-words text-{$activeTheme->getOption('baseColour')}-400 ">
-																{$author->getData('orcid')|escape}
+																{$author->getOrcidDisplayValue()|escape}
 															</a>
 														</div>
 													{/if}
@@ -264,10 +267,10 @@
 										{if $author->getLocalizedData('biography')}
 											<li class="sub_item">
 												<div class="label text-sm/6 font-semibold text-slate-900 dark:text-slate-300">
-													{if $author->getLocalizedData('affiliation')}
+													{if $author->getLocalizedAffiliationNamesAsString()}
 														{capture assign="authorName"}{$author->getFullName()|escape}{/capture}
-														{capture assign="authorAffiliation"} {$author->getLocalizedData('affiliation')|escape} {/capture}
-														{translate key="submission.authorWithAffiliation" name=$authorName affiliation=$authorAffiliation}
+														{capture assign="authorAffiliations"} {$author->getLocalizedAffiliationNamesAsString(null, ', ')|escape} {/capture}
+														{translate key="submission.authorWithAffiliation" name=$authorName affiliation=$authorAffiliations}
 													{else}
 														{$author->getFullName()|escape}
 													{/if}
@@ -512,11 +515,11 @@
 							</dd>
 						</div>
 					{/if}
-
-					{call_hook name="Templates::Article::Details"}
-				</dl>
+				</dl>		
 			</div>
 
+			{call_hook name="Templates::Article::Details"}
+
 		</div>
 
 	</div><!-- .row -->

templates/frontend/objects/article_summary.tpl

@@ -26,7 +26,7 @@
 	{assign var="showAuthor" value=true}
 {/if}
 
-<div class="flex md:space-x-4">
+<div class="flex md:space-x-4 w-full">
     {if $publication->getLocalizedData('coverImage')}
         <div class="w-32 flex-shrink-0 md:block hidden">
             <a {if $journal}href="{url journal=$journal->getPath() page="article" op="view" path=$articlePath}"{else}href="{url page="article" op="view" path=$articlePath}"{/if}>
@@ -37,7 +37,7 @@
     {/if}
 
     <div class="flex-1">
-        <div class="flex space-x-2">
+        <div class="flex justify-between space-x-2">
             <{$heading} class="text-base font-semibold text-gray-900" style="margin-top: 0;">
                 <a id="article-{$article->getId()}" {if $journal}href="{url journal=$journal->getPath() page="article" op="view" path=$articlePath}"{else}href="{url page="article" op="view" path=$articlePath}"{/if} class="hover:underline">
                     {$publication->getLocalizedTitle(null, 'html')|strip_unsafe_html}
@@ -85,7 +85,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}