Changeset 794422

Timestamp:

10/27/2013 02:00:36 PM (12 years ago)

Author:

lpointet

Message:

• Removed useless capability check for displaying admin menu / props colouro
• Allow a pointer to be post_type specific / props colouro

Location:

wordpress-gps/trunk

Files:

• README.markdown (modified) (4 diffs)
• gb_gps.php (modified) (1 diff)
• include/api.php (modified) (2 diffs)
• include/gb_gps.php (modified) (4 diffs)
• include/gb_gps_pointer.php (modified) (5 diffs)
• include/gb_gps_scenario.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• scenarios.php (modified) (3 diffs)

wordpress-gps/trunk/README.markdown

@@ -27 +27 @@
     $pointer_config = array(
         'selector' => '#menu-posts',
+        'post_type' => 'post',
         'content' => '<h3>title</h3><p>content</p>',
         'position' => array(
@@ -41 +42 @@
     (string) The DOM selector of the element on which the pointer will be attached.
       Default: ''
+
+**post_type**
+    (string) The post type slug differenciating some screens on which the pointer will be attached. For example, 'edit.php' hook could be on 'post' or 'page' post types.
+      Default: '' (every post types)
 
 **content**
@@ -108 +113 @@
     $pointer_config = array(
         'selector' => '#menu-posts',
+        'post_type' => 'post',
         'content' => '<h3>titre</h3><p>contenu</p>',
         'position' => array(
@@ -122 +128 @@
     (string) Le sélecteur DOM de l'élément sur lequel va être attaché le pointer.
       Par défaut : ''
+
+**post_type**
+    (string) Le slug du post type différenciant plusieurs écrans. Par exemple, le hook 'edit.php' peut être sur les post types 'post' ou 'page'.
+      Par défaut : '' (tous les pos types)
 
 **content**

wordpress-gps/trunk/gb_gps.php

@@ -4 +4 @@
 Plugin URI: http://www.globalis-ms.com
 Description: This plugin Provide an admin screen to WordPress users in which they will choose one scenario to play. That scenario will help them through the WordPress administration thanks to WP-Pointers API
-Version: 1.0.11
+Version: 1.0.13
 Author: Lionel POINTET, GLOBALIS media systems
 Author URI: http://www.globalis-ms.com

wordpress-gps/trunk/include/api.php

@@ -80 +80 @@
         'content' => '',
         'position' => '',
+        'post_type' => '',
     );
 
@@ -93 +94 @@
             'content' => $content,
             'position' => $position,
+            'post_type' => $post_type,
         ));
     }

wordpress-gps/trunk/include/gb_gps.php

@@ -87 +87 @@
      */
     public function play_scenario() {
-        global $pagenow;
+        global $pagenow, $typenow;
 
         // Retrieve the current scenario
@@ -95 +95 @@
             return;
 
-        if(GBGPS_Scenario::STOP == $this->scenarios[$id]->process($pagenow)) {
+        if(GBGPS_Scenario::STOP == $this->scenarios[$id]->process($pagenow, $typenow)) {
             $this->set_active_scenario();
         }
@@ -127 +127 @@
     public function admin_menu() {
         $this->handlePost();
-        add_menu_page( GB_GPS_ADMIN_MENU_PAGE_TITLE, GB_GPS_ADMIN_MENU_MENU_TITLE, 'edit_posts', self::MENU_SLUG, array(&$this, 'display_admin_menu') );
+        add_menu_page( GB_GPS_ADMIN_MENU_PAGE_TITLE, GB_GPS_ADMIN_MENU_MENU_TITLE, 'read', self::MENU_SLUG, array(&$this, 'display_admin_menu') );
     }
 
@@ -149 +149 @@
     public function display_admin_menu() {
         // Security check
-        if(!current_user_can('edit_posts')) {
+        if(!current_user_can('read')) {
             wp_die(GB_GPS_MESSAGE_CAPABILITY_ERROR);
         }

wordpress-gps/trunk/include/gb_gps_pointer.php

@@ -5 +5 @@
     protected $content;
     protected $position;
+    protected $post_type;
 
     /**
@@ -15 +16 @@
             'content' => '',
             'position' => '',
+            'post_type' => '',
         );
 
@@ -34 +36 @@
             'content' => $this->content,
             'position' => $this->position,
+            'post_type' => $this->post_type,
         );
     }
@@ -40 +43 @@
      * Include the needed JavaScript to show the pointer(s)
      */
-    public static function process($pointers) {
+    public static function process($pointers, $post_type) {
         $nonce = wp_create_nonce('gb_gps_ajax_nonce');
 
         $args = array();
         foreach($pointers as $pointer) {
-            $args[] = $pointer->args();
+            if( empty( $pointer->post_type ) || $post_type == $pointer->post_type )
+                $args[] = $pointer->args();
         }
+
+        if( empty( $args ) )
+            return FALSE;
 
         ?>
@@ -91 +98 @@
         </script>
         <?php
+
+        return TRUE;
     }
 }

wordpress-gps/trunk/include/gb_gps_scenario.php

@@ -29 +29 @@
      * Retrieve the current page hook and decide which pointer to show
      */
-    public function process($hook) {
+    public function process($hook, $post_type = NULL) {
         if(empty($this->pointers[$hook])) {
             $hook = 'all';
         }
 
+        $displayed = FALSE;
+
         if(!empty($this->pointers[$hook])) {
-            GBGPS_Pointer::process($this->pointers[$hook]);
+            $displayed = GBGPS_Pointer::process($this->pointers[$hook], $post_type);
         }
 
-        return $this->places[$hook] == $this->nb_pointers - 1 ? self::STOP : 0;
+        return $displayed && $this->places[$hook] == $this->nb_pointers - 1 ? self::STOP : 0;
     }
 

wordpress-gps/trunk/readme.txt

@@ -3 +3 @@
 Tags: admin, help, tutorial, scenario, pointers, backend, plugin, training
 Requires at least: 3.3.0
-Tested up to: 3.4
-Stable tag: 1.0.11
+Tested up to: 3.6
+Stable tag: 1.0.13
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -46 +46 @@
 
 == Changelog ==
+
+= 1.0.13 =
+* Removed useless capability check for displaying admin menu / props colouro
+* Allow a pointer to be post_type specific / props colouro
 
 = 1.0.11 =

wordpress-gps/trunk/scenarios.php

@@ -23 +23 @@
                 array(
                     'selector' => '.add-new-h2',
+                    'post_type' => 'post',
                     'content' => '<h3>' . GB_GPS_ADD_FROM_LIST_POINTER_TITLE . '</h3><p>' . sprintf(GB_GPS_ADD_FROM_LIST_POINTER_CONTENT, __('post')) . '</p>',
                     'position' => array(
@@ -53 +54 @@
                 array(
                     'selector' => '#title',
+                    'post_type' => 'post',
                     'content' => '<h3>' . GB_GPS_ADD_CAT_TO_POST_LIST_POINTER_TITLE . '</h3><p>' . GB_GPS_ADD_CAT_TO_POST_LIST_POINTER_CONTENT . '</p>',
                     'position' => array(
@@ -64 +66 @@
                 array(
                     'selector' => '#categorydiv',
+                    'post_type' => 'post',
                     'content' => '<h3>' . GB_GPS_ADD_CAT_TO_POST_CATEGORY_POINTER_TITLE . '</h3><p>' . GB_GPS_ADD_CAT_TO_POST_CATEGORY_POINTER_CONTENT .'</p>',
                     'position' => array(