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

Change activation toggle to native WP UI #327

Merged
merged 8 commits into from
Nov 21, 2024
Merged

Change activation toggle to native WP UI #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29c2bad
remove activation toggle, use quick action links instead with a simpl…
nk-o Nov 19, 2024
4a61860
simplified deactivation links to have 'lazyblocks_activate_block' or …
nk-o Nov 19, 2024
3f636f9
build
nk-o Nov 19, 2024
5c230c9
display Inactive post state only when status if draft
nk-o Nov 19, 2024
49bdf54
changed active block row border color
nk-o Nov 19, 2024
515467c
Merge branch 'master' into change-activation-toggle-to-native-wordpre…
nk-o Nov 19, 2024
e1a5b76
simplified code that shows block status
Fellan-91 Nov 21, 2024
72b69e4
Update class-blocks.php
nk-o Nov 21, 2024
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
54 changes: 7 additions & 47 deletions assets/admin/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
width: 200px;
}

tbody .check-column input {
margin-top: 9px !important;
}

@media screen and (max-width: 782px) {
/* Hide column on mobile device */
th.column-lazyblocks_post_icon {
Expand All @@ -59,52 +55,16 @@
}
}

/**
* Toggle switch.
*/
$toggle_width: 28px;
$toggle_circle_size: 13px;
$toggle_margin: 2px;

