Changeset 1809716

Timestamp:

01/26/2018 01:00:17 AM (8 years ago)

Author:

DevonOstendorf

Message:

Code comprising all fixes, functionality, and improvements for v1.1.0

• README.txt:

• Updated Tested up to tag to 4.9

• Added Requires PHP tag (set to 5.6)

• Added description of shortcode functionality, in Description section

• Revised FAQ items, concerning translation and open source analytics, to make current

• Supplemented FAQ section to explain various aspects of shortcode use

• admin/class-local-like-and-share-admin.php:

• Modified add_local_like_and_share_admin_menu() function, passing 'dashicons-heart' as icon_url parameter, to add_menu_page() call

• admin/views/local-like-and-share-admin-display-options.php:

• Removed question mark from "Show on individual post?" field label in Share Settings section, to match corresponding field label in Like Settings section (NO functionality change)

• includes/class-local-like-and-share.php:

• Modified define_public_hooks() function, adding action to register Like and Share shortcodes and renaming callback functions for localization of button handler scripts

• languages/local-like-and-share.pot:

• Revised source translation text file to contain complete set of Local Like And Share's translatable strings up through v1.1.0

• public/class-local-like-and-share-public.php:

• Modified enqueue_styles() function, replacing configurable styling code with call to new define_configurable_css() function

• Added new define_configurable_css() function

• Added new register_shortcodes() function

• Added new render_shortcode_button() function

• Added new override_configured_css() function

• Modified add_like_and_share_buttons_to_content() function, preventing Like and Share buttons from displaying on search results pages, since, depending on positioning settings, buttons may not render properly. With shortcodes now available, admins can instead place buttons directly into their search page template.

• Modified add_like_button_to_content() function, adding $id parameter and updating Like button creation code to use it to uniquely assign Like buttons, allowing for greater control over button positioning. Renamed HTML element IDs to prevent naming clashes with other plugins' elements. Replaced divs with spans, for Like buttons, to allow shortcode-generated Like buttons to be dropped in the middle of post/page body. Replaced multiple calls to get_the_ID() (WordPress core) function with a single call, assigned to a variable, and then referenced throughout, to improve performance.

• Modified add_share_button_to_content() function, adding $id parameter and updating Share button creation code to use it to uniquely assign Share buttons, allowing for greater control over button positioning. Renamed HTML element IDs to prevent naming clashes with other plugins' elements. Replaced divs with spans, for Share buttons, to allow shortcode-generated Share buttons to be dropped in the middle of post/page body. Replaced multiple calls to get_the_ID() (WordPress core) function with a single call, assigned to a variable, and then referenced throughout, to improve performance.

• Renamed like_button_clicked_enqueue() function to localize_like_button_handler_script to more accurately reflect its purpose

• Modified like_button_clicked_ajax_handler() function, removing obsolete assignment of $button_num variable and updating wp_send_json() call to reference $post_id instead. Renamed HTML element IDs to prevent naming clashes with other plugins' elements.

• Renamed share_button_clicked_enqueue() function to localize_share_button_handler_script to more accurately reflect its purpose

• public/css/local-like-and-share-shortcode.css:

• New (blank) file used as attachment point for wp_add_inline_style() function call

• public/js/local-like-and-share-public.js:

• Modified AJAX callback function, triggered when a Like button is pressed, to handle (potentially) multiple like buttons for a specific post or page

• public/js/local-like-and-share-public.min.js:

• Updated JavaScript file containing minified local-like-and-share-public.js code

Location:

local-like-and-share/trunk

Files:

• README.txt (modified) (3 diffs)
• admin/class-local-like-and-share-admin.php (modified) (1 diff)
• admin/views/local-like-and-share-admin-display-options.php (modified) (1 diff)
• includes/class-local-like-and-share.php (modified) (1 diff)
• languages/local-like-and-share.pot (modified) (3 diffs)
• public/class-local-like-and-share-public.php (modified) (20 diffs)
• public/css/local-like-and-share-shortcode.css (added)
• public/js/local-like-and-share-public.js (modified) (1 diff)
• public/js/local-like-and-share-public.min.js (modified) (1 diff)

local-like-and-share/trunk/README.txt

@@ -4 +4 @@
 Tags: like, share, local, self-hosted, standalone, track like, track share
 Requires at least: 4.3
-Tested up to: 4.6
+Tested up to: 4.9
+Requires PHP: 5.6
 Stable tag: 1.0.6
 License: GPLv2 or later
@@ -44 +45 @@
     * No shares found
     
+* Versatile shortcode functionality:
+    * Generate like button directly in content
+    * Generate share button directly in content
+    * Usable in posts and on pages
+    
 * Configurable widget labels/input field placeholders:
     * Show like section?
@@ -105 +111 @@
 = Why isn't Local Like And Share translated into my language? =
 
