caboose-cms 0.5.194 → 0.5.195

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTI4NDUyZWM4ZDQyZjMyYTFkMTRlZDAyYjY5NDkzOGViOTI2N2U5YQ==
+    MTEwZDI1Njk1NzdlN2EzYmMzZGFhODVmYjZhNjI1ZTU4NTg5NGNhOA==
   data.tar.gz: !binary |-
-    OWVjMjAxMjZjNDUyNjUwNTMxNDJkNzA5ODc2OWUxMjYxNWQ2ZDhlMw==
+    Y2RhMGVjMDM1MGMyYjFkYzAyMWQ5ZmI2OGE0ZmY3NzYxNjYzN2U4MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWY0ODkwOWNjNzEyYzliMmFiNzE5YWY5MDI1MDA1NWQ4ZjQ2MWY2ZWExMTFk
-    YmY4MDViY2FlY2VlODFmM2VhYzVhODMwNWFiZDI0MWY1NTc1Y2M1ZjExMzMw
-    ZTlhMjViNjYzYWIzODFhOThmMjQxODRjN2E2M2I5NzJmYjkyZjg=
+    OWY3NTU3OGEyNDgyZjJiZjA4OWZjY2I2NWM4NTI1NzdkMjNiMjcyYzdkZjg5
+    NDMxMzY5MzQ0ZDdlNDc2NzE2NDRhMTc5OTc2OTI2NjFmMGQxZGY3NGUxZTJm
+    NmI2MWJiYzYwN2ZiOGRjNjQ0YmIwN2MwM2RjMDFjNWI2Mzk5NzQ=
   data.tar.gz: !binary |-
-    MTFmZTE3OTNlODY3MmU2MmUyMDNkZTZhOWEwZGY0MjMwYzZmNGM5NTRlZTg0
-    M2I4OWY2NTBmY2ZhZWYxNDNlNzUxZjk0NmE3ZWQ1YzY3MzZlYWJmYWFjNjUz
-    ODc3ZDc4ZGJkNGZlMjk1MmI5NzQ0MmMwMTkzNjU1OTg0OGI4Yzc=
+    YjU0NWMyMDdmZDdkYzc5MTQ5MWFjMGJiYjgxNTljMmVhOTM4YzMwNDNkYTgw
+    MTgzMGY0YmY3MDc5ZjA3YjlhMzFhZTU5NDIxMGMwODg1MGJkMGMyYjViZjE1
+    YTAyNTZiNzA2ODcwZTc4NzczODc5MDIzMDZhNGI5ZWYzNTc3YjE=

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

