Code
/
pressbooks-aldine
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: merge conflicts

pull/369/head
arzola 2 years ago
parent
e97df95414 1ea5e17684
commit
d9caf8ba7e
17 changed files with 414 additions and 58 deletions
Split View
  1. 4
      assets/scripts/routes/catalog.js
  2. 1
      assets/styles/aldine.scss
  3. 77
      assets/styles/components/_book.scss
  4. 31
      assets/styles/components/_featured_book.scss
  5. 4
      assets/styles/layouts/_page-catalog.scss
  6. 2
      assets/styles/layouts/_page-home.scss
  7. 2
      dist/scripts/aldine.js
  8. 2
      dist/scripts/aldine.js.LICENSE.txt
  9. 158
      dist/styles/aldine.css
  10. 1
      inc/customizer/namespace.php
  11. 111
      inc/helpers/namespace.php
  12. 6
      languages/pressbooks-aldine.pot
  13. 4
      page-catalog.php
  14. 50
      partials/book.php
  15. 2
      partials/content-front-page.php
  16. 2
      partials/content-page-catalog.php
  17. 15
      partials/featured-book.php

4
assets/scripts/routes/catalog.js
Unescape View File

@ -30,7 +30,7 @@ export default {
while (
elem.nextElementSibling &&
elem.nextElementSibling.tagName !== 'H2'
) {
) {
elems.push( elem.nextElementSibling );
elem = elem.nextElementSibling;
}
@ -100,7 +100,7 @@ export default {
while (
elem.nextElementSibling &&
elem.nextElementSibling.tagName !== 'H3'
) {
) {
elems.push( elem.nextElementSibling );
elem = elem.nextElementSibling;
}

1
assets/styles/aldine.scss
Unescape View File

@ -11,6 +11,7 @@
/** Import theme styles */
@import "common/global";
@import "components/book";
@import "components/featured_book";
@import "components/forms";
@import "layouts/footer";
@import "layouts/header";

77
assets/styles/components/_book.scss
Unescape View File

@ -3,16 +3,18 @@
flex-direction: column;
justify-content: flex-start;
width: 100%;
max-width: 18rem;
height: 25rem;
border: solid 1px var(--accent);
max-width: 22.9375rem;
height: 24.125rem;
margin: 0 0 2rem;
padding: 1.5rem 1rem 2rem;
@media #{$breakpoint-not-small} { padding: 1.5rem 1.85rem 2.1875rem; }
&__cover {
width: 100%;
height: 80%;
background-repeat: no-repeat;
background-size: cover;
border: solid 2px var(--accent);
background: var(--accent);
a, p {
font-family: $font-family-sans-serif;
color: var(--accent-fg);
}
a {
@ -23,9 +25,62 @@
}
&__title {
display: flex;
justify-content: center;
align-items: center;
margin: 0;
font-size: 1.25rem;
@media #{$breakpoint-not-small} { font-size: 1.75rem; }
font-weight: 500;
line-height: 1.2;
text-align: left;
}
&__subject {
margin: 0;
font-size: 0.75rem;
@media #{$breakpoint-not-small} {
font-size: 1rem;
}
text-align: left;
}
&__institutions {
margin: .5rem 0 0;
font-size: 0.875rem;
text-align: left;
display: box;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
&__read-more {
margin: auto 0 0;
font-size: 1rem;
@media #{$breakpoint-not-small} { font-size: 1.125rem; }
text-align: left;
a {
svg {
width: 1rem;
height: 1rem;
@media #{$breakpoint-not-small} {
width: 1.125rem;
height: 1.125rem;
margin-left: 0.5rem;
}
vertical-align: middle;
}
}
}
&:last-child {
margin-bottom: 0;
@media #{$breakpoint-large} {
margin-bottom: 2rem;
}
}
}

31
assets/styles/components/_featured_book.scss
Unescape View File

@ -0,0 +1,31 @@
.featured_book {
display: flex;
flex-direction: column;
justify-content: flex-start;
width: 100%;
max-width: 18rem;
height: 25rem;
border: solid 1px var(--accent);
margin: 0 0 2rem;
&__cover {
width: 100%;
height: 80%;
background-repeat: no-repeat;
background-size: cover;
}
a {
margin: 0;
text-decoration: none;
text-align: center;
hyphens: auto;
}
&__title {
display: flex;
justify-content: center;
align-items: center;
font-weight: 500;
}
}