-It is because no one who speaks your language has translated this plugin yet.  If you'd like to do so, you'll find the current local-like-and-share.pot file in the local-like-and-share/languages directory.  [Please contact me](https://devonostendorf.com) with any translation files you create - thanks much!
+It is because no one who speaks your language has translated this plugin yet.  If you'd like to do so, you'll find the current local-like-and-share.pot file in the local-like-and-share/languages directory.  [Please contact me](https://devonostendorf.com) with any translation files you create; I will help you get set up as a Project Translation Editor (PTE) with the WordPress.org [Polyglots team](https://make.wordpress.org/polyglots/) to create a language pack for Local Like And Share - thanks much!
 
 = Why build another like and share plugin? =
 
-This was a somewhat spontaneous project; I wanted to add an easy-to-set-up way to allow likes and shares without requiring the user to sign into some other service.  And lots of people choose not to use Facebook or Twitter.  If you do, there are plenty of other plugins available.  There are also other existing plugins that provide similar functionality but require you to maintain an account on their server(s) to access statistics.  My aim was to provide a simple, self-contained, and locally-hosted tool where your stats stay with you (in the same way that the excellent [Piwik](http://piwik.org) does for analytics).  All while being independent from and unaffected by the whims of outside organizations that may change things without your knowledge or permission.
+This was a somewhat spontaneous project; I wanted to add an easy-to-set-up way to allow likes and shares without requiring the user to sign into some other service.  And lots of people choose not to use Facebook or Twitter.  If you do, there are plenty of other plugins available.  There are also other existing plugins that provide similar functionality but require you to maintain an account on their server(s) to access statistics.  My aim was to provide a simple, self-contained, and locally-hosted tool where your stats stay with you (in the same way that the excellent [Matomo](https://matomo.org) does for analytics).  All while being independent from and unaffected by the whims of outside organizations that may change things without your knowledge or permission.
 
 = How do I reset like or share counts? =
 
 Go to the View Statistics page (Local Like And Share >> View Statistics), select the "All-time" tab, and press either the "Reset all like counts" or "Reset all share counts" button.  This will reset ALL of your likes or shares (depending on which button you press).  You will be presented with an "Undo" link immediately after having pressed a delete button.  If you pressed a delete button by accident, or change your mind about deleting your counts, you must click the undo link IMMEDIATELY; your action CANNOT be reversed later.
+
+= How do I use the shortcodes? =
+
+1. Go to Settings >> Local Like And Share and make sure the settings in the Common Settings, Like Settings, and Share Settings sections are populated to your liking   
+<br /><br />  
+
+    **Note**: "Button(s) position on post", "Show on post index pages", and "Show on individual post" are not relevant to the shortcodes.   
+<br /><br />  
+
+2. Add `[llas_like]` or `[llas_share]` to a post or page   
+<br /><br />  
+
+3. If you use either shortcode more than once in a post or on a page, you MUST specify a unique value for the `id` attribute
+
+    Here is an example, passing the id attribute:    
+    
+    Somewhere in the middle of a post, we drop a like button.
+    <pre>[llas_like id="1"]</pre>
+    It is fine to reuse the same id for a share button.
+    <pre>[llas_share id="1"]</pre>
+    But we need to make the like button ids unique and here is a second one.
+    <pre>[llas_like id="2"]</pre>
+    And the second share button id must also be unique (among share buttons).
+    <pre>[llas_share id="2"]</pre>
+    That's all there is to it!
 
 == Screenshots ==

local-like-and-share/trunk/admin/class-local-like-and-share-admin.php

@@ -263 +263 @@
             ,'local-like-and-share-menu'
             ,null
-            ,''
+            ,'dashicons-heart'
             ,$local_like_and_share_options_arr['admin_menu_position']
         );

local-like-and-share/trunk/admin/views/local-like-and-share-admin-display-options.php

@@ -216 +216 @@
                     <tr valign="top">
                         <th scope="row">
-                            <?php esc_html_e( 'Show on individual post?:', 'local-like-and-share' ); ?>
+                            <?php esc_html_e( 'Show on individual post:', 'local-like-and-share' ); ?>
                         </th>
                         <td>

local-like-and-share/trunk/includes/class-local-like-and-share.php

@@ -221 +221 @@
         $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
 
+        // Register Like and Share shortcodes
+        $this->loader->add_action( 'init', $plugin_public, 'register_shortcodes' ); 
+
         // Display Like and Share buttons on posts
         $this->loader->add_filter( 'the_content', $plugin_public, 'add_like_and_share_buttons_to_content' );
 
         // Like button functionality
-        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'like_button_clicked_enqueue' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'localize_like_button_handler_script' );
         $this->loader->add_action( 'wp_ajax_like_button_clicked', $plugin_public, 'like_button_clicked_ajax_handler' );
         $this->loader->add_action( 'wp_ajax_nopriv_like_button_clicked', $plugin_public, 'like_button_clicked_ajax_handler' );
 
         // Share button functionality
-        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'share_button_clicked_enqueue' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'localize_share_button_handler_script' );
         $this->loader->add_action( 'wp_ajax_share_button_clicked', $plugin_public, 'share_button_clicked_ajax_handler' );
         $this->loader->add_action( 'wp_ajax_nopriv_share_button_clicked', $plugin_public, 'share_button_clicked_ajax_handler' );

local-like-and-share/trunk/languages/local-like-and-share.pot

@@ -1 @@
-# Copyright (C) 2016 Local Like And Share
+# Copyright (C) 2018 Local Like And Share
 # This file is distributed under the same license as the Local Like And Share package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Local Like And Share 1.0.6\n"
+"Project-Id-Version: Local Like And Share 1.1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/local-like-and-"
 "share\n"
-"POT-Creation-Date: 2016-11-03 15:12:15+00:00\n"
+"POT-Creation-Date: 2018-01-25 21:43:49+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2018-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Devon Ostendorf <[email protected]>\n"
 "Language-Team: Devon Ostendorf <[email protected]>\n"
@@ -154 +154 @@
 
 #: admin/views/local-like-and-share-admin-display-options.php:131
+#: admin/views/local-like-and-share-admin-display-options.php:218
 msgid "Show on individual post:"
 msgstr ""
@@ -186 +187 @@
 #: admin/views/local-like-and-share-admin-display-options.php:198
 msgid "Share Settings"
-msgstr ""
-
-#: admin/views/local-like-and-share-admin-display-options.php:218
-msgid "Show on individual post?:"
 msgstr ""
 

local-like-and-share/trunk/public/class-local-like-and-share-public.php

@@ -75 +75 @@
         wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/local-like-and-share-public.min.css', array(), $this->version, 'all' );
 
-        // Define all configurable styling here (everything else is in .css file) 
-        
-        $local_like_and_share_options_arr = get_option( 'local_like_and_share_settings' );
-
-        $btn_hover_message_background_color = $local_like_and_share_options_arr['btn_hover_message_background_color'];
-        $btn_hover_message_text_color = $local_like_and_share_options_arr['btn_hover_message_text_color'];
-
-        $count_background_color = $local_like_and_share_options_arr['count_background_color'];
-        $count_outline_color = $local_like_and_share_options_arr['count_outline_color'];
-        $count_text_color = $local_like_and_share_options_arr['count_text_color'];
-    
-        $like_button_color = $local_like_and_share_options_arr['like_btn_color'];
-        $like_button_hover_color = $local_like_and_share_options_arr['like_btn_hover_color'];
-
-        $share_button_color = $local_like_and_share_options_arr['share_btn_color'];
-        $share_button_hover_color = $local_like_and_share_options_arr['share_btn_hover_color'];
-        
-        if ( 'left' == $local_like_and_share_options_arr['button_posn_horiz'] ) {
-        
-            // Position button to left of post
-            $button_posn = 'float:left;margin:0px 10px 10px 0px';
-        } 
-        else {
-            
-            // Position button to right of post
-            $button_posn = 'float:right;margin:0px 0px 10px 10px';
-        }
-
-        $llas_buttons_style = '
-            .llas-like-button-active {
-                ' . $button_posn . ';           
-            }
-            .llas-like-button-active i {
-                cursor: pointer;
-                cursor: hand;
-            }
-            .llas-like-button-active a,
-            .llas-like-button-active a:visited,
-            .llas-like-button-active a:focus {
-                color: ' . esc_html( $like_button_color ) . ';
-            }
-            .llas-like-button-active a:hover {
-                color: ' . esc_html( $like_button_hover_color ) . ';
-            }
-            .llas-like-button-inactive {
-                ' . $button_posn . ';           
-            }
-            .llas-like-button-inactive a,
-            .llas-like-button-inactive a:visited,
-            .llas-like-button-inactive a:focus,
-            .llas-like-button-inactive a:hover {
-                color: ' . esc_html( $like_button_color ) . ';
-            }
-
-            .llas-share-button-active {
-                ' . $button_posn . ';           
-            }
-            .llas-share-button-active i {
-                cursor: pointer;
-                cursor: hand;
-            }
-            .llas-share-button-active a,
-            .llas-share-button-active a:visited,
-            .llas-share-button-active a:focus {
-                color: ' . esc_html( $share_button_color ) . ';
-            }
-            .llas-share-button-active a:hover {
-                color: ' . esc_html( $share_button_hover_color ) . ';
-            }
-
-            .llas-callout {
-                background-color: ' . esc_html( $count_background_color ) . ';
-                color: ' . esc_html( $count_text_color ) . ';
-            }
-            .llas-callout .llas-notch {
-                border-right: 5px solid ' . esc_html( $count_background_color ). ';     
-            }
-            .llas-border-callout {
-                border: 1px solid ' . esc_html( $count_outline_color ) . ';
-                padding: 2px 9px;
-            }
-            .llas-border-callout .llas-border-notch {
-                border-right-color: ' . esc_html( $count_outline_color ) . ';
-                left: -6px;
-            }   
-            
-            .tipsy-inner { 
-                background-color: ' . esc_html( $btn_hover_message_background_color ) . ';
-                color: ' . esc_html( $btn_hover_message_text_color ) . ';
-                max-width: 200px;
-                padding: 5px 8px 4px 8px;
-                text-align: center; 
-                font-size: 13px;
-            }
-            .tipsy-arrow-n {
-                border-bottom-color: ' . esc_html( $btn_hover_message_background_color ) . ';
-            }
-        ';
-        wp_add_inline_style( $this->plugin_name, $llas_buttons_style );
+        // Define all configurable styling 
+        $this->define_configurable_css();
 
     }
@@ -198 +101 @@
     }
 
+    /**
+     * Define CSS based on configured settings.
+     *
+     * @since   1.1.0
+     * @access  private
+     */ 
+    private function define_configurable_css() {
+                
+        // Define all configurable styling here (everything else is in .css file) 
+        
+        $local_like_and_share_options_arr = get_option( 'local_like_and_share_settings' );
+
+        $btn_hover_message_background_color = $local_like_and_share_options_arr['btn_hover_message_background_color'];
+        $btn_hover_message_text_color = $local_like_and_share_options_arr['btn_hover_message_text_color'];
+
+        $count_background_color = $local_like_and_share_options_arr['count_background_color'];
+        $count_outline_color = $local_like_and_share_options_arr['count_outline_color'];
+        $count_text_color = $local_like_and_share_options_arr['count_text_color'];
+    
+        $like_button_color = $local_like_and_share_options_arr['like_btn_color'];
+        $like_button_hover_color = $local_like_and_share_options_arr['like_btn_hover_color'];
+
+        $share_button_color = $local_like_and_share_options_arr['share_btn_color'];
+        $share_button_hover_color = $local_like_and_share_options_arr['share_btn_hover_color'];
+        
+        if ( 'left' == $local_like_and_share_options_arr['button_posn_horiz'] ) {
+        
+            // Position button to left of post
+            $button_posn = 'float:left;margin:0px 10px 10px 0px';
+        } 
+        else {
+            
+            // Position button to right of post
+            $button_posn = 'float:right;margin:0px 0px 10px 10px';
+        }
+
+        $llas_buttons_style = '
+            .llas-like-button-active {
+                ' . $button_posn . ';           
+            }
+            .llas-like-button-active i {
+                cursor: pointer;
+                cursor: hand;
+            }
+            .llas-like-button-active a,
+            .llas-like-button-active a:visited,
+            .llas-like-button-active a:focus {
+                color: ' . esc_html( $like_button_color ) . ';
+            }
+            .llas-like-button-active a:hover {
+                color: ' . esc_html( $like_button_hover_color ) . ';
+            }
+            .llas-like-button-inactive {
+                ' . $button_posn . ';           
+            }
+            .llas-like-button-inactive a,
+            .llas-like-button-inactive a:visited,
+            .llas-like-button-inactive a:focus,
+            .llas-like-button-inactive a:hover {
+                color: ' . esc_html( $like_button_color ) . ';
+            }
+
+            .llas-share-button-active {
+                ' . $button_posn . ';           
+            }
+            .llas-share-button-active i {
+                cursor: pointer;
+                cursor: hand;
+            }
+            .llas-share-button-active a,
+            .llas-share-button-active a:visited,
+            .llas-share-button-active a:focus {
+                color: ' . esc_html( $share_button_color ) . ';
+            }
+            .llas-share-button-active a:hover {
+                color: ' . esc_html( $share_button_hover_color ) . ';
+            }
+
+            .llas-callout {
+                background-color: ' . esc_html( $count_background_color ) . ';
+                color: ' . esc_html( $count_text_color ) . ';
+            }
+            .llas-callout .llas-notch {
+                border-right: 5px solid ' . esc_html( $count_background_color ). ';     
+            }
+            .llas-border-callout {
+                border: 1px solid ' . esc_html( $count_outline_color ) . ';
+                padding: 2px 9px;
+            }
+            .llas-border-callout .llas-border-notch {
+                border-right-color: ' . esc_html( $count_outline_color ) . ';
+                left: -6px;
+            }   
+            
+            .tipsy-inner { 
+                background-color: ' . esc_html( $btn_hover_message_background_color ) . ';
+                color: ' . esc_html( $btn_hover_message_text_color ) . ';
+                max-width: 200px;
+                padding: 5px 8px 4px 8px;
+                text-align: center; 
+                font-size: 13px;
+            }
+            .tipsy-arrow-n {
+                border-bottom-color: ' . esc_html( $btn_hover_message_background_color ) . ';
+            }
+        ';
+        wp_add_inline_style( $this->plugin_name, $llas_buttons_style );
+       
+    }
+
+    
+    // Functions related to like and share button shortcodes
+    
+    /**
+     * Register shortcodes to render Like and Share buttons directly in
+     *  post/page content.
+     *
+     * @since   1.1.0
+     */
+    public function register_shortcodes() {
+        
+        add_shortcode( 'llas_like', array( $this, 'render_shortcode_button' ) );
+        add_shortcode( 'llas_share', array( $this, 'render_shortcode_button' ) );
+        
+    }
+
+    /**
+     * Render shortcode-generated button.
+     *
+     * @since   1.1.0
+     * @param   array   $atts   An associative array of attributes, or an empty string if no attributes are given.
+     * @param   string  $content    The enclosed content (if the shortcode is used in its enclosing form).
+     * @param   string  $tag    The shortcode name.
+     * @return  string  The HTML to render Like or Share button.
+     */
+    public function render_shortcode_button( $atts, $content = null, $tag ) {
+
+        $type = substr( $tag, 5 );
+        
+        $clean_atts = shortcode_atts(
+            array(
+                'id' => '1'
+            )
+            ,$atts
+            ,$tag
+        );
+        
+        $this->override_configured_css( $type, $clean_atts );
+
+        $button_method = "add_{$type}_button_to_content";
+        if ( method_exists( $this, $button_method ) ) {
+            
+            return $this->$button_method( $clean_atts['id'] );
+            
+        }
+                
+    }
+    
+    /**
+     * Override configured CSS for specific shortcode-generated button, allowing 
+     *  for its display directly in post/page content.
+     *
+     * @since   1.1.0
+     * @access  private
+     * @param   string  $type   Type of shortcode ("like" or "share").
+     * @param   array   $atts   An associative array of attributes, or an empty string if no attributes are given.
+     */
+    private function override_configured_css( $type, $atts ) {
+
+        global $post;
+
+        $post_id = get_the_ID();
+
+        // NOTE: This is a blank stylesheet, merely used as an attachment point for wp_add_inline_style()
+        wp_enqueue_style( $this->plugin_name . '-shortcode', plugin_dir_url( __FILE__ ) . 'css/local-like-and-share-shortcode.css', array(), $this->version, 'all' );
+       
+       $llas_buttons_style = '
+            #id_llas_spn_' . $type . '_button_' . $post_id . '_' . $atts['id'] . ' {
+                float: none;            
+            }
+        ';
+        
+        wp_add_inline_style( $this->plugin_name.'-shortcode', $llas_buttons_style );
+   
+   }
+    
     
     // Functions related to display of like and share buttons and (AJAX) handling of 
