diff --git a/locale/en_US/submission.xml b/locale/en_US/submission.xml index 4c27e952b43..3dcca763491 100644 --- a/locale/en_US/submission.xml +++ b/locale/en_US/submission.xml @@ -80,4 +80,7 @@ Any Section Section Options + + {$numTitles} Items + All Items diff --git a/plugins/themes/default/styles/index.less b/plugins/themes/default/styles/index.less index af1b6583a81..57d512e69fe 100644 --- a/plugins/themes/default/styles/index.less +++ b/plugins/themes/default/styles/index.less @@ -31,6 +31,7 @@ @import "main.less"; @import "pages/indexSite.less"; @import "pages/indexJournal.less"; +@import "pages/category.less"; @import "pages/contact.less"; @import "pages/issueArchive.less"; @import "pages/login.less"; diff --git a/plugins/themes/default/styles/objects/article_summary.less b/plugins/themes/default/styles/objects/article_summary.less index 85b0a34afb5..93b238c8613 100644 --- a/plugins/themes/default/styles/objects/article_summary.less +++ b/plugins/themes/default/styles/objects/article_summary.less @@ -54,7 +54,17 @@ } .galleys_links { + &:extend(.pkp_unstyled_list); margin-top: @base; + + li { + display: inline-block; + margin-right: 1em; + + &:last-child { + margin-right: 0; + } + } } @media(min-width: @screen-tablet) { @@ -73,12 +83,9 @@ .cover { float: left; width: 25%; + height: auto; + max-height: none; margin-right: @double; - - img { - height: auto; - max-height: none; - } } } @@ -87,6 +94,10 @@ .cover { margin-right: @triple; margin-bottom: @triple; + + img { + max-height: none; + } } } } diff --git a/plugins/themes/default/styles/objects/issue_toc.less b/plugins/themes/default/styles/objects/issue_toc.less index a3ba07a1d3f..df6dee73ab0 100644 --- a/plugins/themes/default/styles/objects/issue_toc.less +++ b/plugins/themes/default/styles/objects/issue_toc.less @@ -18,17 +18,6 @@ line-height: @double - 2; // Adjust for border } - .cover { - display: block; - margin-bottom: @double; - - img { - display: block; - max-height: 250px; - width: auto; - } - } - .description { > *:first-child { @@ -56,23 +45,10 @@ } } - .articles, - .galleys_links { + .articles { &:extend(.pkp_unstyled_list); } - .galleys_links { - - li { - display: inline-block; - margin-right: 1em; - - &:last-child { - margin-right: 0; - } - } - } - .sections:not(:first-child) { margin-top: @triple * 2; } @@ -87,14 +63,6 @@ .pkp_helpers_clear; } - .cover { - float: left; - width: 25%; - height: auto; - max-height: none; - margin-right: @double; - } - .galleys, .section { position: relative; @@ -130,14 +98,5 @@ .section { margin: @triple -@triple; } - - .cover { - margin-right: @triple; - margin-bottom: @triple; - - img { - max-height: none; - } - } } } diff --git a/plugins/themes/default/styles/pages/category.less b/plugins/themes/default/styles/pages/category.less new file mode 100644 index 00000000000..0e5f984d8e3 --- /dev/null +++ b/plugins/themes/default/styles/pages/category.less @@ -0,0 +1,87 @@ +/** + * @file plugins/themes/default/styles/pages/contact.less + * + * Copyright (c) 2014-2018 Simon Fraser University + * Copyright (c) 2003-2018 John Willinsky + * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. + * + * @brief Styles applying to the contact page + * @link templates/frontend/pages/contact.tpl + */ +.page_catalog_category { + + .article_count { + float: right; + padding: @base 0; + font-size: @font-sml; + color: @text-light; + } + + .about_section .cover { + float: right; + width: 20%; + margin-left: 10%; + margin-right: 10%; + } + + .subcategories { + + ul { + &:extend(.pkp_unstyled_list); + } + + li { + padding-top: @half; + padding-bottom: @half; + } + + a { + text-decoration: none; + } + + @media(min-width: @screen-tablet) { + position: relative; + margin-top: @triple * 2; + margin-left: -@double; + margin-right: -@double; + padding: @triple; + border-top: @bg-border; + border-bottom: @bg-border; + + h2 { + position: absolute; + top: -15px; + left: @double; + margin: 0; + padding-left: @base; + padding-right: @base; + line-height: @triple; + background: @bg; + color: @text-light; + } + } + + @media(min-width: @screen-desktop) { + margin-left: -@triple; + margin-right: -@triple; + } + } + + @media(min-width: @screen-tablet) { + + .cmp_article_list { + padding-top: @double; + } + + h2.title { + .pkp_screen_reader(); + } + } + + @media(min-width: @screen-desktop) { + + .cmp_article_list { + padding-top: @triple; + } + } +} diff --git a/templates/frontend/components/articleList.tpl b/templates/frontend/components/articleList.tpl deleted file mode 100644 index a633b0ed362..00000000000 --- a/templates/frontend/components/articleList.tpl +++ /dev/null @@ -1,41 +0,0 @@ -{** - * templates/frontend/components/articleList.tpl - * - * Copyright (c) 2014-2018 Simon Fraser University - * Copyright (c) 2003-2018 John Willinsky - * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING. - * - * @brief Display a list of articles. - * - * @uses $articles array List of articles to display - * @uses $titleKey string Optional translation key for a title for the list - * @uses $heading string HTML heading element, default: h2 - *} -{if !$heading} - {assign var="heading" value="h2"} -{/if} -
- - {* Optional title *} - {if $titleKey} - <{$heading} class="title"> - {translate key=$titleKey} - - {/if} - - {assign var=counter value=1} - {foreach name="articleListLoop" from=$articles item=article} - {if $counter is odd by 1} -
- {/if} - {include file="frontend/objects/article_summary.tpl" article=$article} - {if $counter is even by 1} -
- {/if} - {assign var=counter value=$counter+1} - {/foreach} - {* Close .row if we have an odd number of titles *} - {if $counter > 1 && $counter is even by 1} -
- {/if} - diff --git a/templates/frontend/pages/catalogCategory.tpl b/templates/frontend/pages/catalogCategory.tpl index 3bd2881fc43..e467ec6f4ca 100644 --- a/templates/frontend/pages/catalogCategory.tpl +++ b/templates/frontend/pages/catalogCategory.tpl @@ -46,7 +46,7 @@ {if !$subcategories->wasEmpty()} {/if} +

+ {translate key="catalog.category.heading"} +

+ {* No published titles in this category *} {if empty($publishedSubmissions)} -

- {translate key="article.articles"} -

-

{translate key="catalog.noTitlesSection"}

- +

{translate key="catalog.category.noItems"}

{else} - {include file="frontend/components/articleList.tpl" articles=$publishedSubmissions titleKey="article.articles"} + {* Pagination *} {if $prevPage > 1}