caboose-cms 0.9.140 → 0.9.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b883696eaa9dedffea9a5b0dbe6649ad79fedd
-  data.tar.gz: 0d039188ce20bb8b2ea8f6150ce656843496a30a
+  metadata.gz: 4a12ce0605a6ada50a69e1bd6acce2c85e2644d9
+  data.tar.gz: 3884dd6153bd714da7819b86db0361f39061941f
 SHA512:
-  metadata.gz: 1d902c620953ead10f7a1037ad364b8e8141ad4f8aae68032422cfcdf9c7da0b49d188f4f40f88d1bcd8a9d619573229cf45d8f3a02bd7e989784d17d65b4f1c
-  data.tar.gz: fa781ac1f71a3a9c300f83065246f4b3f5458cc38756ad7386883f9ced2ff35dc201a157e274df80f41b93a33324662f1a067078f02c83c3e6eac9acae97d71b
+  metadata.gz: ddff9ac7a922f69933783d8c072d9839429d214a457d486f626ff30a76340343affd4c5f2a937c6239f9776ad52aaa2603cd95476b1299c080bf4e4fb7d5fea3
+  data.tar.gz: faa9dc225784b397a2ae1e58d44456f2264fe6a573a31300a93904e45eb99e52084faf7193a59c2fd0c046ca92c7f23a0967eefef4a9cc2ce7dfd47fed4ab92f

data/app/assets/stylesheets/caboose/modal_inline.css

@@ -18,7 +18,7 @@
 #the_modal div.mb_container input[type=checkbox] { top: 12px; }
 #the_modal #modal_crumbtrail,
 #the_modal #modal_crumbtrail h2,
-#the_modal #modal_crumbtrail h2 a { font-family: 'Roboto'; font-weight: 300; font-size: 15px !important; color: #0975a7; text-decoration: none; }
+#the_modal #modal_crumbtrail h2 a { font-family: 'Roboto'; font-weight: 300; font-size: 15px !important; color: #0975a7; text-decoration: none; text-transform: none; letter-spacing: 0; }
 #the_modal #modal_crumbtrail h2 a:hover {
 	color: #09a710;
 }

data/app/controllers/caboose/media_controller.rb

@@ -177,7 +177,8 @@ module Caboose
       return unless user_is_allowed('media', 'view')
       media_category_id = params[:media_category_id]
       original_name = params[:name]
-      name = Caboose::Media.upload_name(original_name)                        
+      name = Caboose::Media.upload_name(original_name)    
+      desc = original_name.blank? ? "Media File" : original_name.gsub(/\.[0-9a-z]+$/i,'')
       file_type = params[:file_type]
       if ['image/gif', 'image/jpeg', 'image/png', 'image/tiff'].include? file_type
         image_content_type = file_type
@@ -187,7 +188,7 @@ module Caboose
       m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
       if m.nil?
         max = Media.where(:media_category_id => media_category_id).maximum(:sort_order)
-        m = Media.create(:media_category_id => media_category_id, :sort_order => (max ? (max + 1) : 0), :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false)
+        m = Media.create(:media_category_id => media_category_id, :description => desc, :sort_order => (max ? (max + 1) : 0), :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false)
       end
       p = Product.where(:media_category_id => media_category_id).last
       if p

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

@@ -1,45 +1,14 @@
-<%
-sc = site.social_config
-if sc.auto_ga_js && sc.google_analytics_id 
-%>
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', '<%= raw sc.google_analytics_id %>', 'auto');
-    ga('send', 'pageview');
-    <% if ga_events && ga_events.count > 0 %>    
-      <% ga_events.each do |arr| %>
-        <%
-        cat    = arr[0] ? arr[0] : nil 
-        action = arr[1] ? arr[1] : nil 
-        label  = arr[2] ? arr[2] : nil 
-        value  = arr[3] ? arr[3] : nil
-        arr2 = [cat, action]
-        arr2 << (label ? label : '') if label || (label.nil? && value)    
-        arr2 << value if value          
-        %>
-    ga('send', 'event'<% arr2.each do |x| %>, <%= raw Caboose.json(x) %><% end %>);
-      <% end %>    
-    <% end %>
-    <% if sc.google_analytics_id2 && sc.google_analytics_id2.strip.length > 0 %> 
-      ga('create', '<%= raw sc.google_analytics_id2 %>', 'auto', {'name': 'property2'});      
-      ga('property2.send', 'pageview');
-      <% if ga_events && ga_events.count > 0 %>    
-        <% ga_events.each do |arr| %>
-          <%
-          cat    = arr[0] ? arr[0] : nil 
-          action = arr[1] ? arr[1] : nil 
-          label  = arr[2] ? arr[2] : nil 
-          value  = arr[3] ? arr[3] : nil
-          arr2 = [cat, action]
-          arr2 << (label ? label : '') if label || (label.nil? && value)    
-          arr2 << value if value          
-          %>
-      ga('property2.send', 'event'<% arr2.each do |x| %>, <%= raw Caboose.json(x) %><% end %>);
-        <% end %>    
-      <% end %>
-    <% end %>    
-  </script>
+<% sc = site.social_config %>
+
+<% if sc.auto_ga_js && !sc.google_analytics_id.blank? %>
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%== sc.google_analytics_id %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', '<%== sc.google_analytics_id %>');
+  <% if !sc.google_analytics_id2.blank? %> 
+  gtag('config', '<%== sc.google_analytics_id2 %>');
+  <% end %>
+</script>
 <% end %>

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