@@ -212 +301 @@
 
         global $post;
-
+        
         // Only show buttons on published posts
-        if ( ( 'post' != $post->post_type ) || ( 'publish' != $post->post_status ) ) {
+        if ( ( 'post' != $post->post_type ) || ( 'publish' != $post->post_status ) || ( is_search() ) ) {
             
             return $content;
@@ -258 +347 @@
             $content = $buttons_html . '<br />' .  $content;
         }           
-                
+            
         return $content;
         
@@ -306 +395 @@
      * @since   1.0.0
      * @access  private
+     * @param   string  $id Shortcode ID.
      * @return  string  The Like button HTML.
      */
-    private function add_like_button_to_content() {
+    private function add_like_button_to_content( $id = 'classic' ) {
 
         global $post;
         global $wpdb;
         
+        $post_id = get_the_ID();
+        
         $local_like_and_share_options_arr = get_option( 'local_like_and_share_settings' );
 
         // Get like total for specific post from post meta data
-        $like_total = get_post_meta( get_the_ID(), 'local_like_and_share_like_total', true );
+        $like_total = get_post_meta( $post_id, 'local_like_and_share_like_total', true );
         if ( empty( $like_total ) ) {
             $like_total = 0;
@@ -324 +416 @@
         
         $like_count_span = 
-            '<span id="id_spnLikeCount" class="llas-callout llas-border-callout">'
+            '<span id="id_llas_spn_like_count_' . $post_id . '_' . $id . '" class="llas-callout llas-border-callout">'
             . Local_Like_And_Share_Misc::format_count_display( $like_total )
             . '<b class="llas-border-notch llas-notch"></b>'
@@ -331 +423 @@
         ;
         
-        $user_already_liked = $this->current_user_already_liked_post( $this->get_current_user_identifier(), get_the_ID() );
+        $user_already_liked = $this->current_user_already_liked_post( $this->get_current_user_identifier(), $post_id );
         if ( $user_already_liked ) {
                       
@@ -337 +429 @@
             $button_link = '<a id="id_dummy" rel="tipsy" title="' . esc_attr( $local_like_and_share_options_arr['like_btn_hover_info_message_already_liked'] ) . '">';
 
-            $like_button = '<div class="llas-like-button-inactive">' 
+            $like_button = '<span class="llas-like-button-inactive" id="id_llas_spn_like_button_' . $post_id . '_' . $id . '">'
                 . $button_link
                 . $button_icon
                 . '</a>'
                 . $like_count_span 
-                . '</div>'
+                . '</span>'
             ;
 
@@ -349 +441 @@
 
             // Current user/visitor has NOT yet liked this post
-            $button_link = '<a class="like_button" id="id_lnkLikeButton_' . get_the_ID() . '" data-post-id="' . get_the_ID() . '" rel="tipsy" title="' . esc_attr( $local_like_and_share_options_arr['like_btn_hover_call_to_action'] ) . '">';
-
-            $like_button = '<div class="llas-like-button-active" id="id_divLikeButton_' . get_the_ID() . '">' 
+            $button_link = '<a class="like_button" id="id_llas_lnk_like_button_' . $post_id . '_' . $id . '" data-post-id="' . $post_id . '" rel="tipsy" title="' . esc_attr( $local_like_and_share_options_arr['like_btn_hover_call_to_action'] ) . '">';
+
+            $like_button = '<span class="llas-like-button-active" id="id_llas_spn_like_button_' . $post_id . '_' . $id . '">' 
                 . $button_link
                 . $button_icon
                 . '</a>'
                 . $like_count_span 
-                . '</div>'
+                . '</span>'
             ;
 
@@ -432 +524 @@
      * @since   1.0.0
      * @access  private
+     * @param   string  $id Shortcode ID.
      * @return  string  The Share button HTML.
      */
-    private function add_share_button_to_content() {
+    private function add_share_button_to_content( $id = 'classic' ) {
         
         global $post;
         global $wpdb;
         
+        $post_id = get_the_ID();
+        
         $local_like_and_share_options_arr = get_option( 'local_like_and_share_settings' );
 
         // Get share total for specific post from post meta data
-        $share_total = get_post_meta( get_the_ID(), 'local_like_and_share_share_total', true );
+        $share_total = get_post_meta( $post_id, 'local_like_and_share_share_total', true );
         if ( empty( $share_total ) ) {
             $share_total = 0;
@@ -450 +545 @@
         
         $share_count_span = 
-            '<span id="id_spnShareCount" class="llas-callout llas-border-callout">'
+            '<span id="id_llas_spn_share_count" class="llas-callout llas-border-callout">'
             . Local_Like_And_Share_Misc::format_count_display( $share_total )
             . '<b class="llas-border-notch llas-notch"></b>'
@@ -462 +557 @@
         // Replace variables in both the share post email subject and body 
             
-        $post_attribs = get_post( get_the_ID() ); 
+        $post_attribs = get_post( $post_id ); 
         $post_title = $post_attribs->post_title;
-        $post_permalink = get_permalink( get_the_ID() );
+        $post_permalink = get_permalink( $post_id );
 
         $share_email_subject = $local_like_and_share_options_arr['share_eml_subj'];
@@ -482 +577 @@
             . '&body=' . esc_attr( $share_email_body )
             . '" '
-            . 'id="id_lnkShareButton_' . get_the_ID() . '" data-post-id="' . get_the_ID() . '" rel="tipsy" title="' . esc_attr( $local_like_and_share_options_arr['share_btn_hover_call_to_action'] ) . '">';
-
-        $share_button = '<div class="llas-share-button-active" id="id_divShareButton_' . get_the_ID() . '">'
+            . 'id="id_llas_lnk_share_button_' . $post_id . '_' . $id . '" data-post-id="' . $post_id . '" rel="tipsy" title="' . esc_attr( $local_like_and_share_options_arr['share_btn_hover_call_to_action'] ) . '">';
+
+        $share_button = '<span class="llas-share-button-active" id="id_llas_spn_share_button_' . $post_id . '_' . $id . '">'
             . $button_link
             . $button_icon
             . '</a>'
             . $share_count_span 
-            . '</div>'
+            . '</span>'
         ;
 
@@ -495 +590 @@
             
     }           
-    
-    /**
-     * Enqueue AJAX script that fires when "Like" button (on post) is pressed.
-     *
-     * @since   1.0.0
+
+    /**
+     * Localize AJAX script that fires when "Like" button (on post/page) is pressed.
+     *
+     * @since   1.1.0
      * @param   string  $hook   The current page name.
      */
-    public function like_button_clicked_enqueue( $hook ) {
+    public function localize_like_button_handler_script( $hook ) {
     
         $like_button_clicked_nonce = wp_create_nonce( 'like_button_clicked' );
@@ -533 +628 @@
         $button_id = $_POST['btn_id'];
         
-        // Button number starts at position 17 in $button_id (due to prefix of 'id_lnkLikeButton_')
-        $button_num = substr( $button_id, 17);
-
         // Get like total for specific post from post meta data
         $like_total = get_post_meta( $post_id, 'local_like_and_share_like_total', true );
@@ -555 +647 @@
             $like_total += 1;
             $like_count_span = 
-                '<span id="id_spnLikeCount" class="llas-callout llas-border-callout">'
+                '<span id="id_llas_spn_like_count" class="llas-callout llas-border-callout">'
                 . Local_Like_And_Share_Misc::format_count_display( $like_total )
                 . '<b class="llas-border-notch llas-notch"></b>'
@@ -598 +690 @@
                 // Manually kill AJAX handler
                 wp_die();
+
             }
         }
@@ -604 +697 @@
             // User ALREADY liked this!
             $like_count_span = 
-                '<span id="id_spnLikeCount" class="llas-callout llas-border-callout">'
+                '<span id="id_llas_spn_like_count" class="llas-callout llas-border-callout">'
                 . Local_Like_And_Share_Misc::format_count_display( $like_total )
                 . '<b class="llas-border-notch llas-notch"></b>'
@@ -623 +716 @@
         }
 
-        wp_send_json( array( 'button_num' => $button_num, 'message' => $like_button_clicked_msg ) );
+        wp_send_json( array( 'post_id' => $post_id, 'message' => $like_button_clicked_msg ) );
                 
     }
 
     /**
-     * Enqueue AJAX script that fires when "Share" button (on post) is pressed.
-     *
-     * @since   1.0.0
+     * Localize AJAX script that fires when "Share" button (on post/page) is pressed.
+     *
+     * @since   1.1.0
      * @param   string  $hook   The current page name.
      */
-    public function share_button_clicked_enqueue( $hook ) {
+    public function localize_share_button_handler_script( $hook ) {
     
         $share_button_clicked_nonce = wp_create_nonce( 'share_button_clicked' );
@@ -694 +787 @@
         wp_die();
         
-   }
-      
+   }   
+
 }   

local-like-and-share/trunk/public/js/local-like-and-share-public.js

@@ -16 +16 @@
                 // Hide old Tipsy tooltip
                 $('.tipsy:last').remove();
-                
-                // Deactivate button
-                jQuery("#id_divLikeButton_" + data.button_num).removeClass("llas-like-button-active").addClass("llas-like-button-inactive");
- 
-                // Render deactivated button, new tooltip message, and updated like count
-                jQuery("#id_divLikeButton_" + data.button_num).html(data.message);              
+               
+                // Handle (potentially) multiple like buttons, per post/page
+                $("[id^=id_llas_spn_like_button_"+data.post_id+"]").each(function(index) {
+
+                    // Deactivate button
+                    $(this).removeClass("llas-like-button-active").addClass("llas-like-button-inactive");
+                
+                    // Render deactivated button, new tooltip message, and updated like count, for each button
+                    $(this).html(data.message);                 
+                });
+                    
                 $('a[rel="tipsy"]').tipsy({fade: true, opacity: 1});
             });

local-like-and-share/trunk/public/js/local-like-and-share-public.min.js

@@ -1 @@
-!function(t){"use strict";function i(t,i){return"function"==typeof t?t.call(i):t}function e(t){for(;t=t.parentNode;)if(t==document)return!0;return!1}function n(i,e){this.$element=t(i),this.options=e,this.enabled=!0,this.fixTitle()}t(function(){t(".like_button").click(function(i){var e=t(this),n=e.data("post-id"),s=e.attr("id");t.post(like_button_clicked_ajax_obj.ajax_url,{_ajax_nonce:like_button_clicked_ajax_obj.nonce,action:"like_button_clicked",post_id:n,btn_id:s},function(i){t(".tipsy:last").remove(),jQuery("#id_divLikeButton_"+i.button_num).removeClass("llas-like-button-active").addClass("llas-like-button-inactive"),jQuery("#id_divLikeButton_"+i.button_num).html(i.message),t('a[rel="tipsy"]').tipsy({fade:!0,opacity:1})})})}),t(function(){t(".share_button").click(function(i){var e=t(this),n=e.data("post-id");t.post(share_button_clicked_ajax_obj.ajax_url,{_ajax_nonce:share_button_clicked_ajax_obj.nonce,action:"share_button_clicked",post_id:n},function(t){location.reload()})})}),t(function(){t('a[rel="tipsy"]').tipsy({fade:!0,opacity:1})}),n.prototype={show:function(){var e=this.getTitle();if(e&&this.enabled){var n=this.tip();n.find(".tipsy-inner")[this.options.html?"html":"text"](e),n[0].className="tipsy",n.remove().css({top:0,left:0,visibility:"hidden",display:"block"}).prependTo(document.body);var s,o=t.extend({},this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight}),a=n[0].offsetWidth,l=n[0].offsetHeight,f=i(this.options.gravity,this.$element[0]);switch(f.charAt(0)){case"n":s={top:o.top+o.height+this.options.offset,left:o.left+o.width/2-a/2};break;case"s":s={top:o.top-l-this.options.offset,left:o.left+o.width/2-a/2};break;case"e":s={top:o.top+o.height/2-l/2,left:o.left-a-this.options.offset};break;case"w":s={top:o.top+o.height/2-l/2,left:o.left+o.width+this.options.offset}}2==f.length&&("w"==f.charAt(1)?s.left=o.left+o.width/2-15:s.left=o.left+o.width/2-a+15),n.css(s).addClass("tipsy-"+f),n.find(".tipsy-arrow")[0].className="tipsy-arrow tipsy-arrow-"+f.charAt(0),this.options.className&&n.addClass(i(this.options.className,this.$element[0])),this.options.fade?n.stop().css({opacity:0,display:"block",visibility:"visible"}).animate({opacity:this.options.opacity}):n.css({visibility:"visible",opacity:this.options.opacity})}},hide:function(){this.options.fade?this.tip().stop().fadeOut(function(){t(this).remove()}):this.tip().remove()},fixTitle:function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("original-title"))&&t.attr("original-title",t.attr("title")||"").removeAttr("title")},getTitle:function(){var t,i=this.$element,e=this.options;this.fixTitle();var t,e=this.options;return"string"==typeof e.title?t=i.attr("title"==e.title?"original-title":e.title):"function"==typeof e.title&&(t=e.title.call(i[0])),t=(""+t).replace(/(^\s*|\s*$)/,""),t||e.fallback},tip:function(){return this.$tip||(this.$tip=t('<div class="tipsy"></div>').html('<div class="tipsy-arrow"></div><div class="tipsy-inner"></div>'),this.$tip.data("tipsy-pointee",this.$element[0])),this.$tip},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled}},t.fn.tipsy=function(i){function e(e){var s=t.data(e,"tipsy");return s||(s=new n(e,t.fn.tipsy.elementOptions(e,i)),t.data(e,"tipsy",s)),s}function s(){var t=e(this);t.hoverState="in",0==i.delayIn?t.show():(t.fixTitle(),setTimeout(function(){"in"==t.hoverState&&t.show()},i.delayIn))}function o(){var t=e(this);t.hoverState="out",0==i.delayOut?t.hide():setTimeout(function(){"out"==t.hoverState&&t.hide()},i.delayOut)}if(i===!0)return this.data("tipsy");if("string"==typeof i){var a=this.data("tipsy");return a&&a[i](),this}if(i=t.extend({},t.fn.tipsy.defaults,i),i.live||this.each(function(){e(this)}),"manual"!=i.trigger){var l=i.live?"live":"bind",f="hover"==i.trigger?"mouseenter":"focus",r="hover"==i.trigger?"mouseleave":"blur";this[l](f,s)[l](r,o)}return this},t.fn.tipsy.defaults={className:null,delayIn:0,delayOut:0,fade:!1,fallback:"",gravity:"n",html:!1,live:!1,offset:0,opacity:.8,title:"title",trigger:"hover"},t.fn.tipsy.revalidate=function(){t(".tipsy").each(function(){var i=t.data(this,"tipsy-pointee");i&&e(i)||t(this).remove()})},t.fn.tipsy.elementOptions=function(i,e){return t.metadata?t.extend({},e,t(i).metadata()):e},t.fn.tipsy.autoNS=function(){return t(this).offset().top>t(document).scrollTop()+t(window).height()/2?"s":"n"},t.fn.tipsy.autoWE=function(){return t(this).offset().left>t(document).scrollLeft()+t(window).width()/2?"e":"w"},t.fn.tipsy.autoBounds=function(i,e){return function(){var n={ns:e[0],ew:e.length>1?e[1]:!1},s=t(document).scrollTop()+i,o=t(document).scrollLeft()+i,a=t(this);return a.offset().top<s&&(n.ns="n"),a.offset().left<o&&(n.ew="w"),t(window).width()+t(document).scrollLeft()-a.offset().left<i&&(n.ew="e"),t(window).height()+t(document).scrollTop()-a.offset().top<i&&(n.ns="s"),n.ns+(n.ew?n.ew:"")}}}(jQuery);
+!function(t){"use strict";function i(t,i){return"function"==typeof t?t.call(i):t}function e(t){for(;t=t.parentNode;)if(t==document)return!0;return!1}function s(i,e){this.$element=t(i),this.options=e,this.enabled=!0,this.fixTitle()}t(function(){t(".like_button").click(function(i){var e=t(this),s=e.data("post-id"),n=e.attr("id");t.post(like_button_clicked_ajax_obj.ajax_url,{_ajax_nonce:like_button_clicked_ajax_obj.nonce,action:"like_button_clicked",post_id:s,btn_id:n},function(i){t(".tipsy:last").remove(),t("[id^=id_llas_spn_like_button_"+i.post_id+"]").each(function(e){t(this).removeClass("llas-like-button-active").addClass("llas-like-button-inactive"),t(this).html(i.message)}),t('a[rel="tipsy"]').tipsy({fade:!0,opacity:1})})})}),t(function(){t(".share_button").click(function(i){var e=t(this).data("post-id");t.post(share_button_clicked_ajax_obj.ajax_url,{_ajax_nonce:share_button_clicked_ajax_obj.nonce,action:"share_button_clicked",post_id:e},function(t){location.reload()})})}),t(function(){t('a[rel="tipsy"]').tipsy({fade:!0,opacity:1})}),s.prototype={show:function(){var e=this.getTitle();if(e&&this.enabled){var s=this.tip();s.find(".tipsy-inner")[this.options.html?"html":"text"](e),s[0].className="tipsy",s.remove().css({top:0,left:0,visibility:"hidden",display:"block"}).prependTo(document.body);var n,o=t.extend({},this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight}),a=s[0].offsetWidth,l=s[0].offsetHeight,f=i(this.options.gravity,this.$element[0]);switch(f.charAt(0)){case"n":n={top:o.top+o.height+this.options.offset,left:o.left+o.width/2-a/2};break;case"s":n={top:o.top-l-this.options.offset,left:o.left+o.width/2-a/2};break;case"e":n={top:o.top+o.height/2-l/2,left:o.left-a-this.options.offset};break;case"w":n={top:o.top+o.height/2-l/2,left:o.left+o.width+this.options.offset}}2==f.length&&("w"==f.charAt(1)?n.left=o.left+o.width/2-15:n.left=o.left+o.width/2-a+15),s.css(n).addClass("tipsy-"+f),s.find(".tipsy-arrow")[0].className="tipsy-arrow tipsy-arrow-"+f.charAt(0),this.options.className&&s.addClass(i(this.options.className,this.$element[0])),this.options.fade?s.stop().css({opacity:0,display:"block",visibility:"visible"}).animate({opacity:this.options.opacity}):s.css({visibility:"visible",opacity:this.options.opacity})}},hide:function(){this.options.fade?this.tip().stop().fadeOut(function(){t(this).remove()}):this.tip().remove()},fixTitle:function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("original-title"))&&t.attr("original-title",t.attr("title")||"").removeAttr("title")},getTitle:function(){var t=this.$element,i=this.options;this.fixTitle();var e;return"string"==typeof(i=this.options).title?e=t.attr("title"==i.title?"original-title":i.title):"function"==typeof i.title&&(e=i.title.call(t[0])),(e=(""+e).replace(/(^\s*|\s*$)/,""))||i.fallback},tip:function(){return this.$tip||(this.$tip=t('<div class="tipsy"></div>').html('<div class="tipsy-arrow"></div><div class="tipsy-inner"></div>'),this.$tip.data("tipsy-pointee",this.$element[0])),this.$tip},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled}},t.fn.tipsy=function(i){function e(e){var n=t.data(e,"tipsy");return n||(n=new s(e,t.fn.tipsy.elementOptions(e,i)),t.data(e,"tipsy",n)),n}if(!0===i)return this.data("tipsy");if("string"==typeof i){var n=this.data("tipsy");return n&&n[i](),this}if((i=t.extend({},t.fn.tipsy.defaults,i)).live||this.each(function(){e(this)}),"manual"!=i.trigger){var o=i.live?"live":"bind",a="hover"==i.trigger?"mouseenter":"focus",l="hover"==i.trigger?"mouseleave":"blur";this[o](a,function(){var t=e(this);t.hoverState="in",0==i.delayIn?t.show():(t.fixTitle(),setTimeout(function(){"in"==t.hoverState&&t.show()},i.delayIn))})[o](l,function(){var t=e(this);t.hoverState="out",0==i.delayOut?t.hide():setTimeout(function(){"out"==t.hoverState&&t.hide()},i.delayOut)})}return this},t.fn.tipsy.defaults={className:null,delayIn:0,delayOut:0,fade:!1,fallback:"",gravity:"n",html:!1,live:!1,offset:0,opacity:.8,title:"title",trigger:"hover"},t.fn.tipsy.revalidate=function(){t(".tipsy").each(function(){var i=t.data(this,"tipsy-pointee");i&&e(i)||t(this).remove()})},t.fn.tipsy.elementOptions=function(i,e){return t.metadata?t.extend({},e,t(i).metadata()):e},t.fn.tipsy.autoNS=function(){return t(this).offset().top>t(document).scrollTop()+t(window).height()/2?"s":"n"},t.fn.tipsy.autoWE=function(){return t(this).offset().left>t(document).scrollLeft()+t(window).width()/2?"e":"w"},t.fn.tipsy.autoBounds=function(i,e){return function(){var s={ns:e[0],ew:e.length>1&&e[1]},n=t(document).scrollTop()+i,o=t(document).scrollLeft()+i,a=t(this);return a.offset().top<n&&(s.ns="n"),a.offset().left<o&&(s.ew="w"),t(window).width()+t(document).scrollLeft()-a.offset().left<i&&(s.ew="e"),t(window).height()+t(document).scrollTop()-a.offset().top<i&&(s.ns="s"),s.ns+(s.ew?s.ew:"")}}}(jQuery);