From d35b39233f8c78c750c21da8171f59c72bd4114b Mon Sep 17 00:00:00 2001
From: Edward Caissie <edward.caissie@gmail.com>
Date: Sun, 2 Nov 2014 22:07:09 -0500
Subject: [PATCH] * Released November 2014 * Set `widget.js` location to
 protocol agnostic * Cleaned up code * Improved i18n textdomain references *
 Changed tags to more simple references to plugin functionality

---
 .idea/bns-twitter-follow-button.iml |   5 +-
 .idea/codeStyleSettings.xml         |  50 ++
 .idea/webResources.xml              |  21 +-
 bns-tfbutton.php                    | 682 ++++++++++++++--------------
 readme.txt                          |  17 +-
 5 files changed, 416 insertions(+), 359 deletions(-)

diff --git a/.idea/bns-twitter-follow-button.iml b/.idea/bns-twitter-follow-button.iml
index ba3d99b..17bea77 100644
--- a/.idea/bns-twitter-follow-button.iml
+++ b/.idea/bns-twitter-follow-button.iml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/../../../wp-admin" />
-    <content url="file://$MODULE_DIR$" />
-    <content url="file://$MODULE_DIR$/../../../wp-includes" />
+    <content url="file://$MODULE_DIR$/../../.." />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="widgets" level="application" />
   </component>
 </module>
 
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 0c5222f..1889d46 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -5,9 +5,59 @@
       <value>
         <option name="LINE_SEPARATOR" value="&#10;" />
         <option name="RIGHT_MARGIN" value="80" />
+        <PHPCodeStyleSettings>
+          <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
+          <option name="ALIGN_ASSIGNMENTS" value="true" />
+          <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
+          <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+          <option name="LOWER_CASE_NULL_CONST" value="true" />
+          <option name="BLANK_LINE_BEFORE_RETURN_STATEMENT" value="true" />
+          <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+          <option name="SPACES_AROUND_VAR_WITHIN_BRACKETS" value="true" />
+          <option name="SPACE_BEFORE_UNARY_NOT" value="true" />
+          <option name="SPACE_AFTER_UNARY_NOT" value="true" />
+        </PHPCodeStyleSettings>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
+        <codeStyleSettings language="PHP">
+          <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+          <option name="CLASS_BRACE_STYLE" value="1" />
+          <option name="METHOD_BRACE_STYLE" value="1" />
+          <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
+          <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_FOR" value="false" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="SPACE_AROUND_UNARY_OPERATOR" value="true" />
+          <option name="SPACE_WITHIN_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_METHOD_CALL_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_METHOD_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_IF_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_WHILE_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_FOR_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_CATCH_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_SWITCH_PARENTHESES" value="true" />
+          <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+          <option name="SPACE_AFTER_TYPE_CAST" value="true" />
+          <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+          <option name="PARENTHESES_EXPRESSION_LPAREN_WRAP" value="true" />
+          <option name="PARENTHESES_EXPRESSION_RPAREN_WRAP" value="true" />
+          <option name="FOR_STATEMENT_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_RPAREN_ON_NEXT_LINE" value="true" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+          <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+          <option name="IF_BRACE_FORCE" value="3" />
+          <option name="DOWHILE_BRACE_FORCE" value="3" />
+          <option name="WHILE_BRACE_FORCE" value="3" />
+          <option name="FOR_BRACE_FORCE" value="3" />
+          <indentOptions>
+            <option name="USE_TAB_CHARACTER" value="true" />
+            <option name="SMART_TABS" value="true" />
+          </indentOptions>
+        </codeStyleSettings>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
diff --git a/.idea/webResources.xml b/.idea/webResources.xml
index a29a40a..f6e673a 100644
--- a/.idea/webResources.xml
+++ b/.idea/webResources.xml
@@ -1,22 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WebResourcesPaths">
-    <contentEntries>
-      <entry url="file://$PROJECT_DIR$/../../../wp-admin">
-        <entryData>
-          <resourceRoots>
-            <path value="file://$PROJECT_DIR$/../../../wp-admin" />
-          </resourceRoots>
-        </entryData>
-      </entry>
-      <entry url="file://$PROJECT_DIR$/../../../wp-includes">
-        <entryData>
-          <resourceRoots>
-            <path value="file://$PROJECT_DIR$/../../../wp-includes" />
-          </resourceRoots>
-        </entryData>
-      </entry>
-    </contentEntries>
-  </component>
-</project>
+<project version="4" />
 
