pkp#10392 Initial Masthead Styling

jardakotesovec · Sep 12, 2024 · 12e0bca · 12e0bca
1 parent d33f414
commit 12e0bca
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/templates/frontend/pages/editorialHistory.tpl b/templates/frontend/pages/editorialHistory.tpl
@@ -18,32 +18,32 @@
 	{foreach from=$mastheadRoles item="mastheadRole"}
 		{if array_key_exists($mastheadRole->getId(), $mastheadUsers)}
 			<h2>{$mastheadRole->getLocalizedName()|escape}</h2>
-			<ul>
+			<ul class="user_listing" role="list">
 				{foreach from=$mastheadUsers[$mastheadRole->getId()] item="mastheadUser"}
 					<li>
-						<ul id="commaList">
-							<li>{$mastheadUser['user']->getFullName()|escape}</li>
+						{strip}
+							<span class="date_start">
+								{foreach name="services" from=$mastheadUser['services'] item="service"}
+									{translate key="common.fromUntil" from=$service['dateStart'] until=$service['dateEnd']}
+									{if !$smarty.foreach.services.last}{translate key="common.commaListSeparator"}{/if}
+								{/foreach}	
+							</span>
+							<span class="name">{$mastheadUser['user']->getFullName()|escape}</span>
 							{if !empty($mastheadUser['user']->getLocalizedData('affiliation'))}
-								<li>{$mastheadUser['user']->getLocalizedData('affiliation')|escape}</li>
+								<span class="affiliation">{$mastheadUser['user']->getLocalizedData('affiliation')|escape}</span>
 							{/if}
-							{if $mastheadUser['user']->getData('orcid')}
-								<span class="orcid">
-									{if $mastheadUser['user']->getData('orcidAccessToken')}
-										{$orcidIcon}
-									{/if}
-									<a href="{$mastheadUser['user']->getData('orcid')|escape}" target="_blank">
-										{$mastheadUser['user']->getData('orcid')|escape}
-									</a>
-								</span>
-							{/if}
-							<li>
-								{foreach from=$mastheadUser['services'] item="service"}
-									<ul>
-										<li>{translate key="common.fromUntil" from=$service['dateStart'] until=$service['dateEnd']}</li>
-									</ul>
-								{/foreach}
-							</li>
-						</ul>
+						{/strip}
+						{if $mastheadUser['user']->getData('orcid')}
+							<span class="orcid">
+								{if $mastheadUser['user']->getData('orcidAccessToken')}
+									{$orcidIcon}
+								{/if}
+								<a href="{$mastheadUser['user']->getData('orcid')|escape}" target="_blank">
+									{$mastheadUser['user']->getData('orcid')|escape}
+								</a>
+							</span>
+						{/if}
+
 					</li>
 				{/foreach}
 			</ul>

diff --git a/templates/frontend/pages/editorialMasthead.tpl b/templates/frontend/pages/editorialMasthead.tpl
@@ -17,16 +17,16 @@
 	{foreach from=$mastheadRoles item="mastheadRole"}
 		{if array_key_exists($mastheadRole->getId(), $mastheadUsers)}
 			<h2>{$mastheadRole->getLocalizedName()|escape}</h2>
-			<ul>
+			<ul class="user_listing" role="list">
 			{foreach from=$mastheadUsers[$mastheadRole->getId()] item="mastheadUser"}
 				<li>
-					<ul id="commaList">
-						<li>{$mastheadUser['user']->getFullName()|escape}</li>
+					{strip}
+						<span class="date_start">{$mastheadUser['dateStart']}</span>
+						<span class="name">{$mastheadUser['user']->getFullName()|escape}</span>
 						{if !empty($mastheadUser['user']->getLocalizedData('affiliation'))}
-							<li>{$mastheadUser['user']->getLocalizedData('affiliation')|escape}</li>
+							<span class="affiliation">{$mastheadUser['user']->getLocalizedData('affiliation')|escape}</span>
 						{/if}
-						<li>{$mastheadUser['dateStart']}</li>
-					</ul>
+					{/strip}
 					{if $mastheadUser['user']->getData('orcid')}
 						<span class="orcid">
 							{if $mastheadUser['user']->getData('orcidAccessToken')}
@@ -42,7 +42,7 @@
 			</ul>
 		{/if}
 	{/foreach}
-
+	<hr>
 	<p>
 		{capture assign=editorialHistoryUrl}{url page="about" op="editorialHistory" router=\PKP\core\PKPApplication::ROUTE_PAGE}{/capture}
 		{translate key="about.editorialMasthead.linkToEditorialHistory" url=$editorialHistoryUrl}