Changeset 660262

Timestamp:

01/28/2013 06:42:12 PM (12 years ago)

Author:

japh

Message:

Release 2.0

Location:

wp-butler/trunk

Files:

• readme.txt (modified) (2 diffs)
• wp-butler.php (modified) (16 diffs)
• wpbutler.css (modified) (1 diff)
• wpbutler.js (modified) (2 diffs)

wp-butler/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.1  
 Tested up to: 3.5  
-Stable tag: 1.9
+Stable tag: 
 
 Provides a text field in the WP Admin allowing you to jump to common WP Actions.
@@ -44 +44 @@
 
 == Changelog ==
+
+
+
+
+
+
+
+
+
+
 
 = 1.9 =

wp-butler/trunk/wp-butler.php

@@ -4 +4 @@
 Plugin URI:  http://wpbutler.com
 Description: WP Butler brings you what you need in the Wordpress Admin. An autocomplete menu to let you jump to all the common tasks you may need to perform, just hit <code>shift+alt+b</code>!
-Version:     1.9
+Version:     
 Author:      Japh
 Author URI:  http://japh.com.au
@@ -26 +26 @@
 */
 
-// Check to See if the Class already exists!
+/**
+ * WP Butler
+ * 
+ * WP Butler brings you what you need in the Wordpress Admin. An autocomplete
+ * menu to let you jump to all the common tasks you may need to perform, just
+ * hit `shift+alt+b`!
+ * 
+ * @author Japh <wordpress@japh.com.au>
+ * @version 2.0
+ * @package WP-Butler
+ * @license http://opensource.org/licenses/gpl-2.0.php GPL2
+ */
+
+// Check to see if the class already exists!
 if ( ! class_exists( 'Japh_Butler' ) ) {
 
     /**
+
+
      * @package WP-Butler
-     * @version 1.9
+     * @version 2.0
+     * @since 1.2
      */
 
     class Japh_Butler {
 
-        public $version = '1.9';
+        /**
+         * Version number for WP Butler
+         * 
+         * This is for internal reference, should it be needed.
+         * 
+         * @since 1.2
+         */
+        public $version = '2.0';
+        /**
+         * Array of available post types
+         * @since 1.4
+         */
         public $post_types = array();
+
+
+
+
         public $taxonomies = array();
 
+
+
+
+
+
         function __construct() {
 
             if ( ! is_admin() )
                 return NULL;
-            
+
             load_plugin_textdomain( 'wp-butler', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
-            
+
             $this->post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects', 'and' );
             $this->taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects', 'and' );
-            
+
             add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ) );
             add_action( 'admin_footer', array( $this, 'footer' ) );
             add_action( 'wp_ajax_wp_butler_actions', array( $this, 'actions' ) );
             add_action( 'admin_bar_menu', array( $this, 'enhance_admin_bar' ), 9999 );
-        }
-
+
+        }
+
+        /**
+         * Footer HTML output
+         * 
+         * This is the HTML for the WP Butler dialog.
+         * 
+         * @since 1.2
+         */
         function footer() {
             echo '<div id="wp-butler-dialog" title="' . __( "What would you like to do?", "wp-butler" ) . '">';
@@ -64 +108 @@
         }
 
+
+
+
+
+
+
+
         function enqueue() {
             // Enqueue styles
@@ -111 +162 @@
         }
 
-        // Action methods
+        /**
+         * Generic action methods
+         * 
+         * @since 1.4
+         * 
+         * @param Array $actions Array of current actions for WP Butler
+         */
         function generate_generic_actions( $actions ) {
             array_push( $actions, array( "label" => __( "Dashboard" ), "url" => "index.php" ) );
@@ -145 +202 @@
         }
 