@@ -54,7 +54,9 @@ Caboose.Store.Modules.Product = (function() {
   self.initalize_zoom = function(image_url) {
     var big_image = $("#product-images").children("figure").first();
     big_image.data("zoom-image",image_url);
-    big_image.elevateZoom();
+    if (typeof elevateZoom !== 'undefined') {
+      big_image.elevateZoom();
+    }
   }
   
   self.render_images = function(callback) {

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

@@ -442,3 +442,59 @@ Page Bar Generator
    height: 0; 
    clear: both;
 }
+
+.caboose-btn {
+  background: #141516; 
+  color: #f7f7f7;
+  text-align: center; 
+  padding: 8px 15px 6px 15px;
+  height: auto;
+  display: inline-block;
+  margin: 0 auto;
+  font-size: 15px;
+  line-height: 18px;
+  cursor: pointer;
+  border: 1px solid #fff;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-width: 0;
+  -webkit-appearance: none;
+  border-radius: 5px; 
+  text-decoration: none;
+}
+
+.caboose-btn-white, input[type="submit"], input[type="button"] {
+  background: #e3e3e3; 
+  border: 1px solid #fff;
+  color: #141516;
+  text-align: center; 
+  padding: 8px 15px 6px 15px;
+  height: auto;
+  display: inline-block;
+  margin: 0 auto;
+  font-size: 15px;
+  cursor: pointer;
+  -webkit-border-radius: 5px;
+  border-width: 0;
+  -webkit-appearance: none;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  line-height: 18px;
+  text-decoration: none;
+}
+
+.caboose-btn:focus {
+  outline-width: 0;
+}
+
+.caboose-btn-white:focus, input[type="submit"]:focus, input[type="button"]:focus {
+  outline-width: 0;
+}
+
+.caboose-btn:hover {
+  background: #4f4448;
+}
+
+.caboose-btn-white:hover, input[type="submit"]:hover, input[type="button"]:hover {
+  background: #ccc;
+}

data/app/controllers/caboose/sites_controller.rb

@@ -71,6 +71,26 @@ module Caboose
       @site = Site.find(params[:id])      
     end
     
+    # GET /admin/sites/:id/css
+    def admin_edit_css
+      return if !user_is_allowed('sites', 'edit')
+      if !@site.is_master
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end      
+      @site = Site.find(params[:id])      
+    end
+    
+    # GET /admin/sites/:id/js
+    def admin_edit_js
+      return if !user_is_allowed('sites', 'edit')
+      if !@site.is_master
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end      
+      @site = Site.find(params[:id])      
+    end
+    
     # GET /admin/sites/:id/delete
     def admin_delete_form
       return if !user_is_allowed('sites', 'edit')
@@ -127,6 +147,8 @@ module Caboose
           when 'under_construction_html'  then site.under_construction_html = value
           when 'use_store'                then site.use_store               = value
           when 'use_retargeting'          then site.use_retargeting         = value
+          when 'custom_css'               then site.custom_css              = value            
+          when 'custom_js'                then site.custom_js               = value                        
     	  end
     	end
     	

data/app/models/caboose/order_pdf.rb

@@ -47,9 +47,11 @@ module Caboose
           t = AuthorizeNet::Reporting::Transaction.new(sc.pp_username, sc.pp_password)
           resp = t.get_transaction_details(ot.transaction_id)
           t2 = resp.transaction
-          self.card_type = t2.payment_method.card_type.upcase
-          self.card_number = t2.payment_method.card_number.gsub('X', '')
-        
+          if t2
+            self.card_type = t2.payment_method.card_type.upcase
+            self.card_number = t2.payment_method.card_number.gsub('X', '')
+          end
+          
       end
             
     end
@@ -130,7 +132,7 @@ module Caboose
           if li.variant.product.option1 && li.variant.option1 then options += li.variant.product.option1 + ": " + li.variant.option1 + "\n" end
           if li.variant.product.option2 && li.variant.option2 then options += li.variant.product.option2 + ": " + li.variant.option2 + "\n" end
           if li.variant.product.option3 && li.variant.option3 then options += li.variant.product.option3 + ": " + li.variant.option3 + "\n" end
-          if li.variant.product.product_images.count > 0 
+          if li.variant.product.product_images.count > 0 && li.variant.product.product_images.first.url(:tiny)
             image = open("#{li.variant.product.product_images.first.url(:tiny)}")
           else
             image = ""
@@ -140,7 +142,11 @@ module Caboose
             arr << { :content => package + "\n" + carrier + "\n" + service, :width => 115, :rowspan => (index == 0 ? pk.line_items.count : 1) }
           end
          
-          arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+          if !image.blank? 
+            arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+          else
+            arr << { :content => "No Image" }
+          end
           arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
           arr << { :content => options }
           arr << { :content => "#{li.quantity}"                     , :align => :right }
@@ -158,7 +164,7 @@ module Caboose
         if li.variant.product.option1 && li.variant.option1 then options += li.variant.product.option1 + ": " + li.variant.option1 + "\n" end
         if li.variant.product.option2 && li.variant.option2 then options += li.variant.product.option2 + ": " + li.variant.option2 + "\n" end
         if li.variant.product.option3 && li.variant.option3 then options += li.variant.product.option3 + ": " + li.variant.option3 + "\n" end
-        if li.variant.product.product_images.count > 0 
+        if li.variant.product.product_images.count > 0 && li.variant.product.product_images.first.url(:tiny)
           image = open("#{li.variant.product.product_images.first.url(:tiny)}")
         else
           image = ""
@@ -167,11 +173,19 @@ module Caboose
         if index == 0
           arr << { :content => "Unassigned", :width => 115, :rowspan => (index == 0 ? unassigned.count : 1) }
         end
-        arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+        if !image.blank? 
+          arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+        else
+          arr << { :content => "No Image" }
+        end
         arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
         arr << { :content => options }
         arr << { :content => "#{li.quantity}"               , :align => :right }
-        arr << { :content => "$" + sprintf("%.2f", li.price) , :align => :right }
+        if li.unit_price
+          arr << { :content => "$" + sprintf("%.2f", li.unit_price) , :align => :right }
+        else
+          arr << { :content => "" }
+        end
         arr << { :content => "$" + sprintf("%.2f", li.subtotal)   , :align => :right }
         tbl << arr
       end
@@ -192,14 +206,34 @@ module Caboose
       tbl2 = []
       tbl3 = []
 
-      tbl2 << [{ :content => "Card Type"        , :width => 127, :border_width => 0 },{ :content => self.card_type                                        , :width => 128, :border_width => 0 }]
-      tbl2 << [{ :content => "Transaction ID"   , :width => 127, :border_width => 0 },{ :content => trans.transaction_id.to_s                             , :width => 128, :border_width => 0 }]
-      tbl2 << [{ :content => "Gateway Response" , :width => 127, :border_width => 0 },{ :content => trans.response_code.to_s                              , :width => 128, :border_width => 0 }]
-      tbl3 << [{ :content => "Card Number"      , :width => 127, :border_width => 0 },{ :content => "XXXX XXXX XXXX " + self.card_number                  , :width => 128, :border_width => 0 }]
-      tbl3 << [{ :content => "Transaction Time" , :width => 127, :border_width => 0 },{ :content => trans.date_processed.strftime("%d %b %Y %H:%M:%S %p") , :width => 128, :border_width => 0 }]
-      tbl3 << [{ :content => "Payment Process"  , :width => 127, :border_width => 0 },{ :content => trans.success ? "Successful" : "Failed"               , :width => 128, :border_width => 0 }]
-      
-      tbl << [{ :content => "Authorization Details", :colspan => 2, :font_style => :bold }]
+      tbl2 << [
+        { :content => "Card Type", :width => 127, :border_width => 0 },
+        { :content => self.card_type.blank? ? "N/A" : self.card_type, :width => 128, :border_width => 0 }
+      ]
+      tbl2 << [
+        { :content => "Transaction ID", :width => 127, :border_width => 0 },
+        { :content => trans.transaction_id.to_s, :width => 128, :border_width => 0 }
+      ]
+      tbl2 << [
+        { :content => "Gateway Response", :width => 127, :border_width => 0},
+        { :content => trans.response_code.to_s, :width => 128, :border_width => 0  }
+      ]
+      tbl3 << [
+        { :content => "Card Number", :width => 127, :border_width => 0},
+        { :content => self.card_number ? ("XXXX XXXX XXXX " + self.card_number) : "N/A", :width => 128, :border_width => 0 }
+      ]
+      tbl3 << [
+        { :content => "Transaction Time", :width => 127, :border_width => 0},
+        { :content => trans.date_processed.strftime("%d %b %Y %H:%M:%S %p"), :width => 128, :border_width => 0  }
+      ]
+      tbl3 << [
+        { :content => "Payment Process", :width => 127, :border_width => 0},
+        { :content => trans.success ? "Successful" : "Failed", :width => 128, :border_width => 0  }
+      ]
+      tbl << [
+        { :content => "Authorization Details", :colspan => 2, :font_style => :bold }
+      ]
+
       tbl << [
         { :content => tbl2, :width => 255 },
         { :content => tbl3, :width => 255 }

data/app/models/caboose/pending_orders_pdf.rb

@@ -44,8 +44,10 @@ module Caboose
           t = AuthorizeNet::Reporting::Transaction.new(sc.pp_username, sc.pp_password)
           resp = t.get_transaction_details(ot.transaction_id)
           t2 = resp.transaction
-          self.card_type = t2.payment_method.card_type.upcase
-          self.card_number = t2.payment_method.card_number.gsub('X', '')
+          if t2
+            self.card_type = t2.payment_method.card_type.upcase
+            self.card_number = t2.payment_method.card_number.gsub('X', '')
+          end
       end
     end
 
@@ -133,7 +135,9 @@ module Caboose
           if li.variant.product.option1 && li.variant.option1 then options += li.variant.product.option1 + ": " + li.variant.option1 + "\n" end
           if li.variant.product.option2 && li.variant.option2 then options += li.variant.product.option2 + ": " + li.variant.option2 + "\n" end
           if li.variant.product.option3 && li.variant.option3 then options += li.variant.product.option3 + ": " + li.variant.option3 + "\n" end
-          if li.variant.product.product_images.count > 0 
+          if li.variant.product.product_images.count > 0 && li.variant.product.product_images.first.url(:tiny)
+          #  Caboose.log("image path: #{li.variant.product.product_images.first.url(:tiny)}")
+          #  image = ""
             image = open("#{li.variant.product.product_images.first.url(:tiny)}")
           else
             image = ""
@@ -143,7 +147,11 @@ module Caboose
             arr << { :content => package + "\n" + carrier + "\n" + service, :width => 115, :rowspan => (index == 0 ? pk.line_items.count : 1) }
           end
          
-          arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+          if !image.blank?
+            arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+          else
+            arr << { :content => "No Image" }
+          end
           arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
           arr << { :content => options }
           arr << { :content => "#{li.quantity}"                     , :align => :right }
@@ -161,7 +169,9 @@ module Caboose
         if li.variant.product.option1 && li.variant.option1 then options += li.variant.product.option1 + ": " + li.variant.option1 + "\n" end
         if li.variant.product.option2 && li.variant.option2 then options += li.variant.product.option2 + ": " + li.variant.option2 + "\n" end
         if li.variant.product.option3 && li.variant.option3 then options += li.variant.product.option3 + ": " + li.variant.option3 + "\n" end
-        if li.variant.product.product_images.count > 0 
+        if li.variant.product.product_images.count > 0 && li.variant.product.product_images.first.url(:tiny)
+       #   Caboose.log("image path: #{li.variant.product.product_images.first.url(:tiny)}")
+       #   image = ""
           image = open("#{li.variant.product.product_images.first.url(:tiny)}")
         else
           image = ""
@@ -170,15 +180,23 @@ module Caboose
         if index == 0
           arr << { :content => "Unassigned", :width => 115, :rowspan => (index == 0 ? unassigned.count : 1) }
         end
-        arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+        if !image.blank?
+          arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+        else
+          arr << { :content => "No Image" }
+        end
         arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
         arr << { :content => options }
         arr << { :content => "#{li.quantity}"               , :align => :right }
-        arr << { :content => "$" + sprintf("%.2f", li.price) , :align => :right }
+        if li.unit_price
+          arr << { :content => "$" + sprintf("%.2f", li.unit_price) , :align => :right }
+        else
+          arr << { :content => "" }
+        end
         arr << { :content => "$" + sprintf("%.2f", li.subtotal)   , :align => :right }
         tbl << arr
       end
-
+      order.calculate
       tbl << [{ :content => "Subtotal"                       , :colspan => 6, :align => :right                       }, { :content => "$"     + sprintf("%.2f", order.subtotal                        ) , :align => :right }]
       tbl << [{ :content => "Discount"                       , :colspan => 6, :align => :right                       }, { :content => "(-) $" + sprintf("%.2f", order.discount ? order.discount : 0.0 ) , :align => :right }]
       tbl << [{ :content => "Shipping and Handling Charges"  , :colspan => 6, :align => :right                       }, { :content => "(+) $" + sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
@@ -198,7 +216,7 @@ module Caboose
       if trans
         tbl2 << [
           { :content => "Card Type", :width => 127, :border_width => 0 },
-          { :content => self.card_type, :width => 128, :border_width => 0 }
+          { :content => self.card_type.blank? ? "N/A" : self.card_type, :width => 128, :border_width => 0 }
         ]
         tbl2 << [
           { :content => "Transaction ID", :width => 127, :border_width => 0 },
@@ -210,7 +228,7 @@ module Caboose
         ]
         tbl3 << [
           { :content => "Card Number", :width => 127, :border_width => 0},
-          { :content => "XXXX XXXX XXXX " + self.card_number, :width => 128, :border_width => 0 }
+          { :content => self.card_number ? ("XXXX XXXX XXXX " + self.card_number) : "N/A", :width => 128, :border_width => 0 }
         ]
         tbl3 << [
           { :content => "Transaction Time", :width => 127, :border_width => 0},

data/app/models/caboose/schema.rb

@@ -568,14 +568,16 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :shipping_method_id   , :integer ]
       ],
       Caboose::Site => [
-        [ :name                    , :string ],
-        [ :description             , :text   ],
-        [ :under_construction_html , :text   ],
-        [ :use_store               , :boolean , { :default => false }],
+        [ :name                    , :string     ],
+        [ :description             , :text       ],
+        [ :under_construction_html , :text       ],
+        [ :use_store               , :boolean     , { :default => false }],
         [ :logo                    , :attachment ],        
-        [ :is_master               , :boolean , { :default => false }],
-        [ :analytics_id            , :string ],
-        [ :use_retargeting         , :boolean , { :default => false }]        
+        [ :is_master               , :boolean     , { :default => false }],
+        [ :analytics_id            , :string     ],
+        [ :use_retargeting         , :boolean     , { :default => false }],
+        [ :date_js_updated         , :datetime   ],
+        [ :date_css_updated        , :datetime   ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

data/app/models/caboose/site.rb

@@ -1,3 +1,4 @@
+require 'httparty'
 
 class Caboose::Site < ActiveRecord::Base
   self.table_name = "sites"
@@ -51,4 +52,52 @@ class Caboose::Site < ActiveRecord::Base
     Caboose::Domain.where(:site_id => self.id, :primary => true).first
   end
   
+  def custom_js_url
+    url = "http://#{Caboose::cdn_domain}/assets/#{self.name}/js/custom.js"
+    url << "?#{self.date_js_updated.strftime('%Y%m%d%H%M%S')}" if self.date_js_updated
+    return url
+  end
+  
+  def custom_css_url
+    url = "http://#{Caboose::cdn_domain}/assets/#{self.name}/css/custom.css"
+    url << "?#{self.date_css_updated.strftime('%Y%m%d%H%M%S')}" if self.date_css_updated
+    return url
+  end
+    
+  def custom_js              
+    resp = HTTParty.get(self.custom_js_url)
+    if resp.nil? || resp.code.to_i == 403
+      self.custom_js = ""
+      return ""            
+    end
+    return resp.body    
+  end
+  
+  def custom_css    
+    resp = HTTParty.get(self.custom_css_url)
+    if resp.nil? || resp.code.to_i == 403
+      self.custom_css = ""
+      return ""            
+    end
+    return resp.body    
+  end
+  
+  def custom_js=(str)    
+    config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+    AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
+    bucket =  AWS::S3.new.buckets[config['bucket']]                         
+    bucket.objects["assets/#{self.name}/js/custom.js"].write(str, :acl => 'public-read')                        
+    self.date_js_updated = DateTime.now.utc
+    self.save
+  end
+  
+  def custom_css=(str)    
+    config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
+    AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
+    bucket =  AWS::S3.new.buckets[config['bucket']]                         
+    bucket.objects["assets/#{self.name}/css/custom.css"].write(str, :acl => 'public-read')                        
+    self.date_css_updated = DateTime.now.utc
+    self.save
+  end
+  
 end

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

@@ -121,7 +121,7 @@ function delete_calendar(calendar_id, confirm)
       
 #calendar table { border-collapse: collapse; width: 95%; }
 #calendar th { border: #666 1px solid; background: #666; color: #fff; margin: 0; padding: 4px 8px; }
-#calendar td { border: #666 1px solid; position: relative; margin: 0; padding: 0; width: 14%; height: 100px; vertical-align: top; }
+#calendar td { border: #666 1px solid; position: relative; margin: 0; padding: 0; width: 14%; height: 100px; cursor: pointer;vertical-align: top; }
 #calendar td.blank { background: #efefef; border: #666 1px solid; }
 #calendar td.over { background: #ffcc99; }
 #calendar td span.day { display: block; float: left; border-right: #666 1px solid; border-bottom: #666 1px solid; width: 20px; text-align: center; }

data/app/views/caboose/calendars/admin_index.html.erb

@@ -5,7 +5,7 @@
 <input type='submit' value='Search' />
 </form>
 
-<p><a href='/admin/calendars/new' id='new_calendar'>New Calendar</a></p>
+<p><a href='/admin/calendars/new' id='new_calendar' class="caboose-btn-white">New Calendar</a></p>
 
 <form action='/admin/calendars' method='post' id='new_calendar_form'>
   <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>'>  

data/app/views/caboose/orders/admin_index.html.erb

@@ -5,9 +5,9 @@
 </style>
 
 <p>
-  <a href='#' onclick="$('#search_form').toggle(400, function() { modal.autosize(); });">Show/hide search form</a> | 
-  <a href='/admin/orders/new'>New Manual Order</a> |
-  <a href='/admin/orders/print-pending' target='_blank'>Print Pending Orders</a>
+  <a class="caboose-btn" href='#' onclick="$('#search_form').toggle(400, function() { modal.autosize(); });">Show/hide search form</a>
+  <a class="caboose-btn" href='/admin/orders/new'>New Manual Order</a>
+  <a class="caboose-btn" href='/admin/orders/print-pending' target='_blank'>Print Pending Orders</a>
 </p>
 <form action='/admin/orders' method='get' id='search_form' style='display: none;'>
   <p><input type='text' name='id' placeholder='Order ID' value="<%= @pager.params['id'] %>" style='width: 100px;' /></p>

data/app/views/caboose/pages/admin_index.html.erb

@@ -1,7 +1,7 @@
 <h1>Pages</h1>
 
 <% if @domain %>
-  <p><a href='/admin/pages/new'>New Page</a></p>
+  <p><a href='/admin/pages/new' class="caboose-btn-white">New Page</a></p>
   <%= raw pages_list(@home_page) %>
 <% else %>
   <p>It doesn't look like this site is configured for the current domain.  Please <a href='/admin/sites'>configure your sites</a>.</p>

data/app/views/caboose/products/_admin_header.html.erb

@@ -1,12 +1,19 @@
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag "caboose/admin_products" %>
+<style>
+#product-title {
+	font-size: 24px !important;
+	height: auto !important;
+	padding: 10px 2% !important;
+}
+</style>
 <% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <%= javascript_include_tag "caboose/admin_products" %>
 <% end %>
 
-<h1>Edit Product - <%= @product.title %></h1>
+<h1 id="product-title">Edit Product - <%= @product.title %></h1>
 <ul id='tabs'>
 <%
 tabs = {
@@ -27,6 +34,6 @@ tabs["/admin/products/#{@product.id}/delete"              ] = 'Delete Product'
 <% tabs.each do |href,text| %>
 <li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
 <% end %>
-<li class='back'><input type='button' value='< Back' onclick="window.location='/admin/products';" /></li>
+<li class='back'><input type='button' class="caboose-btn" value='< Back' onclick="window.location='/admin/products';" /></li>
 </ul>
-<div id='content2'>
+<div id='content2'>

data/app/views/caboose/sites/_admin_header.html.erb

@@ -26,6 +26,8 @@
 tabs = {
   'General'           => "/admin/sites/#{@site.id}",  
   'Block Types'       => "/admin/sites/#{@site.id}/block-types",
+  'Custom CSS'        => "/admin/sites/#{@site.id}/css",
+  'Custom JS'         => "/admin/sites/#{@site.id}/js",
   'Retargeting'       => "/admin/sites/#{@site.id}/retargeting",
   'Delete Site'       => "/admin/sites/#{@site.id}/delete" 
 }

data/app/views/caboose/sites/admin_edit_css.html.erb

@@ -0,0 +1,24 @@
+
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<p><div id='site_<%= @site.id %>_custom_css'        ></div></p>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'Site',
+    id: <%= @site.id %>,
+    update_url: '/admin/sites/<%= @site.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'custom_css', nice_name: 'Custom CSS', type: 'textarea' , value: <%= raw Caboose.json(@site.custom_css) %>, width: 600, height: 200 }      
+    ]    
+  });       
+});
+
+</script>
+<% end %>

data/app/views/caboose/sites/admin_edit_js.html.erb

@@ -0,0 +1,24 @@
+
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<p><div id='site_<%= @site.id %>_custom_js'        ></div></p>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'Site',
+    id: <%= @site.id %>,
+    update_url: '/admin/sites/<%= @site.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'custom_js', nice_name: 'Custom Javascript', type: 'textarea' , value: <%= raw Caboose.json(@site.custom_js) %>, width: 600, height: 200 }      
+    ]    
+  });       
+});
+
+</script>
+<% end %>

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