@@ -0,0 +1,45 @@
+<%
+sc = site.social_config
+if sc.auto_ga_js && sc.google_analytics_id 
+%>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', '<%= raw sc.google_analytics_id %>', 'auto');
+    ga('send', 'pageview');
+    <% if ga_events && ga_events.count > 0 %>    
+      <% ga_events.each do |arr| %>
+        <%
+        cat    = arr[0] ? arr[0] : nil 
+        action = arr[1] ? arr[1] : nil 
+        label  = arr[2] ? arr[2] : nil 
+        value  = arr[3] ? arr[3] : nil
+        arr2 = [cat, action]
+        arr2 << (label ? label : '') if label || (label.nil? && value)    
+        arr2 << value if value          
+        %>
+    ga('send', 'event'<% arr2.each do |x| %>, <%= raw Caboose.json(x) %><% end %>);
+      <% end %>    
+    <% end %>
+    <% if sc.google_analytics_id2 && sc.google_analytics_id2.strip.length > 0 %> 
+      ga('create', '<%= raw sc.google_analytics_id2 %>', 'auto', {'name': 'property2'});      
+      ga('property2.send', 'pageview');
+      <% if ga_events && ga_events.count > 0 %>    
+        <% ga_events.each do |arr| %>
+          <%
+          cat    = arr[0] ? arr[0] : nil 
+          action = arr[1] ? arr[1] : nil 
+          label  = arr[2] ? arr[2] : nil 
+          value  = arr[3] ? arr[3] : nil
+          arr2 = [cat, action]
+          arr2 << (label ? label : '') if label || (label.nil? && value)    
+          arr2 << value if value          
+          %>
+      ga('property2.send', 'event'<% arr2.each do |x| %>, <%= raw Caboose.json(x) %><% end %>);
+        <% end %>    
+      <% end %>
+    <% end %>    
+  </script>
+<% end %>

data/app/views/caboose/social/admin_edit.html.erb

@@ -5,45 +5,100 @@ domain = ms ? (ms.primary_domain ? ms.primary_domain.domain : 'www.caboosecms.co
 %>
 <h1>Social Media Config</h1>
 
+<div class="social-wrap">
 <p>Find your Facebook page ID <a href="http://findmyfbid.com" target="_blank">here</a>.</p>
-<p><div id="socialconfig_<%= sc.id %>_facebook_page_id"     ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_twitter_username"     ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_instagram_username"   ></div>
+<div id="socialconfig_<%= sc.id %>_facebook_page_id"     ></div>
+<% if false %>
+<p style="margin:0 0 15px 0;width:500px;font-size:13px;color:#000;text-align:right;position:relative;bottom:10px;"><a id="fb-login" href="#">Authorize Facebook</a> (you must authorize to show posts on this website)
+<% end %>
+<div id="socialconfig_<%= sc.id %>_twitter_username"     ></div>
+<div id="socialconfig_<%= sc.id %>_instagram_username"   ></div>
 <% if sc.instagram_access_token %>
-<p style="margin-top:4px;width:518px;font-size:14px;color:green;text-align:right;">
+<p style="margin:0 0 15px 0;width:500px;font-size:13px;color:#000;text-align:right;position:relative;bottom:10px;">
 Authorized
 <a href="#" id="deauthorize-instagram" style="color:#949494;font-size:12px;margin-left:6px;">Deauthorize</a>
 </p><% end %>
 </p>
 <% if !sc.instagram_access_token %>
-<p style="margin-top:2px;width:518px;font-size:13px;color:#000;text-align:right;"><a href="https://api.instagram.com/oauth/authorize/?client_id=bac12987b6cb4262a004f3ffc388accc&redirect_uri=http://<%= domain %>/api/instagram&response_type=code&state=<%= @site.id %>">Authorize Instagram</a> (you must authorize to show posts on this website)
+<p style="margin:0 0 15px 0;width:500px;font-size:13px;color:#000;text-align:right;position:relative;bottom:10px;"><a href="https://api.instagram.com/oauth/authorize/?client_id=bac12987b6cb4262a004f3ffc388accc&redirect_uri=http://<%= domain %>/api/instagram&response_type=code&state=<%= @site.id %>">Authorize Instagram</a> (you must authorize to show posts on this website)
 <% if params[:instagram] && params[:instagram] == 'fail' %>
 <br /><span style="color:red;">Instagram login failed. Please try again.</span>
 <% end %>
 </p>
 <% end %>
-<p><div id="socialconfig_<%= sc.id %>_youtube_url"          ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_pinterest_url"        ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_vimeo_url"            ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_rss_url"              ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_google_plus_url"      ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_linkedin_url"         ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_google_analytics_id"  ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_google_analytics_id2" ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_auto_ga_js"           ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_share_image"          ></div></p>
+<div id="socialconfig_<%= sc.id %>_youtube_url"          ></div>
+<div id="socialconfig_<%= sc.id %>_pinterest_url"        ></div>
+<div id="socialconfig_<%= sc.id %>_vimeo_url"            ></div>
+<div id="socialconfig_<%= sc.id %>_rss_url"              ></div>
+<div id="socialconfig_<%= sc.id %>_google_plus_url"      ></div>
+<div id="socialconfig_<%= sc.id %>_linkedin_url"         ></div>
+<div id="socialconfig_<%= sc.id %>_google_analytics_id"  ></div>
+<div id="socialconfig_<%= sc.id %>_google_analytics_id2" ></div>
+<div id="socialconfig_<%= sc.id %>_auto_ga_js"           ></div>
+<div id="socialconfig_<%= sc.id %>_share_image"          ></div>
       
 <div id='message'></div>
 
+</div>
+
 <% content_for :caboose_css do %>
 <style type="text/css">
   #deauthorize-instagram:hover {
     color: red !important;
   }