diff --git a/bns-tfbutton.php b/bns-tfbutton.php
index 24b9a2b..c374f79 100644
--- a/bns-tfbutton.php
+++ b/bns-tfbutton.php
@@ -3,8 +3,8 @@
 Plugin Name: BNS Twitter Follow Button
 Plugin URI: http://buynowshop.com/plugins/bns-tfbutton
 Description: Based on the (JavaScript) Twitter Follow Button (https://twitter.com/about/resources/followbutton) featuring all of the functionality offered including language support.
-Version: 0.3.6
-Text Domain: bns-tfb
+Version: 0.3.7
+Text Domain: bns-twitter-follow-button
 Author: Edward Caissie
 Author URI: http://edwardcaissie.com/
 License: GNU General Public License v2
@@ -21,9 +21,9 @@
  * @link        http://buynowshop.com/plugins/bns-twitter-follow-button/
  * @link        https://github.com/Cais/bns-twitter-follow-button/
  * @link        http://wordpress.org/extend/plugins/bns-twitter-follow-button/
- * @version     0.3.6
+ * @version     0.3.7
  * @author      Edward Caissie <edward.caissie@gmail.com>
- * @copyright   Copyright (c) 2011-2013, Edward Caissie
+ * @copyright   Copyright (c) 2011-2014, Edward Caissie
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 2, as published by the
@@ -44,334 +44,354 @@
  *
  * The license for this software can also likely be found here:
  * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * @version 0.3.3
- * @date    February 15, 2013
- * Added code block termination comments
- * Moved all code into class structure
- *
- * @version 0.3.4
- * @date    May 24, 2013
- * Version number compatibility update
- *
- * @version 0.3.6
- * @date    September 3, 2013
- * Corrected "undefined index" issue for the `lang` parameter
  */
-class BNS_TFButton_Widget extends WP_Widget
-{
-
-    /**
-     * Constructor
-     */
-    function BNS_TFButton_Widget()
-    {
-        /** Widget settings. */
-        $widget_ops = array('classname' => 'bns-tfbutton', 'description' => __('Twitter Follow Button', 'bns-tfb'));
-        /** Widget control settings. */
-        $control_ops = array('width' => 200, 'id_base' => 'bns-tfbutton');
-        /** Create the widget. */
-        $this->WP_Widget('bns-tfbutton', 'BNS Twitter Follow Button', $widget_ops, $control_ops);
-
-        /**
-         * Check installed WordPress version for compatibility
-         *
-         * @package     BNS_Twitter_Follow_Button
-         * @since       0.3
-         * @internal    Version 2.8 being used ... see WP_Widget class for reference
-         */
-        global $wp_version;
-        $exit_message = __('BNS Twitter Follow Button requires WordPress version 2.8 or newer. <a href="http://codex.wordpress.org/Upgrading_WordPress">Please Update!</a>', 'bns-support');
-        if (version_compare($wp_version, "2.8", "<")) {
-            exit ($exit_message);
-        }
-        /** End if - version compare */
-
-        /** Load Widget */
-        add_action('widgets_init', array($this, 'load_bns_tfbutton_widget'));
-
-        /** Add Shortcode */
-        add_shortcode('bns_tfbutton', array($this, 'bns_tfbutton_shortcode'));
-
-    }
-
-    /** End function - constructor */
-
-
-    /**
-     * Widget
-     *
-     * @param   array $args
-     * @param   array $instance
-     *
-     * @version 0.3.6
-     * Corrected "undefined index" issue for the `lang` parameter
-     */
-    function widget($args, $instance)
-    {
-        extract($args);
-        /** User-selected settings. */
-        /**
-         * @todo Finish all available settings
-         */
-        $title = apply_filters('widget_title', $instance['title']);
-        $twitter_name = $instance['twitter_name'];
-        $show_count = $instance['show_count'];
-        /** Followers count display */
-        $button = $instance['button'];
-        /** Button color */
-        $text_color = $instance['text_color'];
-        /** Text color */
-        $link_color = $instance['link_color'];
-        /** Link color */
-        $lang = isset($instance['lang'])
-            ? $instance['lang']
-            : 'en';
-        /** Language - default: English */
-        $width = $instance['width'];
-        /** Width */
-        $align = $instance['align'];
-        /** Alignment */
-
-        /** @var $before_widget string - defined by theme */
-        echo $before_widget;
-
-        if ($title) {
-            /** @var $before_title string - defined by theme */
-            /** @var $after_title string - defined by theme */
-            echo $before_title . $title . $after_title;
-        } /** End if - title */
-
-        /** Display stuff based on widget settings */
-        ?>
-
-        <a href="http://twitter.com/<?php echo $twitter_name; ?>"
-           class="twitter-follow-button"
-           data-show-count=<?php !$show_count ? printf('"false"') : printf('"true"'); ?> data-button=<?php !$button ? printf('"blue"') : printf('"grey"'); ?>
-           data-text-color="<?php echo $text_color; ?>"
-           data-link-color="<?php echo $link_color; ?>"
-           data-width=<?php printf($width); ?> data-align=<?php !$align ? printf('"left"') : printf('"right"'); ?>
-           data-lang="<?php printf($lang); ?>">Follow
-            @<?php echo $twitter_name; ?></a>
-        <script src="http://platform.twitter.com/widgets.js"
-                type="text/javascript"></script>
-        <?php
-
-        /** After widget (defined by themes). */
-        echo $after_widget;
-
-    }
-
-    /** End function - widget */
-
-
-    /**
-     * Update
-     *
-     * @param   array $new_instance
-     * @param   array $old_instance
-     *
-     * @return  array
-     */
-    function update($new_instance, $old_instance)
-    {
-        $instance = $old_instance;
-        /** Strip tags (if needed) and update the widget settings */
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['twitter_name'] = strip_tags($new_instance['twitter_name']);
-        $instance['show_count'] = $new_instance['show_count'];
-        $instance['button'] = $new_instance['button'];
-        $instance['text_color'] = $new_instance['text_color'];
-        $instance['link_color'] = $new_instance['link_color'];
-        $instance['lang'] = $new_instance['lang'];
-        $instance['width'] = $new_instance['width'];
-        $instance['align'] = $new_instance['align'];
-
-        return $instance;
-
-    }
-
-    /** End function - update */
-
-
-    /**
-     * Form
-     *
-     * @param   array $instance
-     *
-     * @return  string|void
-     */
-    function form($instance)
-    {
-        /** Set default widget settings */
-        $defaults = array(
-            'title' => __('Twitter Follow Button', 'bns-tfb'),
-            'twitter_name' => '',
-            'show_count' => false,
-            'button' => false, /** Blue */
-            'text_color' => '186487', /** Default blue palette. The default Grey color would be white (#ffffff); leave empty. */
-            'link_color' => '',
-            'lang' => '', /** Default - English */
-            'width' => '300px',
-            'align' => ''
-        );
-        $instance = wp_parse_args(( array )$instance, $defaults); ?>
-
-        <p>
-            <label
-                for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'bns-tfb'); ?></label>
-            <input class="widefat"
-                   id="<?php echo $this->get_field_id('title'); ?>"
-                   name="<?php echo $this->get_field_name('title'); ?>"
-                   value="<?php echo $instance['title']; ?>"/>
-        </p>
-
-        <p>
-            <label
-                for="<?php echo $this->get_field_id('twitter_name'); ?>"><?php _e('Twitter Name:', 'bns-tfb'); ?></label>
-            <input class="widefat"
-                   id="<?php echo $this->get_field_id('twitter_name'); ?>"
-                   name="<?php echo $this->get_field_name('twitter_name'); ?>"
-                   value="<?php echo $instance['twitter_name']; ?>"/>
-        </p>
-
-        <p>
-            <input class="checkbox"
-                   type="checkbox" <?php checked((bool)$instance['button'], true); ?>
-                   id="<?php echo $this->get_field_id('button'); ?>"
-                   name="<?php echo $this->get_field_name('button'); ?>"/>
-            <label
-                for="<?php echo $this->get_field_id('button'); ?>"><?php _e('Grey button? (default: Blue)', 'bns-tfb'); ?></label>
-        </p>
-
-        <p>
-            <label
-                for="<?php echo $this->get_field_id('link_color'); ?>"><?php _e('Link Color: #', 'bns-tfb'); ?></label>
-            <input class="widefat"
-                   id="<?php echo $this->get_field_id('link_color'); ?>"
-                   name="<?php echo $this->get_field_name('link_color'); ?>"
-                   value="<?php echo $instance['link_color']; ?>"/>
-        </p>
-
-        <p>
-            <input class="checkbox"
-                   type="checkbox" <?php checked((bool)$instance['show_count'], true); ?>
-                   id="<?php echo $this->get_field_id('show_count'); ?>"
-                   name="<?php echo $this->get_field_name('show_count'); ?>"/>
-            <label
-                for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e('Show Follower Count?', 'bns-tfb'); ?></label>
-        </p>
-
-        <p>
-            <label
-                for="<?php echo $this->get_field_id('text_color'); ?>"><?php _e('Text Color: #', 'bns-tfb'); ?></label>
-            <input class="widefat"
-                   id="<?php echo $this->get_field_id('text_color'); ?>"
-                   name="<?php echo $this->get_field_name('text_color'); ?>"
-                   value="<?php echo $instance['text_color']; ?>"/>
-        </p>
-
-        <p>
-            <input class="checkbox"
-                   type="checkbox" <?php checked((bool)$instance['align'], true); ?>
-                   id="<?php echo $this->get_field_id('align'); ?>"
-                   name="<?php echo $this->get_field_name('align'); ?>"/>
-            <label
-                for="<?php echo $this->get_field_id('align'); ?>"><?php _e('Align right? (default: left)', 'bns-tfb'); ?></label>
-        </p>
-
-        <p>
-            <label
-                for="<?php echo $this->get_field_id('width'); ?>"><?php _e('Width (in pixels or percentage):', 'bns-tfb'); ?></label>
-            <input class="widefat"
-                   id="<?php echo $this->get_field_id('width'); ?>"
-                   name="<?php echo $this->get_field_name('width'); ?>"
-                   value="<?php echo $instance['width']; ?>"/>
-            <label><?php _e('NB: Must be set in pixels to right align.', 'bns-tfb'); ?></label>
-        </p>
-
-        <p>
-            <label
-                for="<?php echo $this->get_field_id('lang'); ?>"><?php _e('Language (as the two letter ISO-639-1 language code.):', 'bns-tfb'); ?></label>
-            <select id="<?php echo $this->get_field_id('lang'); ?>"
-                    name="<?php echo $this->get_field_name('lang'); ?>"
-                    class="widefat">
-                <option <?php selected('en', $instance['lang'], true); ?>>en
-                </option>
-                <option <?php selected('fr', $instance['lang'], true); ?>>fr
-                </option>
-                <option <?php selected('de', $instance['lang'], true); ?>>de
-                </option>
-                <option <?php selected('it', $instance['lang'], true); ?>>it
-                </option>
-                <option <?php selected('es', $instance['lang'], true); ?>>es
-                </option>
-                <option <?php selected('ko', $instance['lang'], true); ?>>ko
-                </option>
-                <option <?php selected('ja', $instance['lang'], true); ?>>ja
-                </option>
-            </select>
-        </p>
-
-    <?php
-    }
-
-    /** End function - form */
-
-
-    /**
-     * Shortcode
-     */
-    function bns_tfbutton_shortcode($atts)
-    {
-        /** Start capture */
-        ob_start();
-        /** Using the_widget() to make a plugin template tag */
-        ?>
-        <div class="bns-tfbutton-shortcode">
-            <?php
-            the_widget(
-                'BNS_TFButton_Widget',
-                $instance = shortcode_atts(array(
-                    'title' => __('', 'bns-tfb'),
-                    'twitter_name' => '', /** No @ symbol needed */
-                    'show_count' => false,
-                    'button' => false, /** Blue */
-                    'text_color' => '186487', /** No # symbol needed */
-                    'link_color' => '',
-                    'lang' => '', /** default: English */
-                    'width' => '300px',
-                    'align' => '',/** Left aligned */
-                ), $atts),
-                $args = array(
-                    'before_widget' => '',
-                    'before_title' => '',
-                    'after_title' => '',
-                    'after_widget' => ''
-                )
-            ); ?>
-        </div><!-- .bns-tfbutton-shortcode -->
-        <?php
-        /** Capture output */
-        $bns_tfbutton_output = ob_get_contents();
-        /** Stop capture and clean up */
-        ob_end_clean();
-
-        return $bns_tfbutton_output;
-
-    }
-
-    /** End function - shortcode */
-
-
-    /**
-     * Register widget
-     */
-    function load_bns_tfbutton_widget()
-    {
-        register_widget('BNS_TFButton_Widget');
-    }
-    /** End function - load widget */
+class BNS_TFButton_Widget extends WP_Widget {
+	/**
+	 * Constructor
+	 *
+	 * @uses    WP_Widget
+	 * @uses    add_action
+	 * @uses    add_shortcode
+	 */
+	function BNS_TFButton_Widget() {
+		/** Widget settings. */
+		$widget_ops = array(
+			'classname'   => 'bns-tfbutton',
+			'description' => __( 'Twitter Follow Button', 'bns-twitter-follow-button' )
+		);
+		/** Widget control settings. */
+		$control_ops = array( 'width' => 200, 'id_base' => 'bns-tfbutton' );
+		/** Create the widget. */
+		$this->WP_Widget( 'bns-tfbutton', 'BNS Twitter Follow Button', $widget_ops, $control_ops );
+
+		/**
+		 * Check installed WordPress version for compatibility
+		 *
+		 * @package     BNS_Twitter_Follow_Button
+		 * @since       0.3
+		 * @internal    Version 3.6 required for optional shortcode filter parameter
+		 */
+		global $wp_version;
+		$exit_message = __( 'BNS Twitter Follow Button requires WordPress version 3.6 or newer. <a href="http://codex.wordpress.org/Upgrading_WordPress">Please Update!</a>', 'bns-twitter-follow-button' );
+		if ( version_compare( $wp_version, "3.6", "<" ) ) {
+			exit ( $exit_message );
+		}
+		/** End if - version compare */
+
+		/** Load Widget */
+		add_action( 'widgets_init', array(
+			$this,
+			'load_bns_tfbutton_widget'
+		) );
+
+		/** Add Shortcode */
+		add_shortcode( 'bns_tfbutton', array(
+			$this,
+			'bns_tfbutton_shortcode'
+		) );
+
+	} /** End function - constructor */
+
+
+	/**
+	 * Widget
+	 *
+	 * @param   array $args
+	 * @param   array $instance
+	 *
+	 * @uses    apply_filters
+	 *
+	 * @version 0.3.6
+	 * Corrected "undefined index" issue for the `lang` parameter
+	 *
+	 * @version 0.3.7
+	 * @date    November 2, 2014
+	 * Set `widget.js` location to protocol agnostic
+	 */
+	function widget( $args, $instance ) {
+		extract( $args );
+		/** User-selected settings. */
+		$title        = apply_filters( 'widget_title', $instance['title'] );
+		$twitter_name = $instance['twitter_name'];
+		$show_count   = $instance['show_count'];
+		/** Followers count display */
+		$button = $instance['button'];
+		/** Button color */
+		$text_color = $instance['text_color'];
+		/** Text color */
+		$link_color = $instance['link_color'];
+		/** Link color */
+		$lang = isset( $instance['lang'] )
+			? $instance['lang']
+			: 'en';
+		/** Language - default: English */
+		$width = $instance['width'];
+		/** Width */
+		$align = $instance['align'];
+		/** Alignment */
+
+		/** @var $before_widget string - defined by theme */
+		echo $before_widget;
+
+		if ( $title ) {
+			/** @var $before_title string - defined by theme */
+			/** @var $after_title string - defined by theme */
+			echo $before_title . $title . $after_title;
+		}
+		/** End if - title */
+
+		/** Display stuff based on widget settings */
+		?>
+
+		<a href="http://twitter.com/<?php echo $twitter_name; ?>"
+		   class="twitter-follow-button"
+		   data-show-count=<?php ! $show_count ? printf( '"false"' ) : printf( '"true"' ); ?> data-button=<?php ! $button ? printf( '"blue"' ) : printf( '"grey"' ); ?>
+		   data-text-color="<?php echo $text_color; ?>"
+		   data-link-color="<?php echo $link_color; ?>"
+		   data-width=<?php printf( $width ); ?> data-align=<?php ! $align ? printf( '"left"' ) : printf( '"right"' ); ?>
+		   data-lang="<?php printf( $lang ); ?>">Follow
+			@<?php echo $twitter_name; ?></a>
+		<script src="//platform.twitter.com/widgets.js"
+		        type="text/javascript"></script>
+		<?php
+
+		/** After widget (defined by themes). */
+		echo $after_widget;
+
+	} /** End function - widget */
+
+
+	/**
+	 * Update
+	 *
+	 * @param   array $new_instance
+	 * @param   array $old_instance
+	 *
+	 * @return  array
+	 */
+	function update( $new_instance, $old_instance ) {
+		$instance = $old_instance;
+		/** Strip tags (if needed) and update the widget settings */
+		$instance['title']        = strip_tags( $new_instance['title'] );
+		$instance['twitter_name'] = strip_tags( $new_instance['twitter_name'] );
+		$instance['show_count']   = $new_instance['show_count'];
+		$instance['button']       = $new_instance['button'];
+		$instance['text_color']   = $new_instance['text_color'];
+		$instance['link_color']   = $new_instance['link_color'];
+		$instance['lang']         = $new_instance['lang'];
+		$instance['width']        = $new_instance['width'];
+		$instance['align']        = $new_instance['align'];
+
+		return $instance;
+
+	} /** End function - update */
+
+
+	/**
+	 * Form
+	 *
+	 * @package BNS_TFButton
+	 *
+	 * @param   array $instance
+	 *
+	 * @uses    __
+	 * @uses    checked
+	 * @uses    get_field_id
+	 * @uses    get_field_name
+	 * @uses    selected
+	 * @uses    wp_parse_args
+	 *
+	 * @return  string|void
+	 */
+	function form( $instance ) {
+		/** Set default widget settings */
+		$defaults = array(
+			'title'        => __( 'Twitter Follow Button', 'bns-twitter-follow-button' ),
+			'twitter_name' => '',
+			'show_count'   => false,
+			'button'       => false,
+			/** Blue */
+			'text_color'   => '186487',
+			/** Default blue palette. The default Grey color would be white (#ffffff); leave empty. */
+			'link_color'   => '',
+			'lang'         => '',
+			/** Default - English */
+			'width'        => '300px',
+			'align'        => ''
+		);
+		$instance = wp_parse_args( ( array ) $instance, $defaults ); ?>
+
+		<p>
+			<label
+				for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'bns-twitter-follow-button' ); ?></label>
+			<input class="widefat"
+			       id="<?php echo $this->get_field_id( 'title' ); ?>"
+			       name="<?php echo $this->get_field_name( 'title' ); ?>"
+			       value="<?php echo $instance['title']; ?>"/>
+		</p>
+
+		<p>
+			<label
+				for="<?php echo $this->get_field_id( 'twitter_name' ); ?>"><?php _e( 'Twitter Name:', 'bns-twitter-follow-button' ); ?></label>
+			<input class="widefat"
+			       id="<?php echo $this->get_field_id( 'twitter_name' ); ?>"
+			       name="<?php echo $this->get_field_name( 'twitter_name' ); ?>"
+			       value="<?php echo $instance['twitter_name']; ?>"/>
+		</p>
+
+		<p>
+			<input class="checkbox"
+			       type="checkbox" <?php checked( (bool) $instance['button'], true ); ?>
+			       id="<?php echo $this->get_field_id( 'button' ); ?>"
+			       name="<?php echo $this->get_field_name( 'button' ); ?>"/>
+			<label
+				for="<?php echo $this->get_field_id( 'button' ); ?>"><?php _e( 'Grey button? (default: Blue)', 'bns-twitter-follow-button' ); ?></label>
+		</p>
+
+		<p>
+			<label
+				for="<?php echo $this->get_field_id( 'link_color' ); ?>"><?php _e( 'Link Color: #', 'bns-twitter-follow-button' ); ?></label>
+			<input class="widefat"
+			       id="<?php echo $this->get_field_id( 'link_color' ); ?>"
+			       name="<?php echo $this->get_field_name( 'link_color' ); ?>"
+			       value="<?php echo $instance['link_color']; ?>"/>
+		</p>
+
+		<p>
+			<input class="checkbox"
+			       type="checkbox" <?php checked( (bool) $instance['show_count'], true ); ?>
+			       id="<?php echo $this->get_field_id( 'show_count' ); ?>"
+			       name="<?php echo $this->get_field_name( 'show_count' ); ?>"/>
+			<label
+				for="<?php echo $this->get_field_id( 'show_count' ); ?>"><?php _e( 'Show Follower Count?', 'bns-twitter-follow-button' ); ?></label>
+		</p>
+
+		<p>
+			<label
+				for="<?php echo $this->get_field_id( 'text_color' ); ?>"><?php _e( 'Text Color: #', 'bns-twitter-follow-button' ); ?></label>
+			<input class="widefat"
+			       id="<?php echo $this->get_field_id( 'text_color' ); ?>"
+			       name="<?php echo $this->get_field_name( 'text_color' ); ?>"
+			       value="<?php echo $instance['text_color']; ?>"/>
+		</p>
+
+		<p>
+			<input class="checkbox"
+			       type="checkbox" <?php checked( (bool) $instance['align'], true ); ?>
+			       id="<?php echo $this->get_field_id( 'align' ); ?>"
+			       name="<?php echo $this->get_field_name( 'align' ); ?>"/>
+			<label
+				for="<?php echo $this->get_field_id( 'align' ); ?>"><?php _e( 'Align right? (default: left)', 'bns-twitter-follow-button' ); ?></label>
+		</p>
+
+		<p>
+			<label
+				for="<?php echo $this->get_field_id( 'width' ); ?>"><?php _e( 'Width (in pixels or percentage):', 'bns-twitter-follow-button' ); ?></label>
+			<input class="widefat"
+			       id="<?php echo $this->get_field_id( 'width' ); ?>"
+			       name="<?php echo $this->get_field_name( 'width' ); ?>"
+			       value="<?php echo $instance['width']; ?>"/>
+			<label><?php _e( 'NB: Must be set in pixels to right align.', 'bns-twitter-follow-button' ); ?></label>
+		</p>
+
+		<p>
+			<label
+				for="<?php echo $this->get_field_id( 'lang' ); ?>"><?php _e( 'Language (as the two letter ISO-639-1 language code.):', 'bns-twitter-follow-button' ); ?></label>
+			<select id="<?php echo $this->get_field_id( 'lang' ); ?>"
+			        name="<?php echo $this->get_field_name( 'lang' ); ?>"
+			        class="widefat">
+				<option <?php selected( 'en', $instance['lang'], true ); ?>>en
+				</option>
+				<option <?php selected( 'fr', $instance['lang'], true ); ?>>fr
+				</option>
+				<option <?php selected( 'de', $instance['lang'], true ); ?>>de
+				</option>
+				<option <?php selected( 'it', $instance['lang'], true ); ?>>it
+				</option>
+				<option <?php selected( 'es', $instance['lang'], true ); ?>>es
+				</option>
+				<option <?php selected( 'ko', $instance['lang'], true ); ?>>ko
+				</option>
+				<option <?php selected( 'ja', $instance['lang'], true ); ?>>ja
+				</option>
+			</select>
+		</p>
+
+	<?php
+	}
+
+	/** End function - form */
+
+
+	/**
+	 * Shortcode
+	 *
+	 * @package BNS_TFButton
+	 *
+	 * @param   $atts
+	 *
+	 * @uses    shortcode_atts
+	 * @uses    the_widget
+	 *
+	 * @return string
+	 */
+	function bns_tfbutton_shortcode( $atts ) {
+		/** Start capture */
+		ob_start();
+		/** Using the_widget() to make a plugin template tag */
+		?>
+		<div class="bns-tfbutton-shortcode">
+			<?php
+			the_widget(
+				'BNS_TFButton_Widget',
+				$instance = shortcode_atts( array(
+					'title'        => __( '', 'bns-twitter-follow-button' ),
+					'twitter_name' => '',
+					/** No @ symbol needed */
+					'show_count'   => false,
+					'button'       => false,
+					/** Blue */
+					'text_color'   => '186487',
+					/** No # symbol needed */
+					'link_color'   => '',
+					'lang'         => '',
+					/** default: English */
+					'width'        => '300px',
+					'align'        => '',
+					/** Left aligned */
+				), $atts, 'bns_tfbutton' ),
+				$args = array(
+					'before_widget' => '',
+					'before_title'  => '',
+					'after_title'   => '',
+					'after_widget'  => ''
+				)
+			); ?>
+		</div><!-- .bns-tfbutton-shortcode -->
+		<?php
+		/** Capture output */
+		$bns_tfbutton_output = ob_get_contents();
+		/** Stop capture and clean up */
+		ob_end_clean();
+
+		return $bns_tfbutton_output;
+
+	}
+
+	/** End function - shortcode */
+
+
+	/**
+	 * Register widget
+	 *
+	 * @package BNS_TFButton
+	 *
+	 * @uses    register_widget
+	 */
+	function load_bns_tfbutton_widget() {
+		register_widget( 'BNS_TFButton_Widget' );
+	}
+	/** End function - load widget */
 
 
 }
