Skip to content

Commit

Permalink
Merge branch 'release/1.63.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Misplon committed Oct 11, 2024
2 parents f186509 + 804bc80 commit e0b866b
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 22 deletions.
2 changes: 1 addition & 1 deletion base/inc/fields/builder.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class="siteorigin-page-builder-field"
>
<p>
<button class="button-secondary siteorigin-panels-display-builder">
<?php _e( 'Open Builder', 'siteorigin-panels' ); ?>
<?php esc_html_e( 'Open Builder', 'so-widgets-bundle' ); ?>
</button>
</p>
<input
Expand Down
2 changes: 1 addition & 1 deletion base/inc/fields/error.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class SiteOrigin_Widget_Field_Error extends SiteOrigin_Widget_Field_Base {
protected $message;

protected function render_field( $value, $instance ) {
printf( __( $this->message, 'so-widgets-bundle' ) );
echo esc_html( $this->message );
}

protected function sanitize_field_input( $value, $instance ) {
Expand Down
6 changes: 5 additions & 1 deletion base/inc/fields/factory.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ public function create_field( $field_name, $field_options, SiteOrigin_Widget $fo
'',
array(
'type' => 'error',
'message' => 'The class \'' . $field_class . '\' could not be found. Please make sure you specified the correct field type and that the class exists.',
// Translators: %s is the field class that could not be found.
'message' => sprintf(
'The class \'%s\' could not be found. Please make sure you specified the correct field type and that the class exists.',
'so-widgets-bundle',
$field_class ),
)
);
}
Expand Down
6 changes: 6 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ The Widgets Bundle global interface is available at Plugins > SiteOrigin Widgets

== Changelog ==

= 1.63.3 - 11 October 2024 =
* Button: Renamed Justify alignment to Full Width.
* Button: Update to ensure Justify full-width output in conjunction with the Atom theme.
* Blog: Removed generic Read More CSS class to avoid conflicts.
* Improved field error translation handling.

= 1.63.2 - 23 September 2024 =
* Blog: Output Filtered taxonomy directly.
* Blog: Prevented multiple Blog Widgets on a page from "stacking" pagination.
Expand Down
4 changes: 2 additions & 2 deletions widgets/blog/blog.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function get_widget_form() {
),
'featured_image_size' => array(
'type' => 'image-size',
'label' => __( 'Featured Image Size', 'siteorigin-premium' ),
'label' => __( 'Featured Image Size', 'so-widgets-bundle' ),
'custom_size' => true,
'state_handler' => array(
'featured_image[show]' => array( 'show' ),
Expand Down Expand Up @@ -1278,7 +1278,7 @@ public function override_read_more( $settings, $setup = true ) {
}

public function alter_read_more_link( $link ) {
return '<a class="sow-more-link more-link excerpt" href="' . esc_url( get_permalink() ) . '"> ' . esc_html( get_query_var( 'siteorigin_blog_read_more' ) ) . '<span class="sow-more-link-arrow">&rarr;</span></a>';
return '<a class="sow-more-link" href="' . esc_url( get_permalink() ) . '"> ' . esc_html( get_query_var( 'siteorigin_blog_read_more' ) ) . '<span class="sow-more-link-arrow">&rarr;</span></a>';
}

public function alter_excerpt_more_indicator( $indicator ) {
Expand Down
19 changes: 8 additions & 11 deletions widgets/blog/css/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,17 @@
}

.sow-more-link {
background: none;
border: none;
box-shadow: none;
display: block;
float: none;
font-size: 1em;
font-weight: normal;
margin-top: 26px;
padding: 0;
text-decoration: none;

&.excerpt {
background: none;
border: none;
box-shadow: none;
display: block;
float: none;
font-size: 1em;
font-weight: normal;
margin-top: 26px;
}

&:focus,
&:hover {
text-decoration: none;
Expand Down
4 changes: 2 additions & 2 deletions widgets/button/button.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public function get_widget_form() {
'left' => __( 'Left', 'so-widgets-bundle' ),
'right' => __( 'Right', 'so-widgets-bundle' ),
'center' => __( 'Center', 'so-widgets-bundle' ),
'justify' => __( 'Justify', 'so-widgets-bundle' ),
'justify' => __( 'Full Width', 'so-widgets-bundle' ),
),
),
'mobile_align' => array(
Expand All @@ -137,7 +137,7 @@ public function get_widget_form() {
'left' => __( 'Left', 'so-widgets-bundle' ),
'right' => __( 'Right', 'so-widgets-bundle' ),
'center' => __( 'Center', 'so-widgets-bundle' ),
'justify' => __( 'Justify', 'so-widgets-bundle' ),
'justify' => __( 'Full Width', 'so-widgets-bundle' ),
),
),
'theme' => array(
Expand Down
1 change: 0 additions & 1 deletion widgets/button/styles/atom.less
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
border-color: lighten(@border_color, 2%) @border_color darken(@border_color, 3%) @border_color;
border: 1px solid;
color: @text_color !important;
display: inline-block;
font-size: @font_size;
font-style: @button_font_style;
padding-block: @padding;
Expand Down
6 changes: 5 additions & 1 deletion widgets/button/tpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
$add_anchor = ! empty( $href ) ||
apply_filters( 'siteorigin_widgets_button_always_add_anchor', true );
?>
<div class="ow-button-base ow-button-align-<?php echo esc_attr( $align ); ?>">
<div class="ow-button-base ow-button-align-<?php echo esc_attr( $align ); ?>"<?php
if ( $align === 'justify' ) {
echo ' style="display: block;"';
}
?>>
<?php if ( $add_anchor ) { ?>
<a
<?php if ( ! empty( $href ) ) { ?>
Expand Down
2 changes: 1 addition & 1 deletion widgets/cta/cta.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function get_widget_form() {
'fields' => array(
'title_tag' => array(
'type' => 'select',
'label' => __( 'Title HTML Tag', 'siteorigin-premium' ),
'label' => __( 'Title HTML Tag', 'so-widgets-bundle' ),
'default' => 'h4',
'options' => array(
'h1' => __( 'H1', 'so-widgets-bundle' ),
Expand Down
2 changes: 1 addition & 1 deletion widgets/editor/editor.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private function process_more_quicktag( $content ) {
if ( ! empty( $matches[1] ) ) {
$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
} else {
$more_link_text = __( 'Read More', 'siteorigin-panels' );
$more_link_text = __( 'Read More', 'so-widgets-bundle' );
}
$more_link = apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
$content .= '<p>' . $more_link . '</p>';
Expand Down

0 comments on commit e0b866b

Please sign in to comment.