caboose-cms 0.5.128 → 0.5.129

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTYzZmIxYmYwNDlhNGJjYjA4MWIzZTRlN2IwNzdkMGE3OTY0ZWE0OQ==
+    YWFmMTA2YWM3Yzc0Nzc2MDBkOTQzMzVkMGQ4MjcwOGY3Y2QzMzM5Nw==
   data.tar.gz: !binary |-
-    ZGU4MDhkMTZjMTE0ZGUxZWU2NzhiNWI4MzVlMjhkZjNlNjZjNzg2Zg==
+    ODY1M2FjNWY0ZDhjOWQzODEyZThlNjk4NjE2OGNmOTM1Mjk3NTQzMw==
 SHA512:
   metadata.gz: !binary |-
-    OGYxZDhmM2Y4NTk4ZDFmOTJiNDU5NDAxN2EyNTQ0ODk3ZjZiMWQ4OTllMDhl
-    OTA3M2ViNzgzMGZlMmE3YTE2YWYyYmZmOWM2ZTUxODE3OWM3NmJmMDlhZWU2
-    ZTczMDNlM2JjNmQzZjliNjFiMDk5N2M4YjU1ZDEzMjVmZmFkYTE=
+    NDBjNDU3Y2VmN2M3YzJhZTU2NjlkMzZkMDQ2OWZkYjQ5ZGJhYzEzNGI0ZWUy
+    YmU2NDBlNTAxNzFkMDFlZGUzY2U4N2Q2NjFlZWNmOWI1ODNhOWJhM2IwZGM3
+    OWJhYjdjNjk2ZGZkOTU4NGY5M2E1ZjZlNzJmYzY2ZGU2NTQyZjU=
   data.tar.gz: !binary |-
-    OTNjOGRlZWQ2NGVmMjQ5NjljMDFlNDliNzIwZjhlY2QzYTNjMDEzYjM0YmY0
-    YTFkMjkxZDg5Y2MzMjhlYzhiYmYyN2Q0ZGMxZjBjNTc5ZDUwNDA4NTk2OWRm
-    Y2Y0Y2IzNWExMTgwZmFhNzE1NjE0MjI4OGM4ZDdhZjI1ODRhM2M=
+    MzgzYTFkNzBmYjI5NDE0NmFhZjBhNjBmMzM1NmViYWJlZTRkMzYyMmU3ZTY1
+    MWI3ODc5ZDlhMTU3ZDRlM2Y3MDZjZTk5MzJhYTA5NmQ4YTg5ODcwNzY5NGQw
+    NGEzNzgyNmZmMzRjMzM5MDBlYjg2OTAzN2EyMWZlOTQ5YzAzYTQ=

data/app/assets/javascripts/caboose/product.js

