Changeset 36394

Timestamp:

01/25/2016 10:54:52 PM (11 years ago)

Author:

obenland

Message:

Pass data consistently on plugin, network plugin, and network theme screens.

List tables on these three screens look similar but come with unexpected caveats.
The network themes screen in particular has been neglected, using a .plugin
class to inherit its sibling's styles and not providing classes and data
attributes that the other two offer. This will provide some more consistency.

Fixes #35335.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-ms-themes-list-table.php (modified) (1 diff)
• update.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -683 +683 @@
 
                 $class = ! $allowed ? 'inactive' : 'active';
-
-                $id = sanitize_html_class( $theme->get_stylesheet() );
-
                 if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
                         $class .= ' update';
                 }
 
-                echo "<tr id='$id' class='$class'>";
+                printf( '<tr class="%s" data-slug="%s">',
+                        esc_attr( $class ),
+                        esc_attr( $stylesheet )
+                );
 
                 $this->single_row_columns( $theme );

trunk/src/wp-admin/includes/update.php

@@ -457 +457 @@
         $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 
-        echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+        $active = $theme->is_allowed( 'network' ) ? ' active': '';
+
+        echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
         if ( ! current_user_can('update_themes') ) {
                 /* translators: 1: theme name, 2: details URL, 3: escaped theme name, 4: version number */
@@ -476 +478 @@
         } else {
                 /* translators: 1: theme name, 2: details URL, 3: escaped theme name, 4: version number, 5: update URL */
-                printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="View %3$s version %4$s details">View version %4$s details</a> or <a href="%5$s" aria-label="update %3$s now">update now</a>.' ),
+                printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="View %3$s version %4$s details">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="update %3$s now">update now</a>.' ),
                         $theme['Name'],
                         esc_url( $details_url ),