From e1e43d1c10a12ee8b0119325722cca46662a1ef7 Mon Sep 17 00:00:00 2001
From: Aaron Huisinga <aaron@coldturkeygroup.com>
Date: Fri, 20 May 2016 18:51:57 -0500
Subject: [PATCH] Bump to version 1.0.3

1. Fix video embeds
2. Fix media uploads not working for all necessary fields
3. Allow customization of CTA button text
4. Removed unused JS file
---
 assets/js/admin.js             |  2 +-
 assets/js/scripts.js           | 62 ----------------------------------
 classes/class-program-page.php | 34 ++++++++++++-------
 program-page.php               |  4 +--
 readme.txt                     |  2 +-
 templates/hip-page.php         | 41 +++++++++++++++-------
 6 files changed, 54 insertions(+), 91 deletions(-)
 delete mode 100644 assets/js/scripts.js

diff --git a/assets/js/admin.js b/assets/js/admin.js
index 85ebdd8..e719c7c 100755
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@@ -39,7 +39,7 @@ jQuery(document).ready(function ($) {
     file_frame.open();
   };
 
-  jQuery('#upload_media_file_button').click(function (event) {
+  jQuery('.upload_media_file').click(function (event) {
     event.preventDefault();
     jQuery.fn.ssp_upload_media_file(jQuery(this), false);
   });
diff --git a/assets/js/scripts.js b/assets/js/scripts.js
deleted file mode 100644
index 13309f6..0000000
--- a/assets/js/scripts.js
+++ /dev/null
@@ -1,62 +0,0 @@
-jQuery('document').ready(function ($) {
-    // Simple AJAX listeners
-    $(document).bind("ajaxSend", function () {
-        $('.btn-primary').attr('disabled', 'disabled');
-    }).bind("ajaxComplete", function () {
-        $('.btn-primary').removeAttr('disabled');
-    });
-
-    // Submit quiz results
-    $('#submit-results').click(function (e) {
-        e.preventDefault();
-        var form = $('#days-on-market');
-
-        $.ajax({
-            type: 'POST',
-            url: DaysOnMarket.ajaxurl,
-            data: form.serialize(),
-            dataType: 'json',
-            beforeSend: function () {
-                $('#submit-results').html('<i class="fa fa-spinner fa-spin"></i> Processing...');
-            },
-            async: true,
-            success: function (response) {
-                setTimeout(function () {
-                    $('#get-results-modal').modal('hide');
-                    $('body').removeClass('modal-open');
-                    $('#days-on-market,.modal-backdrop').remove();
-                    $('.results').show();
-
-                    var retargeting = $('#retargeting').val(),
-                        conversion = $('#conversion').val();
-                    if (conversion != '') {
-                        if (conversion !== retargeting) {
-                            !function (f, b, e, v, n, t, s) {
-                                if (f.fbq)return;
-                                n = f.fbq = function () {
-                                    n.callMethod ?
-                                        n.callMethod.apply(n, arguments) : n.queue.push(arguments)
-                                };
-                                if (!f._fbq)f._fbq = n;
-                                n.push = n;
-                                n.loaded = !0;
-                                n.version = '2.0';
-                                n.queue = [];
-                                t = b.createElement(e);
-                                t.async = !0;
-                                t.src = v;
-                                s = b.getElementsByTagName(e)[0];
-                                s.parentNode.insertBefore(t, s)
-                            }(window,
-                                document, 'script', '//connect.facebook.net/en_US/fbevents.js');
-
-                            fbq('init', conversion);
-                        }
-
-                        fbq('track', "Lead");
-                    }
-                }, 1000);
-            }
-        });
-    });
-});
\ No newline at end of file
diff --git a/classes/class-program-page.php b/classes/class-program-page.php
index 6cf17b1..8f02f1c 100755
--- a/classes/class-program-page.php
+++ b/classes/class-program-page.php
@@ -287,7 +287,7 @@ public function meta_box_content($post, $meta)
                     $html .= '<p class="description">' . $v['description'] . '</p>' . "\n";
                     $html .= '</td><tr/>' . "\n";
                 } elseif ($type == 'url') {
-                    $html .= '<tr valign="top"><th scope="row"><label for="' . esc_attr($k) . '">' . $v['name'] . '</label></th><td><input type="button" class="button" id="upload_media_file_button" value="' . __('Upload Image', $this->token) . '" data-uploader_title="Choose an image" data-uploader_button_text="Insert image file" /><input name="' . esc_attr($k) . '" type="text" id="upload_media_file" class="regular-text" value="' . esc_attr($data) . '" />' . "\n";
+                    $html .= '<tr valign="top"><th scope="row"><label for="' . esc_attr($k) . '">' . $v['name'] . '</label></th><td><input type="button" class="button upload_media_file" id="' . esc_attr($k) . '_button" value="' . __('Upload Image', $this->token) . '" data-uploader_title="Choose an image" data-uploader_button_text="Insert image file" /><input name="' . esc_attr($k) . '" type="text" id="' . esc_attr($k) . '" class="regular-text" value="' . esc_attr($data) . '" />' . "\n";
                     $html .= '<p class="description">' . $v['description'] . '</p>' . "\n";
                     $html .= '</td><tr/>' . "\n";
                 } else {
@@ -390,16 +390,6 @@ public function enqueue_scripts()
             wp_enqueue_style($this->token);
             wp_enqueue_style('animate');
             wp_enqueue_style('source-sans');
-
-            wp_register_script($this->token . '-js', esc_url($this->assets_url . 'js/scripts.js'), [
-                'jquery'
-            ], PROGRAM_PAGE_PLUGIN_VERSION);
-            wp_enqueue_script($this->token . '-js');
-
-            $localize = [
-                'ajaxurl' => admin_url('admin-ajax.php'),
-            ];
-            wp_localize_script($this->token . '-js', 'ProgramPage', $localize);
         }
 
     }
@@ -437,9 +427,27 @@ public function get_custom_fields_settings($meta_box)
                 'section' => 'info'
             ];
 