+  .social-wrap > div {
+    margin-bottom: 15px;
+  }
 </style>
 <% end %>
 
 <% content_for :caboose_js do %>
+
+<% if false %>
+<script>
+  window.fbAsyncInit = function() {
+    FB.init({
+      appId            : '452544411866077',
+      autoLogAppEvents : true,
+      xfbml            : true,
+      version          : 'v3.0'
+    });
+  };
+
+  $("#fb-login").click(function(e) {
+    e.preventDefault();
+    FB.login(function(response) {
+        if (response.authResponse) {
+         console.log('Welcome!  Fetching your information.... ');
+         FB.api('/me', function(response) {
+           console.log('Good to see you, ' + response.name + '.');
+           FB.getLoginStatus(function(response) {
+              if (response.status === 'connected') {
+                var accessToken = response.authResponse.accessToken;
+                console.log(accessToken);
+                FB.api('/me/accounts', function(response) {
+                  console.dir(response);
+                });
+              } 
+            });
+         });
+        }
+        else {
+         console.log('User cancelled login or did not fully authorize.');
+        }
+    });
+  });
+
+  (function(d, s, id){
+     var js, fjs = d.getElementsByTagName(s)[0];
+     if (d.getElementById(id)) {return;}
+     js = d.createElement(s); js.id = id;
+     js.src = "https://connect.facebook.net/en_US/sdk.js";
+     fjs.parentNode.insertBefore(js, fjs);
+   }(document, 'script', 'facebook-jssdk'));
+</script>
+<% end %>
+
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 

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

@@ -99,14 +99,15 @@
     request.env['HTTPS']           = 'on'
   end
   
-  css = yield(:css)
+  css = b.partial('ga', options)
+  css << yield(:css)
   css.gsub!("<link href=\"//", "<link href=\"#{protocol}")
   css.gsub!("<link href='//" , "<link href='#{protocol}")
   if protocol == 'https://' 
     css.gsub!("<link href=\"http://", "<link href=\"https://")
     css.gsub!("<link href='http://" , "<link href='https://")
   end
-  
+
   js = yield(:js)
   js.gsub!("<script src=\"//", "<script src=\"#{protocol}")
   js.gsub!("<script src='//" , "<script src='#{protocol}")
@@ -117,8 +118,6 @@
   if @site.use_retargeting
     js << b.partial('retargeting', options)
   end
-      
-  js << b.partial('ga', options)  
   
   str.gsub!('|CABOOSE_CSS|'        , css)
   str.gsub!('|CABOOSE_PROTOCOL|'   , protocol)  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.140'
+  VERSION = '0.9.141'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.140
+  version: 0.9.141
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -906,6 +906,7 @@ files:
 - app/views/caboose/blocks/_file.html.erb
 - app/views/caboose/blocks/_ga.html.erb
 - app/views/caboose/blocks/_ga_events.html.erb
+- app/views/caboose/blocks/_ga_old.html.erb
 - app/views/caboose/blocks/_google_spreadsheet_cell_value.html.erb
 - app/views/caboose/blocks/_heading.html.erb
 - app/views/caboose/blocks/_html.html.erb