@@ -15,8 +15,8 @@
   <div id='top_nav'>
     <div class='caboose_logo'></div>
     <ul>
-      <li class='back'    ><a href='/'><span><< Back to Site</span></a></li>
-      <li class='cpanel'  ><a href='/station' id='caboose_station' class='caboose_modal'><span>Menu</span></a></li>
+      <li class='back'    ><a href='/' class="caboose-btn"><span><< Back to Site</span></a></li>
+      <li class='cpanel'  ><a href='/station' id='caboose_station' class='caboose_modal caboose-btn'><span>Menu</span></a></li>
     </ul>
   </div>
 </div>

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

@@ -5,14 +5,16 @@
 <script>window.loggedIn = <%= logged_in?.to_json %></script>
 <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
 <% @page.linked_resources_map[:js].each do |r| %><%= javascript_include_tag r %><% end %>
+<% if @site.date_js_updated %><script type='text/javascript' src="<%= raw @site.custom_js_url %>"></script><% end %>
 <% if @page.custom_js && @page.custom_js.strip.length > 0 %><script type='text/javascript'><%= raw @page.custom_js %></script><% end %>
 <%= yield :caboose_js %>
-<% end %>  
+<% end %>
 <% content_for :css do %>
 <%= stylesheet_link_tag 'caboose/application' %>
 <%= stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
 <% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
 <% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
