diff --git a/app/controllers/FrontPage.php b/app/controllers/FrontPage.php deleted file mode 100644 index 3354eaa..0000000 --- a/app/controllers/FrontPage.php +++ /dev/null @@ -1,33 +0,0 @@ -getSupportedTypes(); - foreach ($licenses as $key => $value) { - $licenses[$key] = preg_replace("/\([^)]+\)/", '', $value['desc']); - } - return $licenses; - } else { - return []; - } - } - - public function subjectGroups() - { - return \Pressbooks\Metadata\get_thema_subjects(); - } - - public function catalogData() - { - $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') : ''; - return App::catalogData($page, 9, $orderby, $license, $subject); - } -} diff --git a/inc/helpers/namespace.php b/inc/helpers/namespace.php index e7978ae..5ecaf0e 100644 --- a/inc/helpers/namespace.php +++ b/inc/helpers/namespace.php @@ -7,6 +7,19 @@ namespace Aldine\Helpers; +/** + * Get block count. + * + * @return int + */ +function get_block_count() { + global $_wp_sidebars_widgets; + if ( ! empty( $_wp_sidebars_widgets['front-page-block'] ) ) { + return count( $_wp_sidebars_widgets['front-page-block'] ); + } + return 1; +} + /** * Get catalog data. * @@ -48,6 +61,21 @@ function get_catalog_data( $page = 1, $per_page = 10, $orderby = 'title', $licen } } +/** + * Get licenses for catalog display. + * + * @return array + */ +function get_catalog_licenses() { + if ( class_exists( '\\Pressbooks\\Licensing' ) ) { + $licenses = ( new \Pressbooks\Licensing() )->getSupportedTypes(); + foreach ( $licenses as $key => $value ) { + $licenses[ $key ] = preg_replace( '/\([^)]+\)/', '', $value['desc'] ); + } + return $licenses; + } + return []; +} /** * diff --git a/page-catalog.php b/page-catalog.php new file mode 100644 index 0000000..c20d4c1 --- /dev/null +++ b/page-catalog.php @@ -0,0 +1,24 @@ + + +
+
+ + + +
+
+ + + + 1 ) ? $current_page - 1 : 0; +$next_page = $current_page + 1; +$licenses = get_catalog_licenses(); +$subject_groups = ( function_exists( '\\Pressbooks\\Metadata\\get_thema_subjects' ) ) ? \Pressbooks\Metadata\get_thema_subjects() : []; + +?> + + +
+
+
+

+
+
+ +
+ $val ) : ?> +
+ +
    + $v ) : + if ( strlen( $k ) === 2 ) : ?> +
  • ×
    • + + +
+
+ +
+
+ +
    + $value ) : ?> +
  • ×
    • + +
+
+
+
+ + +
+
+
+ +
+ 1 ) : ?> + + +
diff --git a/views/page-catalog.blade.php b/views/page-catalog.blade.php deleted file mode 100644 index 61f5e4b..0000000 --- a/views/page-catalog.blade.php +++ /dev/null @@ -1,69 +0,0 @@ -{{-- - Template Name: Catalog ---}} - -@extends('layouts.app') - -@section('content') - @include('partials.page-header') -
-
-
-

{{ __('Search by titles or keyword', 'aldine') }}

-
-
- {{ __('Filter by', 'aldine') }} -
- @foreach($subject_groups as $key => $val) -
- {{ $val['label'] }} -
    - @foreach($val['children'] as $k => $v) - @if(strlen($k) === 2) -
  • {{ $v }}×
    • - @endif - @endforeach -
-
- @endforeach -
-
- {{ __('Licenses', 'aldine' ) }} -
    - @foreach($licenses as $key => $value) -
  • {{ $value }}×
    • - @endforeach -
-
-
-
- {{ __('Sort by', 'aldine') }} - -
-
-
- @foreach($catalog_data['books'] as $book) - @include('partials.book', ['book' => $book]) - @endforeach -
- @if($catalog_data['pages'] > 1) - - @endif -
-@endsection diff --git a/views/partials/page-header.blade.php b/views/partials/page-header.blade.php deleted file mode 100644 index b50b56c..0000000 --- a/views/partials/page-header.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -
-

{!! App::title() !!}

-
diff --git a/webpack.mix.js b/webpack.mix.js index d8a8ad2..5ff31ca 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -12,7 +12,7 @@ let mix = require( 'laravel-mix' ); */ const inc = 'inc'; -const views = 'views'; +const partials = 'partials'; const assets = 'assets'; const dist = 'dist'; @@ -27,7 +27,7 @@ mix.browserSync( { files: [ '*.php', `${inc}/**/*.php`, - `${views}/**/*.php`, + `${partials}/**/*.php`, `${dist}/**/*.css`, `${dist}/**/*.js`, ],