Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Metadata improvements (fixes #804) #832

Merged
merged 31 commits into from Jul 5, 2017
Merged

Metadata improvements (fixes #804) #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
db74abb
Add multiple editor and translator support.
Jul 4, 2017
69c0182
Fix function placement.
Jul 4, 2017
e3c2fea
Add editors and translators to section metadata.
Jul 4, 2017
fb9f795
Merge branch 'dev' into metadata-improvements
Jul 4, 2017
72db9c6
Move functions, implement JsonSerializable
dac514 Jul 4, 2017
baf5a62
Test functions
dac514 Jul 4, 2017
dab1151
Add ISBN to metadata endpoint.
Jul 4, 2017
1904b9a
Add position.
Jul 4, 2017
06a0040
Add audience.
Jul 4, 2017
25ff5ce
Fix BISAC subject mapping.
Jul 4, 2017
9bc3766
Use JSON schema / API as metadata
dac514 Jul 4, 2017
087c823
Change order of items in trash
dac514 Jul 4, 2017
df81b67
Fix styling.
Jul 4, 2017
75198f6
Add expanded metadata box.
dac514 Jul 4, 2017
85bcdb3
Fix: Already have post ID.
dac514 Jul 4, 2017
80b07bf
Fix book license.
Jul 4, 2017
9c2e7b2
Hide things (first pass).
Jul 4, 2017
249e457
Change action to filter for BISAC metadata.
Jul 4, 2017
465b0ab
Add fallback for copyright year; show expanded meta if set.
Jul 5, 2017
c622795
Use name parser as fallback for author_file_as.
Jul 5, 2017
7634a32
Merge dev into metadata-improvements
Jul 5, 2017
9ef9645
Update TODOs.
Jul 5, 2017
c29ce22
Fix test.
Jul 5, 2017
c499be8
Fix test.
Jul 5, 2017
05baa0a
Fix copypasta.
Jul 5, 2017
f19ef40
Handle exceptions within name parser.
Jul 5, 2017
fb4d24c
Restore full test for add_meta_boxes().
Jul 5, 2017
fd5d0b9
Add has_expanded_metadata() function.
Jul 5, 2017
81f96bc
Add more tests.
Jul 5, 2017
c7359e2
Remove unused catalog order property.
Jul 5, 2017
78b54ba
Catch NameParsingException
dac514 Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/dist/mix-manifest.json
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
"/styles/colors-pb.css": "/styles/colors-pb.css?id=7a8e1e7655cc0d56a0c0",
"/styles/custom-css.css": "/styles/custom-css.css?id=6bbe722767d0bba3e29b",
"/styles/export.css": "/styles/export.css?id=00b43962d0551c330a62",
"/styles/metadata.css": "/styles/metadata.css?id=1d5593d4cebdc7b6c3d4",
"/styles/metadata.css": "/styles/metadata.css?id=0f07ef0ed371a8cd93c5",
"/styles/network-managers.css": "/styles/network-managers.css?id=77d465c0788f57898bdc",
"/styles/organize.css": "/styles/organize.css?id=fe7d3c9f2b2fa3579aa9",
"/styles/part.css": "/styles/part.css?id=81c3afdd53893906e9ce",
Expand Down
2 changes: 1 addition & 1 deletion assets/dist/styles/metadata.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions assets/src/styles/metadata.scss
View file
Open in desktop
@@ -1,10 +1,13 @@
@import 'partials/colors';

.page-title-action,
#post-body-content {
.page-title-action {
display: none;
}

#post-body-content {
margin-bottom: 0;
}

.datepicker input[readonly='readonly'] {
background-color: $white;
}
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@
"require": {
"php": ">=5.6.0",
"composer/installers": "~1.0",
"davidgorges/human-name-parser": "^0.2.1",
"gridonic/princexml-php": "^1.2",
"pimple/pimple": "^3.0",
"leafo/scssphp": "^0.6.7",
Expand Down
45 changes: 44 additions & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions functions.php
View file
Open in desktop
Expand Up @@ -113,23 +113,23 @@ function pb_is_scss( $version = 1 ) {


/**
* Shortcut to \Pressbooks\Metadata::getSeoMetaElements();
* Shortcut to \Pressbooks\Metadata\get_seo_meta_elements();
*
* @return string
*/
function pb_get_seo_meta_elements() {

return \Pressbooks\Metadata::getSeoMetaElements();
return \Pressbooks\Metadata\get_seo_meta_elements();
}

/**
* Shortcut to \Pressbooks\Metadata::getMicrodataElements();
* Shortcut to \Pressbooks\Metadata\get_microdata_elements();
*
* @return string
*/
function pb_get_microdata_elements() {

return \Pressbooks\Metadata::getMicrodataElements();
return \Pressbooks\Metadata\get_microdata_elements();
}

/**
Expand Down
10 changes: 5 additions & 5 deletions hooks-admin.php
View file
Open in desktop
Expand Up @@ -14,15 +14,15 @@
// Includes
// -------------------------------------------------------------------------------------------------------------------

require( PB_PLUGIN_DIR . 'inc/admin/analytics/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/customcss/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/dashboard/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/diagnostics/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/fonts/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/laf/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/plugins/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/analytics/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/metaboxes/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/customcss/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/networkmanagers/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/fonts/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/admin/plugins/namespace.php' );

// -------------------------------------------------------------------------------------------------------------------
// Recycle, reduce, reuse
Expand Down Expand Up @@ -135,7 +135,6 @@
} );

add_action( 'custom_metadata_manager_init_metadata', '\Pressbooks\Admin\Metaboxes\add_meta_boxes' );
add_action( 'pb_add_bisac_subjects_field', '\Pressbooks\Admin\Metaboxes\add_bisac_subjects_field', 1 );

if ( $is_book ) {
add_action( 'admin_enqueue_scripts', '\Pressbooks\Admin\Metaboxes\add_metadata_styles' );
Expand All @@ -157,6 +156,7 @@
add_filter( 'mce_buttons_3', '\Pressbooks\Editor\mce_buttons_3', 11 );
add_filter( 'wp_link_query_args', '\Pressbooks\Editor\customize_wp_link_query_args' );
add_filter( 'wp_link_query', '\Pressbooks\Editor\add_anchors_to_wp_link_query', 1, 2 );
add_action( 'edit_form_after_title', '\Pressbooks\Metadata\add_expanded_metadata_box' );
}

// -------------------------------------------------------------------------------------------------------------------
Expand Down
9 changes: 5 additions & 4 deletions hooks.php
View file
Open in desktop
Expand Up @@ -21,17 +21,18 @@

require( PB_PLUGIN_DIR . 'inc/admin/branding/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/analytics/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/utility/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/api/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/editor/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/image/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/l10n/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/media/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/metadata/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/posttype/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/redirect/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/registration/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/sanitize/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/theme/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/media/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/editor/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/api/namespace.php' );
require( PB_PLUGIN_DIR . 'inc/utility/namespace.php' );

include_symbionts();

Expand Down