Skip to content

Fix labels in post with clearer ones #199

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

Merged
merged 4 commits into from
Sep 30, 2020
Merged

Fix labels in post with clearer ones #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88b2c95
Fix labels in post with clearer ones
Sep 9, 2020
cc830f3
Apply suggestions from code review
dugajean Sep 10, 2020
05a835b
Merge branch 'develop' into fix/transformation-checkbox-unclarity
dugajean Sep 29, 2020
cce4991
Rebuild assets
dugajean Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added ...-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.34cb260ad722325c597cdc3a3e7584d8.woff
View file
Open in desktop
Binary file not shown.
Binary file added ...d-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.7e6e75b25255a2b3b6e7ced1092c210c.eot
View file
Open in desktop
Binary file not shown.
Binary file added ...d-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.c2afda9d25532c03cd41beb20a1ce439.ttf
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion ...y-image-management-and-manipulation-in-the-cloud-cdn/css/src/components/_terms_order.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
}

&-type {
width: 45%;
display: inline-block;
margin-right: 8px;

Expand Down
2 changes: 1 addition & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/js/block-editor.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/js/cloudinary.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/js/src/components/video.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const TransformationsToggle = ( props ) => {
return (
<PanelBody title={__( 'Transformations', 'cloudinary' )}>
<ToggleControl
label={__( 'Overwrite Transformations', 'cloudinary' )}
label={__( 'Overwrite Global Transformations', 'cloudinary' )}
checked={overwrite_transformations}
onChange={( value ) => {
setAttributes( {overwrite_transformations: value} );
Expand Down
8 changes: 4 additions & 4 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ private function template_overwrite_insert() {
return '<# if( data.attachment.attributes.transformations ) { #>
<div class="setting cld-overwrite">
<label>
<span>' . esc_html__( 'Overwrite Transformations', 'cloudinary' ) . '</span>
<span>' . esc_html__( 'Overwrite Global Transformations', 'cloudinary' ) . '</span>
<input type="checkbox" data-setting="cldoverwrite" value="true"<# if ( data.model.cldoverwrite ) { #> checked="checked"<# } #> />
</label>
</div>
Expand All @@ -602,7 +602,7 @@ private function template_overwrite_insert_video() {
return '<# if( \'video\' === data.type && data.attachment.attributes.transformations ) { #>
<div class="setting cld-overwrite">
<label>
<span>' . esc_html__( 'Overwrite Transformations', 'cloudinary' ) . '</span>
<span>' . esc_html__( 'Overwrite Global Transformations', 'cloudinary' ) . '</span>
<input type="checkbox" data-setting="cldoverwrite" value="true"<# if ( data.model.cldoverwrite ) { #> checked="checked"<# } #> />
</label>
</div>
Expand All @@ -620,7 +620,7 @@ private function template_overwrite_edit() {
<label>
<span>&nbsp;</span>
<input type="checkbox" data-setting="cldoverwrite" value="true" <# if ( data.model.cldoverwrite ) { #>checked="checked"<# } #> />
' . esc_html__( 'Overwrite Transformations', 'cloudinary' ) . '
' . esc_html__( 'Overwrite Global Transformations', 'cloudinary' ) . '
</label>
</div>
<# } #>';
Expand All @@ -636,7 +636,7 @@ private function template_overwrite_video_edit() {
<div class="setting cld-overwrite">
<label>
<input type="checkbox" data-setting="cldoverwrite" value="true" <# if ( data.model.cldoverwrite ) { #>checked="checked"<# } #> />
' . esc_html__( 'Overwrite Transformations', 'cloudinary' ) . '
' . esc_html__( 'Overwrite Global Transformations', 'cloudinary' ) . '
</label>
</div>
<# } #>';
Expand Down
11 changes: 7 additions & 4 deletions ...e-management-and-manipulation-in-the-cloud-cdn/php/media/class-global-transformations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,14 @@ private function init_taxonomy_manager( $post ) {
}
}
$out[] = '</ul>';

// Get apply Type.
$type = get_post_meta( $post->ID, self::META_APPLY_KEY . '_terms', true );
$out[] = '<label class="cld-tax-order-list-type"><input ' . checked( 'overwrite', $type, false ) . ' type="checkbox" value="overwrite" name="cld_apply_type" />' . __( 'Overwrite', 'cloudinary' ) . '</label>';
if ( ! empty( $terms ) ) {
$type = get_post_meta( $post->ID, self::META_APPLY_KEY . '_terms', true );
$out[] = '<label class="cld-tax-order-list-type"><input ' . checked( 'overwrite', $type, false ) . ' type="checkbox" value="overwrite" name="cld_apply_type" />' . __( 'Overwrite taxonomy', 'cloudinary' ) . '</label>';
}

$out[] = '</div>';

return implode( $out );
}

Expand Down Expand Up @@ -501,7 +504,7 @@ public function classic_overwrite_transformations_featured_image( $content, $pos
'<p><label for="%1$s"><input type="hidden" name="%1$s" value="0" /><input type="checkbox" name="%1$s" id="%1$s" value="1" %2$s /> %3$s</label></p>',
esc_attr( self::META_FEATURED_IMAGE_KEY ),
checked( $field_value, 1, false ),
esc_html__( 'Overwrite Transformations', 'cloudinary' )
esc_html__( 'Overwrite Global Transformations', 'cloudinary' )
);
}

Expand Down