.column-lazyblocks_post_activate {
width: 35px;
.lazyblocks-activate-block {
color: #139a35;
}

.lazyblocks-block-activation-switch {
position: relative;
display: block;
background-color: #d9d9d9;
border-radius: 17px;
height: 17px;
margin-top: 12.5px;
width: $toggle_width;
}

.lazyblocks-block-activation-switch::before {
background-color: #fff;
border-radius: 50%;
content: "";
display: inline-block;
height: $toggle_circle_size;
margin: $toggle_margin;
transition: transform 0.2s;
width: $toggle_circle_size;
}

.lazyblocks-active-block {
background-color: #007cba;
}

.lazyblocks-active-block.lazyblocks-block-activation-switch::before {
transform: translateX($toggle_width - $toggle_circle_size - $toggle_margin * 2);
}

.lazyblocks-active-block.lazyblocks-block-activation-switch:hover::before {
transform: translateX($toggle_width - $toggle_circle_size - $toggle_margin * 2 - 1px);
.lazyblocks-deactivate-block {
color: #c17d39;
}

.lazyblocks-block-activation-switch:hover::before {
transform: translateX(1px);
.lazyblocks-row-active th.check-column {
border-left: 1px solid #007cba;
box-shadow: -1px 0 0 #007cba;
}
}

Expand Down
2 changes: 1 addition & 1 deletion build/admin-style-rtl.css
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 build/admin-style.css
View file
Open in desktop

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

67 changes: 44 additions & 23 deletions classes/class-blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ public function __construct() {
add_action( 'admin_init', array( $this, 'add_role_caps' ) );

// Additional elements in blocks list table.
add_filter( 'display_post_states', array( $this, 'display_post_states' ), 10, 2 );
add_filter( 'disable_months_dropdown', array( $this, 'disable_months_dropdown' ), 10, 2 );
add_filter( 'post_class', array( $this, 'post_class' ), 10, 3 );
add_filter( 'post_row_actions', array( $this, 'post_row_actions' ), 10, 2 );
add_filter( 'manage_lazyblocks_posts_columns', array( $this, 'manage_posts_columns' ) );
add_filter( 'manage_lazyblocks_posts_custom_column', array( $this, 'manage_posts_custom_column' ), 10, 2 );
Expand All @@ -78,7 +80,6 @@ public function __construct() {
add_action( 'save_post', array( $this, 'normalize_lazyblocks_post_status' ), 20, 2 );

// Disabled the display of statuses in the list of blocks and replaced the Draft title in the submenu to Inactive.
add_action( 'display_post_states', array( $this, 'disable_post_states' ), 20, 2 );
add_filter( 'views_edit-lazyblocks', array( $this, 'change_activation_views_labels' ) );

// add gutenberg blocks assets.
Expand All @@ -94,15 +95,19 @@ public function __construct() {
}

/**
* Disabled display of post statuses in the list of all blocks.
* Display inactive state and disable other post statuses in the list of all blocks.
*
* @param array $post_states - Block States.
* @param WP_Post $post - Post Object with all post parameters.
* @return array
*/
public function disable_post_states( $post_states, $post ) {
public function display_post_states( $post_states, $post ) {
if ( 'lazyblocks' === $post->post_type ) {
$post_states = array();

if ( 'draft' === $post->post_status ) {
$post_states['lazyblocks-inactive'] = __( 'Inactive', 'lazy-blocks' );
}
}

return $post_states;
Expand Down Expand Up @@ -285,6 +290,26 @@ public function disable_months_dropdown( $return, $post_type ) {
return 'lazyblocks' === $post_type ? true : $return;
}

/**
* Add active/inactive class to row
*
* @param array $classes Array of post classes.
* @param array $class Additional classes added to the post.
* @param int $post_id The post ID.
* @return array
*/
public function post_class( $classes, $class, $post_id ) {
if ( ! is_admin() ) {
return $classes;
}

if ( get_post_type( $post_id ) === 'lazyblocks' ) {
$classes[] = get_post_status( $post_id ) === 'publish' ? 'lazyblocks-row-active' : 'lazyblocks-row-inactive';
}

return $classes;
}

/**
* Add featured image in lazyblocks list
*
Expand Down Expand Up @@ -336,6 +361,22 @@ public function post_row_actions( $actions = array(), $post = null ) {
),
esc_html__( 'Export', 'lazy-blocks' )
),
'activate' => sprintf(
'<a href="%1$s" aria-label="%2$s" class="%3$s">%4$s</a>',
add_query_arg(
array(
( 'publish' === $post->post_status ? 'lazyblocks_deactivate_block' : 'lazyblocks_activate_block' ) => $post->ID,
'lazyblocks_activate_block_nonce' => wp_create_nonce( 'lzb-activate-block-nonce' ),
)
),
sprintf(
// translators: %1$ - post title.
'publish' === $post->post_status ? esc_html__( 'Deactivate “%1$s”', 'lazy-blocks' ) : esc_html__( 'Activate “%1$s”', 'lazy-blocks' ),
get_the_title( $post->ID )
),
'publish' === $post->post_status ? 'lazyblocks-deactivate-block' : 'lazyblocks-activate-block',
'publish' === $post->post_status ? esc_html__( 'Deactivate', 'lazy-blocks' ) : esc_html__( 'Activate', 'lazy-blocks' )
),
),
array_slice( $actions, 1 )
);
Expand Down Expand Up @@ -397,7 +438,6 @@ public function handle_bulk_actions_edit( $redirect, $action, $post_ids ) {
public function manage_posts_columns( $columns = array() ) {
$columns = array(
'cb' => $columns['cb'],
'lazyblocks_post_activate' => '',
'lazyblocks_post_icon' => esc_html__( 'Icon', 'lazy-blocks' ),
'title' => $columns['title'],
'lazyblocks_post_category' => esc_html__( 'Category', 'lazy-blocks' ),
Expand All @@ -415,25 +455,6 @@ public function manage_posts_columns( $columns = array() ) {
public function manage_posts_custom_column( $column_name = false ) {
global $post;

// Displaying buttons for block activation and deactivation.
if ( 'lazyblocks_post_activate' === $column_name ) {
$classes = 'lazyblocks-block-activation-switch';

if ( 'publish' === $post->post_status ) {
$classes .= ' lazyblocks-active-block';
}

$link = add_query_arg(
array(
'lazyblocks_activate_block' => $post->ID,
'lazyblocks_activate_block_action' => 'publish' === $post->post_status ? 'deactivate' : 'activate',
'lazyblocks_activate_block_nonce' => wp_create_nonce( 'lzb-activate-block-nonce' ),
)
);

echo '<a class="' . esc_attr( $classes ) . '" href="' . esc_url( $link ) . '">&nbsp;</a>';
}

if ( 'lazyblocks_post_icon' === $column_name ) {
$icon = $this->prepare_block_icon( $this->get_meta_value_by_id( 'lazyblocks_icon' ) );
$admin_url = get_edit_post_link( $post->ID );
Expand Down
4 changes: 2 additions & 2 deletions classes/class-tools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ public function maybe_activate_block() {
return;
}

$post_id = filter_input( INPUT_GET, 'lazyblocks_activate_block', FILTER_SANITIZE_NUMBER_INT );
$action = isset( $_GET['lazyblocks_activate_block_action'] ) ? sanitize_text_field( wp_unslash( $_GET['lazyblocks_activate_block_action'] ) ) : false;
$action = isset( $_GET['lazyblocks_activate_block'] ) ? 'activate' : ( isset( $_GET['lazyblocks_deactivate_block'] ) ? 'deactivate' : false );
$post_id = filter_input( INPUT_GET, 'activate' === $action ? 'lazyblocks_activate_block' : 'lazyblocks_deactivate_block', FILTER_SANITIZE_NUMBER_INT );

if ( $post_id && $action && current_user_can( 'edit_lazyblock', $post_id ) ) {
if ( 'activate' === $action ) {
Expand Down
Loading