+            $fields['cta'] = [
+                'name' => __('Call To Action', $this->token),
+                'description' => __('The call to action for your page', $this->token),
+                'placeholder' => 'WATCH THE VIDEO',
+                'type' => 'text',
+                'default' => 'WATCH THE VIDEO',
+                'section' => 'info'
+            ];
+
+            $fields['cta_url'] = [
+                'name' => __('Call To Action URL', $this->token),
+                'description' => __('The URL the user is directed to upon clicking the CTA button.', $this->token),
+                'placeholder' => '',
+                'type' => 'text',
+                'default' => '',
+                'section' => 'info'
+            ];
+
             $fields['video_url'] = [
-                'name' => __('Video URL', $this->token),
-                'description' => __('The URL for the video on your page.', $this->token),
+                'name' => __('Video Embed URL', $this->token),
+                'description' => __('The embed code for your program video.', $this->token),
                 'placeholder' => '',
                 'type' => 'text',
                 'default' => '',
diff --git a/program-page.php b/program-page.php
index 615e9cb..15b683f 100755
--- a/program-page.php
+++ b/program-page.php
@@ -1,7 +1,7 @@
 <?php namespace ColdTurkey\ProgramPage;
 /*
  * Plugin Name: Program Page
- * Version: 1.0.2
+ * Version: 1.0.3
  * Plugin URI: http://www.coldturkeygroup.com/
  * Description: Custom info pages for Platform ad campaigns
  * Author: Cold Turkey Group
@@ -20,7 +20,7 @@
 	define( 'PROGRAM_PAGE_PLUGIN_PATH', trailingslashit( plugin_dir_path( __FILE__ ) ) );
 
 if ( ! defined( 'PROGRAM_PAGE_PLUGIN_VERSION' ) )
-	define( 'PROGRAM_PAGE_PLUGIN_VERSION', '1.0.2' );
+	define( 'PROGRAM_PAGE_PLUGIN_VERSION', '1.0.3' );
 
 require_once( 'classes/class-program-page.php' );
 
diff --git a/readme.txt b/readme.txt
index 2492910..87feacd 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Aaron Huisinga
 Tags: real estate, platform, days on market
 Requires at least: 3.5
 Tested up to: 4.3
-Stable tag: 1.0.2
+Stable tag: 1.0.3
 
 Custom info pages for Platform ad campaigns (currently supports the HIP Program).
 
diff --git a/templates/hip-page.php b/templates/hip-page.php
index d6d69c4..1abebc2 100755
--- a/templates/hip-page.php
+++ b/templates/hip-page.php
@@ -13,6 +13,8 @@
 $id = get_the_ID();
 $title = get_the_title();
 $logo = get_post_meta($id, 'logo', true);
+$cta = get_post_meta($id, 'cta', true);
+$cta_url = get_post_meta($id, 'cta_url', true);
 $video_url = get_post_meta($id, 'video_url', true);
 $broker = get_post_meta($id, 'legal_broker', true);
 $test_1_name = get_post_meta($id, 'test_1_name', true);
@@ -116,7 +118,7 @@
                                 <div class="line banner-line role-element leadstyle-container"></div>
                                 <p class="banner-list role-element leadstyle-text">no credit requirements | no income requirements</p>
                                 <div class="btn-inline-wrap">
-                                    <a class="btn btn-inline role-element leadstyle-link" href="<?= $video_url ?>" target="_blank">WATCH THE VIDEO</a>
+                                    <a class="btn btn-inline role-element leadstyle-link" href="<?= $cta_url ?>" target="_blank"><?= $cta ?></a>
                                 </div>
                             </div>
                         </div>
@@ -142,7 +144,7 @@
                 </div>
                 <div class="col-xs-12 col-md-5 vcenter text-right text-xs-center text-sm-center role-element leadstyle-container">
                     <div class="video-container role-element leadstyle-video video" data-lp-responsive="height" data-lp-ratio-height="0.5625" data-lp-ratio-width="1.7777777777777777" style="width: 100%;">
-                        <iframe src="<?= $video_url ?>" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="" data-aspectratio="0.5625" style="width: 458px; height: 257.625px;"></iframe>
+                        <?= $video_url ?>
                     </div>
                 </div>
             </div>
@@ -255,15 +257,30 @@
     </footer>
 
 <?php if ($retargeting != null) { ?>
-<!-- Facebook Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-document,'script','//connect.facebook.net/en_US/fbevents.js');
-fbq('init', '<?= $retargeting ?>');
-fbq('track', "PageView");</script>
-<noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=<?= $retargeting ?>&ev=PageView&noscript=1"/></noscript>
+    <!-- Facebook Pixel Code -->
+    <script>
+        !function (f, b, e, v, n, t, s) {
+            if (f.fbq)return;
+            n = f.fbq = function () {
+                n.callMethod ?
+                    n.callMethod.apply(n, arguments) : n.queue.push(arguments)
+            };
+            if (!f._fbq)f._fbq = n;
+            n.push = n;
+            n.loaded = !0;
+            n.version = '2.0';
+            n.queue = [];
+            t = b.createElement(e);
+            t.async = !0;
+            t.src = v;
+            s = b.getElementsByTagName(e)[0];
+            s.parentNode.insertBefore(t, s)
+        }(window,
+            document, 'script', '//connect.facebook.net/en_US/fbevents.js');
+        fbq('init', '<?= $retargeting ?>');
+        fbq('track', "PageView");</script>
+    <noscript>
+        <img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=<?= $retargeting ?>&ev=PageView&noscript=1"/>
+    </noscript>
 <?php } ?>
 <?php wp_footer(); ?>
\ No newline at end of file