4
assets/styles/layouts/_page-catalog.scss
Unescape View File

@ -1,6 +1,6 @@
// stylelint-disable no-descending-specificity
fieldset {
.network-catalog fieldset {
border-top: solid 2px var(--accent);
font-family: $font-family-sans-serif;
@ -128,7 +128,7 @@ fieldset {
margin: 2rem 0 1rem 1rem;
}
.book {
.book, .featured_book {
height: 14.375rem;
width: calc(50% - 1rem);
margin: 0 1rem 1rem 0;

2
assets/styles/layouts/_page-home.scss
Unescape View File

@ -79,7 +79,7 @@
flex-direction: row;
justify-content: center;
.book {
.book, .featured_book {
margin-right: 1rem;
margin-left: 1rem;
}

2
dist/scripts/aldine.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/scripts/aldine.js.LICENSE.txt vendored
Unescape View File

@ -15,7 +15,7 @@
*/
/*!
* Masonry v4.2.2
* Masonry v4.2.1
* Cascading grid layout library
* https://masonry.desandro.com
* MIT License

158
dist/styles/aldine.css vendored
Unescape View File

@ -1840,6 +1840,104 @@ nav {
}
.book {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
width: 100%;
max-width: 22.9375rem;
height: 24.125rem;
margin: 0 0 2rem;
padding: 1.5rem 1rem 2rem;
border: solid 2px var(--accent);
background: var(--accent);
}
@media screen and (min-width: 30rem) {
.book {
padding: 1.5rem 1.85rem 2.1875rem;
}
}
.book a, .book p {
font-family: "Karla", sans-serif;
color: var(--accent-fg);
}
.book a {
margin: 0;
text-decoration: none;
text-align: center;
-webkit-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}
.book__title {
margin: 0;
font-size: 1.25rem;
font-weight: 500;
line-height: 1.2;
text-align: left;
}
@media screen and (min-width: 30rem) {
.book__title {
font-size: 1.75rem;
}
}
.book__subject {
margin: 0;
font-size: 0.75rem;
text-align: left;
}
@media screen and (min-width: 30rem) {
.book__subject {
font-size: 1rem;
}
}
.book__institutions {
margin: 0.5rem 0 0;
font-size: 0.875rem;
text-align: left;
display: box;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.book__read-more {
margin: auto 0 0;
font-size: 1rem;
text-align: left;
}
@media screen and (min-width: 30rem) {
.book__read-more {
font-size: 1.125rem;
}
}
.book__read-more a svg {
width: 1rem;
height: 1rem;
vertical-align: middle;
}
@media screen and (min-width: 30rem) {
.book__read-more a svg {
width: 1.125rem;
height: 1.125rem;
margin-left: 0.5rem;
}
}
.book:last-child {
margin-bottom: 0;
}
@media screen and (min-width: 60rem) {
.book:last-child {
margin-bottom: 2rem;
}
}
.featured_book {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
@ -1856,13 +1954,13 @@ nav {
border: solid 1px var(--accent);
margin: 0 0 2rem;
}
.book__cover {
.featured_book__cover {
width: 100%;
height: 80%;
background-repeat: no-repeat;
background-size: cover;
}
.book a {
.featured_book a {
margin: 0;
text-decoration: none;
text-align: center;
@ -1870,7 +1968,7 @@ nav {
-ms-hyphens: auto;
hyphens: auto;
}
.book__title {
.featured_book__title {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
@ -2289,7 +2387,7 @@ body #content a.call-to-action {
-ms-flex-pack: center;
justify-content: center;
}
.latest-books .books .book {
.latest-books .books .book, .latest-books .books .featured_book {
margin-right: 1rem;
margin-left: 1rem;
}
@ -2312,24 +2410,24 @@ body #content a.call-to-action {
text-align: center;
}
fieldset {
.network-catalog fieldset {
border-top: solid 2px var(--accent);
font-family: "Karla", sans-serif;
}
fieldset h2,
fieldset h3 {
.network-catalog fieldset h2,
.network-catalog fieldset h3 {
margin-bottom: 0;
font-size: 1rem;
font-weight: bold;
text-align: left;
text-transform: none;
}
fieldset h2::before,
fieldset h3::before {
.network-catalog fieldset h2::before,
.network-catalog fieldset h3::before {
display: none;
}
fieldset h2 button,
fieldset h3 button {
.network-catalog fieldset h2 button,
.network-catalog fieldset h3 button {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
@ -2346,36 +2444,36 @@ fieldset h3 button {
margin: 0;
border-top: 0;
}
fieldset h2 button svg,
fieldset h3 button svg {
.network-catalog fieldset h2 button svg,
.network-catalog fieldset h3 button svg {
display: block;
float: right;
margin-top: 0.5rem;
}
fieldset h2 button:hover, fieldset h2 button:focus,
fieldset h3 button:hover,
fieldset h3 button:focus {
.network-catalog fieldset h2 button:hover, .network-catalog fieldset h2 button:focus,
.network-catalog fieldset h3 button:hover,
.network-catalog fieldset h3 button:focus {
color: var(--primary);
background: var(--bg-body);
}
fieldset h2 button:active,
fieldset h3 button:active {
.network-catalog fieldset h2 button:active,
.network-catalog fieldset h3 button:active {
-webkit-box-shadow: none;
box-shadow: none;
}
fieldset [aria-expanded=true] {
.network-catalog fieldset [aria-expanded=true] {
color: var(--primary);
}
fieldset [aria-expanded=true] svg {
.network-catalog fieldset [aria-expanded=true] svg {
-webkit-transform: rotate(180deg);
-o-transform: rotate(180deg);
transform: rotate(180deg);
}
fieldset h2 [aria-expanded=true] {
.network-catalog fieldset h2 [aria-expanded=true] {
border-bottom: solid 2px var(--accent);
background: var(--body-bg-alt);
}
fieldset [type=radio] {
.network-catalog fieldset [type=radio] {
position: absolute !important;
width: 1px !important;
height: 1px !important;
@ -2384,28 +2482,28 @@ fieldset [type=radio] {
overflow: hidden !important;
clip: rect(1px, 1px, 1px, 1px);
}
fieldset .label {
.network-catalog fieldset .label {
display: inline-block;
width: calc(100% - 2rem);
}
fieldset [type=radio] + label {
.network-catalog fieldset [type=radio] + label {
cursor: pointer;
display: block;
padding: 1rem 1.1875rem;
margin-bottom: 0;
}
fieldset [type=radio] + label svg {
.network-catalog fieldset [type=radio] + label svg {
display: none;
}
fieldset [type=radio]:focus label {
.network-catalog fieldset [type=radio]:focus label {
cursor: pointer;
display: block;
}
fieldset [type=radio]:checked + label {
.network-catalog fieldset [type=radio]:checked + label {
color: var(--primary);
font-weight: bold;
}
fieldset [type=radio]:checked + label svg {
.network-catalog fieldset [type=radio]:checked + label svg {
display: block;
float: right;
margin-top: 0.5rem;
@ -2413,7 +2511,7 @@ fieldset [type=radio]:checked + label svg {
height: 1rem;
fill: transparent;
}
fieldset:last-of-type {
.network-catalog fieldset:last-of-type {
border-bottom: solid 2px var(--accent);
margin-bottom: 1rem;
}
@ -2432,7 +2530,7 @@ fieldset:last-of-type {
padding: 0;
margin: 2rem 0 1rem 1rem;
}
.page-template-page-catalog .book {
.page-template-page-catalog .book, .page-template-page-catalog .featured_book {
height: 14.375rem;
width: calc(50% - 1rem);
margin: 0 1rem 1rem 0;

1
inc/customizer/namespace.php
Unescape View File

@ -209,6 +209,7 @@ function customize_register( \WP_Customize_Manager $wp_customize ) {
$options = get_catalog_options();
$books = collect( $options['books'] )->pluck( 'title', 'id' )->toArray();
$books = [ '' => __( 'Select a book', 'pressbooks-aldine' ) ] + $books;
foreach ( range( 1, MAX_FEATURED_BOOKS ) as $i ) {
$wp_customize->add_setting(

111
inc/helpers/namespace.php
Unescape View File

@ -70,8 +70,13 @@ function get_featured_books(): array {
}
}
if ( empty( $featured_books ) ) {
return [];
}
$args = [
'site__in' => $featured_books,
'sort_by_featured' => true,
];
return get_catalog_data( $args );
@ -109,8 +114,114 @@ function get_catalog_data( array $args ): array {
$books[] = $book;
}
}
// Sort by featured books.
if ( isset( $args['sort_by_featured'] ) ) {
usort( $books, function ( $a, $b ) use ( $args ) {
return array_search( $a['id'], $args['site__in'], true ) - array_search($b['id'],
$args['site__in'], true);
} );
}
return [
'books' => $books,
];
}
/**
* Get paginated catalog data
*
* @param int $page Catalog page
* @param int $per_page Books per page
* @param string $orderby Sort order
* @param string $license Copyright license
* @param string $subject Subject
*
* @return array
*/
function get_paginated_catalog_data( $page = 1, $per_page = 10, $orderby = 'title', $license = '', $subject = '' ) {
if ( ! defined( 'PB_PLUGIN_VERSION' ) ) {
return [
'pages' => 0,
'books' => [],
];
}
$dc = BookDataCollector::init();
/**
* Filter the WP_Site_Query args for the catalog display.
*
* @since 1.0.0
*/
$args = apply_filters(
'pb_aldine_catalog_query_args',
/**
* Deprecation notice
*
* @deprecated 1.0.0
*
* @see Pressbooks Publisher
*/
apply_filters(
'pb_publisher_catalog_query_args',
[
'number' => 1000000,
'meta_key' => $dc::IN_CATALOG, // @codingStandardsIgnoreLine
'meta_value' => 1, // @codingStandardsIgnoreLine
'public' => 1,
'archived' => 0,
'spam' => 0,
'deleted' => 0,
'network_id' => get_network()->site_id,
]
)
);
/**
* WordPress site
*
* @var \WP_Site $site
*/
$sites_in_catalog = [];
$sites = get_sites( $args );
foreach ( $sites as $site ) {
$site->pb_title = $dc->get( $site->blog_id, $dc::TITLE );
$sites_in_catalog[] = $site;
}
if ( $orderby === 'latest' ) {
$sites_in_catalog = wp_list_sort( $sites_in_catalog, 'last_updated', 'DESC' );
} else {
$sites_in_catalog = wp_list_sort( $sites_in_catalog, 'pb_title', 'ASC' );
}
$total_pages = ceil( count( $sites_in_catalog ) / $per_page );
$offset = ( $page - 1 ) * $per_page;
$books = [];
foreach ( $sites_in_catalog as $i => $site ) {
if ( $i < $offset ) {
continue;
}
$book_information = $dc->get( $site->blog_id, $dc::BOOK_INFORMATION_ARRAY );
if ( is_array( $book_information ) && ! empty( $book_information ) ) {
$schema = book_information_to_schema( $book_information );
$book['title'] = $schema['name'];
$book['date-published'] = $schema['datePublished'] ?? '';
$book['subject'] = $schema['about'][0]['identifier'] ?? '';
$book['link'] = get_blogaddress_by_id( $site->blog_id );
$book['metadata'] = $schema;
$books[] = $book;
}
if ( count( $books ) >= $per_page ) {
break;
}
}
return [
'pages' => $total_pages,
'books' => $books,
];
}

6
languages/pressbooks-aldine.pot
Unescape View File

@ -2,16 +2,16 @@
# This file is distributed under the GNU GPL v3 or later.
msgid ""
msgstr ""
"Project-Id-Version: Aldine 1.16.1\n"
"Project-Id-Version: Aldine 1.17.0\n"
"Report-Msgid-Bugs-To: https://github.com/pressbooks/pressbooks-aldine/issues\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2022-10-17T15:53:25+00:00\n"
"POT-Creation-Date: 2022-11-04T17:15:14+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.7.0\n"
"X-Generator: WP-CLI 2.7.1\n"
"X-Domain: pressbooks-aldine\n"
#. Theme Name of the theme

4
page-catalog.php
Unescape View File

@ -18,15 +18,15 @@ use function Aldine\Helpers\get_available_institutions;
use function Aldine\Helpers\get_available_licenses;
use function Aldine\Helpers\get_available_subjects;
use function Aldine\Helpers\get_catalog_licenses;
use function Aldine\Helpers\get_featured_books;
use function Aldine\Helpers\get_institutions;
use function Aldine\Helpers\get_paginated_catalog_data;
$current_page = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1;
$orderby = ( get_query_var( 'orderby' ) ) ? get_query_var( 'orderby' ) : 'title';
$subject = ( get_query_var( 'subject' ) ) ? get_query_var( 'subject' ) : '';
$license = ( get_query_var( 'license' ) ) ? get_query_var( 'license' ) : '';
$institution = get_query_var( 'institution' ) ?? '';
$catalog_data = get_featured_books();
$catalog_data = get_paginated_catalog_data();
$previous_page = ( $current_page > 1 ) ? $current_page - 1 : 0;
$next_page = $current_page + 1;
$licenses = get_catalog_licenses();

50
partials/book.php
Unescape View File

@ -6,10 +6,54 @@
*/
use function \Aldine\Helpers\maybe_truncate_string;
use function \Pressbooks\Metadata\is_bisac;
$subject = ( isset( $book['subject'] ) && ! is_bisac( $book['subject'] ) ) ? substr( $book['subject'], 0, 2 ) : '';
$date = ( isset( $book['metadata']['datePublished'] ) ) ? str_replace( '-', '', $book['metadata']['datePublished'] ) : '';
$institution_codes = array_map( static function ( $item ) {
return $item['code'];
}, $book['metadata']['institutions'] ?? [] );
$institution_names = array_map( static function ( $item ) {
return \Pressbooks\Metadata\get_institution_name( $item['code'] );
}, $book['metadata']['institutions'] ?? [] );
?>
<div class="book">
<div class="book__cover" style="background-image: url('<?php echo $book['metadata']['image']; ?>' );"></div>
<li class="book"
<?php
if ( $date ) {
?>
data-date-published="<?php echo $date; ?>"<?php } ?>
data-license="<?php echo ( new \Pressbooks\Licensing() )->getLicenseFromUrl( $book['metadata']['license']['url'] ); ?>"
data-institution="<?php echo implode( ',', $institution_codes ); ?>"
<?php
if ( ! empty( $subject ) ) {
?>
data-subject="<?php echo $subject ?>"<?php } ?>
>
<p class="book__title">
<a href="<?php echo $book['link']; ?>"><?php echo maybe_truncate_string( $book['metadata']['name'] ); ?></a>
</p>
</div>
<?php
/*
<?php if (isset( $book['metadata']['author'] ) ) { ?>
<p class="book__author">
<?php _e( 'By', 'pressbooks-aldine' ); ?> <?php foreach ( $book['metadata']['author'] as $author ) {
echo $author['name'];
} ?>
</p>
<?php } ?>
*/
?>
<?php if ( ! empty( $subject ) ) { ?>
<p class="book__subject">
<a href="<?php echo network_home_url( "/catalog/#$subject" ) ?>"><?php echo \Pressbooks\Metadata\get_subject_from_thema( $book['subject'] ); ?></a>
</p>
<?php } ?>
<?php if ( $institution_names ) : ?>
<p class="book__institutions">
<?php echo implode( ', ', $institution_names ); ?>
</p>
<?php endif; ?>
<p class="book__read-more">
<a href="<?php echo $book['link']; ?>"><?php _e( 'About this book', 'pressbooks-aldine' ); ?> <svg aria-hidden="true"><use xlink:href="#arrow-right" /></svg></a>
</p>
</li>

2
partials/content-front-page.php
Unescape View File

@ -56,7 +56,7 @@ if ( $catalog_page ) {
<div class="books">
<?php
foreach ( $catalog_data['books'] as $book ) :
include( locate_template( 'partials/book.php' ) );
include( locate_template( 'partials/featured-book.php' ) );
endforeach;
?>
</div>

2
partials/content-page-catalog.php
Unescape View File

@ -89,7 +89,7 @@
endforeach;
?>
</ul>
<?php if ( isset($catalog_data['pages']) && $catalog_data['pages'] > 1 ) : ?>
<?php if ( isset( $catalog_data['pages'] ) && $catalog_data['pages'] > 1 ) : ?>
<nav class="catalog-navigation">
<?php
if ( $previous_page ) :

15
partials/featured-book.php
Unescape View File

@ -0,0 +1,15 @@
<?php
/**
* Template for displaying books in network catalog
*
* @package Aldine
*/
use function \Aldine\Helpers\maybe_truncate_string;
?>
<div class="featured_book">
<div class="featured_book__cover" style="background-image: url('<?php echo $book['metadata']['image']; ?>' );"></div>
<p class="featured_book__title">
<a href="<?php echo $book['link']; ?>"><?php echo maybe_truncate_string( $book['metadata']['name'] ); ?></a>
</p>
</div>
Write Preview
Loading…
Cancel
Save