@@ -17,6 +17,8 @@ Caboose.Store.Modules.Product = (function() {
   self.initialize = function() {
     self.$product = $('#product');
     self.$price = self.$product.find('#product-price');
+    $("<span id='percent-off'></span").insertAfter(self.$price);
+    $("<span id='sale-price'></span").insertBefore(self.$price);
     if (!self.$product.length) return false;
 
     $.get('/products/' + self.$product.data('id') + '/info', function(response) {
@@ -264,7 +266,35 @@ Caboose.Store.Modules.Product = (function() {
     Caboose.Store.Modules.Cart.set_variant(variant);
     if (variant) self.set_image_from_variant(variant);
     if (variant && self.$price.length) self.$price.empty().text('$' + parseFloat((variant.price * 100) / 100).toFixed(2));
+    if (self.variant_on_sale(variant)) {
+      self.$price.addClass("on-sale");
+      var percent = 100 - ((variant.sale_price / variant.price) * 100).toFixed(0);
+      $("#percent-off").text("SALE! Save " + percent + "%");
+      $("#sale-price").text('$' + parseFloat((variant.sale_price * 100) / 100).toFixed(2));
+    }
+    else {
+      self.$price.removeClass("on-sale");
+      $("#percent-off").text('');
+      $("#sale-price").text('');
+    }
   };
+
+  self.variant_on_sale = function(variant) {
+    var is_on_sale = false;
+    if (variant.sale_price != "" && variant.sale_price != 0) {
+      var d = new Date();
+      if (variant.date_sale_starts && d < variant.date_sale_starts) {
+        is_on_sale = false;
+      }
+      else if (variant.date_sale_ends && d > variant.date_sale_ends) {
+        is_on_sale = false;
+      }
+      else {
+        is_on_sale = true;
+      }
+    }
+    return is_on_sale;
+  }
   
   self.get_variant = function(id) {
     return _.find(self.product.variants, function(variant) { return variant.id == (id || self.variant.id) });

data/app/controllers/caboose/cart_controller.rb

@@ -119,4 +119,3 @@ module Caboose
     end
   end
 end
-

data/app/controllers/caboose/pages_controller.rb

@@ -78,7 +78,7 @@ module Caboose
         end
         
         respond_to do |format|          
-          format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
+          format.all { render :file => "caboose/extras/error404", :layout => "caboose/application", :formats => [:html] }
         end         
         return
       end
@@ -86,7 +86,7 @@ module Caboose
       asset = Asset.where(:page_id => page.id, :filename => File.basename(uri)).first
       if (asset.nil?)
         respond_to do |format|          
-          format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
+          format.all { render :file => "caboose/extras/error404", :layout => "caboose/application", :formats => [:html] }
         end
         return
       end

data/app/controllers/caboose/social_controller.rb

@@ -1,6 +1,10 @@
 module Caboose
   class SocialController < ApplicationController
     layout 'caboose/admin'
+
+    def analytics
+
+    end
     
     # GET /admin/social
     def admin_edit
@@ -30,6 +34,7 @@ module Caboose
           when 'rss_url'              then sc.rss_url              = value
           when 'google_plus_url'      then sc.google_plus_url      = value
           when 'linkedin_url'         then sc.linkedin_url         = value
+          when 'google_analytics_id'  then sc.google_analytics_id  = value
     	  end
     	end
     	

data/app/models/caboose/schema.rb

@@ -582,7 +582,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :vimeo_url            , :string ],
         [ :rss_url              , :string ],
         [ :google_plus_url      , :string ],
-        [ :linkedin_url         , :string ]
+        [ :linkedin_url         , :string ],
+        [ :google_analytics_id  , :string ]
       ],
       Caboose::StackableGroup => [       
         [ :name           , :string  ],

data/app/models/caboose/social_config.rb

@@ -12,6 +12,7 @@ class Caboose::SocialConfig < ActiveRecord::Base
     :vimeo_url            ,
     :rss_url              ,
     :google_plus_url      ,
-    :linkedin_url         
+    :linkedin_url         , 
+    :google_analytics_id  
     
 end

data/app/views/caboose/extras/error404.html.erb

@@ -1 +1,5 @@
-<h1>Page Not Found</h1>
+<div style="padding:60px 2%;text-align:center;background:#fff;">
+	<img src="http://cabooseit.s3.amazonaws.com/uploads/error_404.png" width="150" />
+	<h1 style="font-size:3em;font-weight:bold;margin-bottom:20px;margin-top:40px;color:#4b4b4b;">Oops!</h1>
+	<p style="color:#4b4b4b;font-size:18px;">The page you are looking for could not be found.</p>
+</div>

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

@@ -13,6 +13,7 @@ sc = @social_config
 <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>
       
 <div id='message'></div>
 
@@ -28,15 +29,16 @@ $(document).ready(function() {
     update_url: '/admin/social',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [      
-      { name: 'facebook_page_id' , nice_name: 'Facebook Page ID' , type: 'text', value: <%= raw Caboose.json(sc.facebook_page_id) %>, width: 400 },
-      { name: 'twitter_username' , nice_name: 'Twitter Username' , type: 'text', value: <%= raw Caboose.json(sc.twitter_username) %>, width: 400 },
-      { name: 'instagram_username' , nice_name: 'Instagram Username' , type: 'text', value: <%= raw Caboose.json(sc.instagram_username) %>, width: 400 },
-      { name: 'youtube_url' , nice_name: 'YouTube URL' , type: 'text', value: <%= raw Caboose.json(sc.youtube_url) %>, width: 400 },
-      { name: 'pinterest_url' , nice_name: 'Pinterest URL' , type: 'text', value: <%= raw Caboose.json(sc.pinterest_url) %>, width: 400 },
-      { name: 'vimeo_url' , nice_name: 'Vimeo URL' , type: 'text', value: <%= raw Caboose.json(sc.vimeo_url) %>, width: 400 },
-      { name: 'rss_url' , nice_name: 'RSS Feed URL' , type: 'text', value: <%= raw Caboose.json(sc.rss_url) %>, width: 400 },
-      { name: 'google_plus_url' , nice_name: 'Google Plus URL' , type: 'text', value: <%= raw Caboose.json(sc.google_plus_url) %>, width: 400 },
-      { name: 'linkedin_url' , nice_name: 'LinkedIn URL' , type: 'text', value: <%= raw Caboose.json(sc.linkedin_url) %>, width: 400 }
+      { name: 'facebook_page_id' , nice_name: 'Facebook Page ID' , type: 'text', value: <%= raw Caboose.json(sc.facebook_page_id) %>, width: 500 },
+      { name: 'twitter_username' , nice_name: 'Twitter Username' , type: 'text', value: <%= raw Caboose.json(sc.twitter_username) %>, width: 500 },
+      { name: 'instagram_username' , nice_name: 'Instagram Username' , type: 'text', value: <%= raw Caboose.json(sc.instagram_username) %>, width: 500 },
+      { name: 'youtube_url' , nice_name: 'YouTube URL' , type: 'text', value: <%= raw Caboose.json(sc.youtube_url) %>, width: 500 },
+      { name: 'pinterest_url' , nice_name: 'Pinterest URL' , type: 'text', value: <%= raw Caboose.json(sc.pinterest_url) %>, width: 500 },
+      { name: 'vimeo_url' , nice_name: 'Vimeo URL' , type: 'text', value: <%= raw Caboose.json(sc.vimeo_url) %>, width: 500 },
+      { name: 'rss_url' , nice_name: 'RSS Feed URL' , type: 'text', value: <%= raw Caboose.json(sc.rss_url) %>, width: 500 },
+      { name: 'google_plus_url' , nice_name: 'Google Plus URL' , type: 'text', value: <%= raw Caboose.json(sc.google_plus_url) %>, width: 500 },
+      { name: 'linkedin_url' , nice_name: 'LinkedIn URL' , type: 'text', value: <%= raw Caboose.json(sc.linkedin_url) %>, width: 500 },
+      { name: 'google_analytics_id' , nice_name: 'Google Analytics Tracking ID' , type: 'text', value: <%= raw Caboose.json(sc.google_analytics_id) %>, width: 500 }
     ]    
   });
       

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

@@ -0,0 +1,109 @@
+<!-- Step 1: Create the containing elements. -->
+
+<div class="constrain" style="text-align:center;">
+<div id="embed-api-auth-container"></div>
+<div id="chart-container"></div>
+<div id="view-selector-container"></div>
+</div>
+<!-- Step 2: Load the library. -->
+
+<script>
+(function(w,d,s,g,js,fs){
+  g=w.gapi||(w.gapi={});g.analytics={q:[],ready:function(f){this.q.push(f);}};
+  js=d.createElement(s);fs=d.getElementsByTagName(s)[0];
+  js.src='https://apis.google.com/js/platform.js';
+  fs.parentNode.insertBefore(js,fs);js.onload=function(){g.load('analytics');};
+}(window,document,'script'));
+</script>
+
+
+
+<script>
+
+gapi.analytics.ready(function() {
+
+  /**
+   * Authorize the user immediately if the user has already granted access.
+   * If no access has been created, render an authorize button inside the
+   * element with the ID "embed-api-auth-container".
+   */
+  gapi.analytics.auth.authorize({
+    container: 'embed-api-auth-container',
+    clientid: '1002749199705-234hgt2c2spgkt47h8ufu4ave9neifbk.apps.googleusercontent.com',
+  });
+
+
+  /**
+   * Create a new ViewSelector instance to be rendered inside of an
+   * element with the id "view-selector-container".
+   */
+  var viewSelector = new gapi.analytics.ViewSelector({
+    container: 'view-selector-container'
+  });
+
+  // Render the view selector to the page.
+  viewSelector.execute();
+
+
+  /**
+   * Create a new DataChart instance with the given query parameters
+   * and Google chart options. It will be rendered inside an element
+   * with the id "chart-container".
+   */
+  var dataChart = new gapi.analytics.googleCharts.DataChart({
+    query: {
+      metrics: 'ga:sessions',
+      dimensions: 'ga:date',
+      'start-date': '30daysAgo',
+      'end-date': 'yesterday'
+    },
+    chart: {
+      container: 'chart-container',
+      type: 'LINE',
+      options: {
+        width: '100%'
+      }
+    }
+  });
+
+
+  /**
+   * Render the dataChart on the page whenever a new view is selected.
+   */
+  viewSelector.on('change', function(ids) {
+    dataChart.set({query: {ids: ids}}).execute();
+  });
+
+});
+</script>
+
+<style>
+  #content {
+    padding: 10px 2%;
+  }
+  .constrain {
+    max-width: 1000px;
+    padding: 30px 2%;
+    margin: 0 auto;
+  }
+  #embed-api-auth-container {
+    margin-bottom: 40px;
+  }
+  #chart-container {
+    width: 80%;
+    margin: 0 auto;
+  }
+  #view-selector-container {
+    width: 80%;
+    margin: 0 auto;
+  }
+  #view-selector-container table {
+    float: left;
+    display: block;
+    width: 30% !important;
+    margin: 0 auto;
+  }
+  #timeline > div {
+    margin: 0 auto;
+  }
+</style>

data/config/routes.rb

@@ -87,6 +87,7 @@ Caboose::Engine.routes.draw do
   
   get     "admin/social"               => "social#admin_edit"  
   put     "admin/social"               => "social#admin_update"
+  get     "admin/analytics"            => "social#analytics"
 
 
   #=============================================================================

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.128'
+  VERSION = '0.5.129'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.128
+  version: 0.5.129
 platform: ruby
 authors:
 - William Barry
@@ -843,6 +843,7 @@ files:
 - app/views/caboose/sites/admin_new.html.erb
 - app/views/caboose/smtp/admin_edit.html.erb
 - app/views/caboose/social/admin_edit.html.erb
+- app/views/caboose/social/analytics.html.erb
 - app/views/caboose/stackable_groups/admin_index.html.erb
 - app/views/caboose/station/index.html.erb
 - app/views/caboose/store/admin_edit.html.erb