caboose-cms 0.5.190 → 0.5.191

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjk2ZjJkNGZlOWM0YmViYmY0ZTlmYmQzYmRjZmRiZjY4ZjU2MTI4NA==
+    Njk3ZjJmN2RiZjc0MjYwMmU1MWRhNWI3Y2I5YjdlNTI1MmI0Y2NhMQ==
   data.tar.gz: !binary |-
-    ZTVjOWQxNGY4NDlmNmE4ZjY1ZDk3ZDk3ZTUyMWM0ZjkzYjkzY2M3OQ==
+    ZmVmYTdlYTM4NmE4ODRkM2FmOTc1ZDIzM2JhODI2MDc4MmZiZmM0OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmU3YjRhNDc4NzNhMWYyYTU5M2FmYWE3ZDVmMjg3NGM0ZDhlMTY4NWY2NTcz
-    N2ExNmY1NTk1YWEwMzZhZWQ0OWM5MGI4MTYwYjlmNTQwYzU1NzNiY2E3ZWE2
-    NjcwM2YxN2JkZmFjZDAzZjdiMTdmZDZjYzdkZjQzMjVjMDllYmI=
+    ZTUwN2U0ZTgyMTg3NjE0OThlN2QwNDVkY2JhMWFlN2FlM2Y1NjQ4ZGM5OGRi
+    Zjg2OWRiNWJhNGYwZWM2NzcwNmZiMGQxYTBhZTc5ZjBiNjdlNzVmYTIwYjQz
+    OWQzZmUyMTcxZGI1MDhkNzJlNmMyNDJkZmY2NTBhMDFjYTUyNjQ=
   data.tar.gz: !binary |-
-    NDU2ZGYxZDcyZGZjNGQ4ZDdkYTkxNGI1YmRlNTI5YmJkODMwOWE0MDc3NGFm
-    OTgwMzdmZjVlNTVjOTFjZTNhNzczZjEwYTE2OTRhMDQ4ZjFmOTIyOGMwNzg5
-    Mjk5NWExYTViZDI3YmFkMzczYTBiZDg2MzFhZTAyOGExNmE5YjA=
+    NjIzOTU5NDMzMDU3ZjA1MDg0ZTA2ZTE3YmY3MzNlMjU1YmM5MmYwMmM2MWFi
+    MGIxMzM1NjIzMDBmZjgyNWM4ODdhNTRjODAwZmQ4YWY4NmY4MThiMzdhNzJi
+    ODI2M2UzMDcyOTMyODU5NjE3ODNhMjc3YzM0NGY5MTVkNjkzYTY=

data/app/controllers/caboose/application_controller.rb

@@ -29,7 +29,8 @@ module Caboose
       # Initialize AB Testing
       AbTesting.init(request.session_options[:id]) if Caboose.use_ab_testing            
       
-      # Try to find the page 
+      # Try to find the page
+      @request = request
       @page = Page.new
       @crumbtrail = Crumbtrail.new      
       @subnav       = {}

data/app/helpers/caboose/application_helper.rb

@@ -27,19 +27,5 @@ tinyMCE.init({
       Caboose::Category.find(1).children.where(:status => 'Active')
     end
     
-    def analytics_js
-      return "" if @site.analytics_id.nil? || @site.analytics_id.strip.length == 0
-      str = ''
-      str << "<script>\n"
-      str << "  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){\n"
-      str << "  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),\n"
-      str << "  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)\n"
-      str << "  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');\n"
-      str << "  ga('create', '#{@site.analytics_id}', 'auto');\n"
-      str << "  ga('send', 'pageview');\n"
-      str << "</script>\n"
-      return str
-    end
-    
   end
 end

data/app/views/caboose/blocks/_retargeting.html.erb

@@ -0,0 +1,19 @@
+<% if site.use_retargeting %> 
+  <% rc = site.retargeting_config %>
+  <% rc.labels(request, page).each do |label %>                                                  
+    <script type='text/javascript'>
+    /* <![CDATA[ */
+    var google_conversion_id = #{rc.conversion_id};
+    var google_conversion_label = "<%= raw label %>";
+    var google_custom_params = window.google_tag_params;
+    var google_remarketing_only = true;
+    /* ]]> */
+    </script>
+    <script type='text/javascript' src='//www.googleadservices.com/pagead/conversion.js'></script>
+    <noscript>
+    <div style='display:inline;'>
+    <img height='1' width='1' style='border-style:none;' alt='' src='//googleads.g.doubleclick.net/pagead/viewthroughconversion/<%= raw rc.conversion_id %>/?value=1.00&amp;currency_code=USD&amp;label=<%= raw label %>&amp;guid=ON&amp;script=0'/>
+    </div>
+    </noscript>
+  <% end %>
+<% end %>

data/app/views/layouts/caboose/application.html.erb

@@ -26,7 +26,8 @@
     b.create_children
   end
   #b.log_helper
-  options = {    
+  options = {
+    :request => @request,    
     :page => @page,
     :view => self,
     :controller_view_content => yield,

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.190'
+  VERSION = '0.5.191'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.190
+  version: 0.5.191
 platform: ruby
 authors:
 - William Barry
@@ -707,6 +707,7 @@ files:
 - app/views/caboose/blocks/_product_sales.html.erb
 - app/views/caboose/blocks/_products.html.erb
 - app/views/caboose/blocks/_render_function.html.erb
+- app/views/caboose/blocks/_retargeting.html.erb
 - app/views/caboose/blocks/_richtext.html.erb
 - app/views/caboose/blocks/_ruby_block.rb
 - app/views/caboose/blocks/_select.html.erb