+
+
+
+
+
+
+
         function generate_site_actions( $actions ) {
             if ( current_user_can( 'upload_files' ) ) {
@@ -179 +243 @@
         }
 
+
+
+
+
+
+
+
         function generate_multisite_actions( $actions ) {
             if ( current_user_can( 'manage_sites' ) ) {
@@ -195 +266 @@
         }
 
+
+
+
+
+
+
+
         function generate_post_type_actions( $actions ) {
             foreach ( $this->post_types as $post_type => $post_type_object ) {
@@ -212 +290 @@
         }
 
+
+
+
+
+
+
+
         function generate_taxonomy_actions( $actions ) {
             foreach ( $this->taxonomies as $taxonomy => $taxonomy_object ) {
@@ -229 +314 @@
         }
 
-        // Keyword methods
+        /**
+         * Keyword methods
+         * 
+         * @since 1.7
+         * 
+         * @param String $term Term for search keyword
+         * @param Array $actions Array of current actions for WP Butler
+         */
         function search_keyword( $term, $actions ) {
             $term_words = explode( ' ', $_REQUEST['term'] );
@@ -270 +362 @@
         }
 
+
+
+
+
+
+
+
+
         function activate_plugin_keyword( $term, $actions ) {
             $term_words = explode( ' ', $_REQUEST['term'] );
@@ -309 +409 @@
         }
 
+
+
+
+
+
+
+
+
         function user_search_keyword( $term, $actions ) {
             $term_words = explode( ' ', $_REQUEST['term'] );
@@ -335 +443 @@
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         function actions() {
             require_once( ABSPATH . '/wp-includes/l10n.php' );
@@ -367 +516 @@
                         list( $term, $butler_actions ) = $this->user_search_keyword( $term, $butler_actions );
                         list( $term, $butler_actions ) = $this->activate_plugin_keyword( $term, $butler_actions );
+
 
                         list( $term, $butler_actions ) = apply_filters( 'wp_butler_ajax_keyword_actions', array( $term, $butler_actions ) );
 
-                        $random_action_url = $butler_actions[mt_rand( 0, count( $butler_actions ) ) - 1]['url'];
-                        array_push( $butler_actions, array( "label" => __( "Surprise me!", "wp-butler" ), "url" => $random_action_url ) );
+                        if ( ! empty( $butler_actions ) ) {
+                            $random_action_url = $butler_actions[mt_rand( 0, count( $butler_actions ) - 1 )]['url'];
+                            array_push( $butler_actions, array( "label" => __( "Surprise me!", "wp-butler" ), "url" => $random_action_url ) );
+                        }
                 }
 
@@ -390 +542 @@
          * Enhance the admin bar
          *
-         * @param  $wp_admin_bar  Array
+         * @param  
          * @return void
          * @author bueltge
@@ -396 +548 @@
          */
         public function enhance_admin_bar( $wp_admin_bar ) {
-            
+            global $wp_admin_bar;
+
             if ( ! is_super_admin() || ! is_admin_bar_showing() )
                 return NULL;
-            
+
             $classes = apply_filters( 'wp_butler_admin_bar_classes', array() );
             $classes = implode( ' ', $classes );
-            
-            $wp_admin_bar->add_menu(
-                array(
-                    'id'        => 'wp-butler',
-                    'parent'    => 'top-secondary',
-                    'secondary' => FALSE,
-                    'title'     => apply_filters( 'wp_butler_admin_bar_title', __( 'WP Butler', 'wp-butler' ) ),
-                    'meta'      => array( 'class' => $classes )
-                )
+
+            $args = array(
+                'id'        => 'wp-butler',
+                'parent'    => 'top-secondary',
+                'secondary' => FALSE,
+                'title'     => apply_filters( 'wp_butler_admin_bar_title', __( 'WP Butler', 'wp-butler' ) ),
+                'meta'      => array( 'class' => $classes )
             );
+
+
         }
 
@@ -418 +571 @@
 }
 
+
+
+
+
+
+
+
+
 function execute_wp_butler() {
     $japh_butler = new Japh_Butler();

wp-butler/trunk/wpbutler.css

@@ -1 +1 @@
 #wp-butler-dialog {
-    display: none;
-    min-height: inherit !important;
-}
+  display: none;
+  min-height: inherit !important; }
 
 /* Admin Bar item */
 #wp-admin-bar-wp-butler:hover {
-    cursor: pointer;
-}
+  cursor: pointer; }
+
+/* Namespaced Butler Widget */
+.butler-ui-widget {
+  padding: 1em;
+  box-shadow: 0 0 0 10px rgba(255, 255, 255, 0.3), 0 0 5px rgba(0, 0, 0, 0.6); }
+  .butler-ui-widget .ui-dialog-titlebar {
+    background: none;
+    border: none;
+    padding: 0; }
+  .butler-ui-widget .ui-dialog-content {
+    padding: 0; }
+  .butler-ui-widget p {
+    display: none;
+    margin: 0; }
+  .butler-ui-widget #wp-butler-field {
+    line-height: 1.2;
+    display: block;
+    width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    margin: 0.5em 0;
+    padding: 0.5em;
+    font-size: 2em; }

wp-butler/trunk/wpbutler.js

@@ -6 +6 @@
         $( "#wp-butler-dialog" ).dialog({
             modal: true,
-            closeOnEscape: true
-        });
+            closeOnEscape: true,
+            width: 420
+        }).parent().addClass('butler-ui-widget');
     
         $( "#wp-butler-field" ).focus();
@@ -16 +17 @@
         $( "#wp-butler-dialog" ).dialog( {
             modal: true,
-            closeOnEscape: true
-        });
+            closeOnEscape: true,
+            width: 420
+        }).parent().addClass('butler-ui-widget');
         
         $( "#wp-butler-field" ).focus();