Changeset 21789 for trunk/wp-admin/includes/template.php

Timestamp:

09/08/2012 04:58:34 AM (13 years ago)

Author:

koopersmith

Message:

New button styles.

Using the new buttons:

• Button classes are now stackable.
• All buttons should use a base class of "button".
• Buttons default to the gray style (formerly "button-secondary"). Buttons can add a style by adding additional classes. To make a primary button, add the "button-primary" class.
• Buttons can be rendered in various sizes. In addition to the default size, you can add "button-large", "button-small", or "button-tiny".

For backwards compatibility reasons, "button-primary" and "button-secondary" both work as standalone classes.

get_submit_button() has been adjusted to handle shorthand button classes (i.e. button classes can be passed without the "button-" prefix).

props lessbloat, helenyhou, trepmal, nacin. see #21598.

File:

• trunk/wp-admin/includes/template.php (modified) (3 diffs)

trunk/wp-admin/includes/template.php

@@ -555 +555 @@
 
 <tr><td colspan="2" class="submit">
-<?php submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta', 'addmeta', false, array( 'id' => 'newmeta-submit' ) ); ?>
+<?php submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta secondary', 'addmeta', false, array( 'id' => 'newmeta-submit' ) ); ?>
 <?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
 </td></tr>
@@ -1116 +1116 @@
         if ( $section['title'] )
             echo "<h3>{$section['title']}</h3>\n";
-        
+
         if ( $section['callback'] )
             call_user_func( $section['callback'], $section );
-        
+
         if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
             continue;
@@ -1638 +1638 @@
  */
 function get_submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
-    switch ( $type ) :
-        case 'primary' :
-        case 'secondary' :
-            $class = 'button-' . $type;
-            break;
-        case 'delete' :
-            $class = 'button-secondary delete';
-            break;
-        default :
-            $class = $type; // Custom cases can just pass in the classes they want to be used
-    endswitch;
-    $text = ( null == $text ) ? __( 'Save Changes' ) : $text;
+    if ( ! is_array( $type ) )
+        $type = explode( ' ', $type ); 
+
+    $button_shorthand = array( 'primary', 'tiny', 'small', 'large' );
+    $classes = array( 'button' );
+    foreach ( $type as $t ) {
+        if ( 'secondary' === $t || 'button-secondary' === $t )
+            continue;
+        $classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
+    }
+    $class = implode( ' ', array_unique( $classes ) );
+
+    if ( 'delete' === $type )
+        $class = 'button-secondary delete';
+
+    $text = $text ? $text : __( 'Save Changes' );
 
     // Default the id attribute to $name unless an id was specifically provided in $other_attributes