+<% if @site.date_css_updated %><link rel='stylesheet' type='text/css' url="<%= raw @site.custom_css_url %>" /><% end %>
 <% if @page.custom_css && @page.custom_css.strip.length > 0 %><style><%= raw @page.custom_css %></style><% end %>
 <%= yield :caboose_css %>
 <% end %>

data/config/routes.rb

@@ -62,6 +62,8 @@ Caboose::Engine.routes.draw do
                                                                                                                                        
   get     "admin/sites/options"                    => "sites#options"            
   get     "admin/sites/new"                        => "sites#admin_new"        
+  get     "admin/sites/:id/css"                    => "sites#admin_edit_css"
+  get     "admin/sites/:id/js"                     => "sites#admin_edit_js"
   get     "admin/sites/:id/block-types"            => "sites#admin_edit_block_types"
   get     "admin/sites/:id/delete"                 => "sites#admin_delete_form"
   get     "admin/sites/:id"                        => "sites#admin_edit"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.194'
+  VERSION = '0.5.195'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.194
+  version: 0.5.195
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -873,6 +873,8 @@ files:
 - app/views/caboose/sites/admin_delete_form.html.erb
 - app/views/caboose/sites/admin_edit.html.erb
 - app/views/caboose/sites/admin_edit_block_types.html.erb
+- app/views/caboose/sites/admin_edit_css.html.erb
+- app/views/caboose/sites/admin_edit_js.html.erb
 - app/views/caboose/sites/admin_index.html.erb
 - app/views/caboose/sites/admin_new.html.erb
 - app/views/caboose/smtp/admin_edit.html.erb