diff --git a/readme.txt b/readme.txt
index c38f878..a819876 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,10 @@
 === BNS Twitter Follow Button ===
 Contributors: cais
 Donate link: http://buynowshop.com
-Tags: multi-widget, user-options, twitter, multiple-accounts, language-support, widget-only
-Requires at least: 2.8
-Tested up to: 3.8.1
-Stable tag: 0.3.6
+Tags: twitter, widget, shortcode, social
+Requires at least: 3.6
+Tested up to: 4.1
+Stable tag: 0.3.7
 License: GNU General Public License v2
 License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
@@ -69,7 +69,7 @@ Yes, more to follow ... or read this page: http://dev.twitter.com/pages/follow_b
 1. The options panel.
 
 == Other Notes ==
-* Copyright 2011-2013, Edward Caissie (email : edward.caissie@gmail.com)
+* Copyright 2011-2014, Edward Caissie (email : edward.caissie@gmail.com)
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -94,6 +94,13 @@ Please stay current with your WordPress installation, your active theme, and you
 Please also note this plugin may not be further supported or development continued in the future.
 
 == Changelog ==
+= 0.3.7 =
+* Released November 2014
+* Set `widget.js` location to protocol agnostic
+* Cleaned up code
+* Improved i18n textdomain references
+* Changed tags to more simple references to plugin functionality
+
 = 0.3.6 =
 * Released September 2013
 * Corrected "undefined index" issue for the `lang` parameter