caboose-cms 0.9.229 → 1.0.1

data/app/models/caboose/site.rb

@@ -42,7 +42,6 @@ class Caboose::Site < ActiveRecord::Base
     :analytics_id            ,
     :use_retargeting         ,
     :use_dragdrop            ,
-    :use_change_logs         ,
     :date_js_updated         ,
     :date_css_updated        ,
     :default_layout_id       ,
@@ -66,13 +65,7 @@ class Caboose::Site < ActiveRecord::Base
     :head_code,
     :body_open_code,
     :body_close_code,
-    :recaptcha_threshold,
-    :google_api_key,
-    :use_caching,
-    :footer_css_digest,
-    :footer_js_digest,
-    :custom_css_files,
-    :custom_js_files
+    :recaptcha_threshold
             
   before_save :validate_presence_of_store_config
 
@@ -158,16 +151,6 @@ class Caboose::Site < ActiveRecord::Base
   def self.sanitize_name(name)
     self.name = self.name.downcase.gsub(' ', '_')
   end
-
-  def dev_domain
-    Caboose::Domain.where(:site_id => self.id).where("domain LIKE ?","dev.%").first
-  end
-
-  def public_domain
-    ms = Caboose::Site.where(:is_master => true).first
-    md = Caboose::Domain.where(:site_id => ms.id, :primary => true).first if ms
-    return md ? "#{self.name}.#{md.domain}" : "caboosecms.com"
-  end
   
   def primary_domain
     Caboose::Domain.where(:site_id => self.id, :primary => true).first
@@ -252,190 +235,5 @@ class Caboose::Site < ActiveRecord::Base
     rm = Caboose::RoleMembership.create(:role_id => eli_role.id, :user_id => eli_user.id) if rm.nil?
         
   end
-
-
-
-  # Caching
-
-  def cached_footer_css
-    str = ''
-    return str if !self.use_caching
-    index_page = Caboose::Page.index_page(self.id)
-    footer_ids = Caboose::Page.home_page_footer_block_ids(index_page)
-    blocks = Caboose::Block.includes(:block_type).where("blocks.parent_id in (?)",footer_ids).where("blocks.cached_css IS NOT NULL").where("block_types.is_dynamic = false").order("blocks.id").all
-    blocks.each do |b|
-      str << b.cached_css
-    end
-    return str.blank? ? '' : str.gsub(/<\/style>(\s*)<style>/,'')
-  end
-
-  def cached_footer_js
-    str = ''
-    return str if !self.use_caching
-    index_page = Caboose::Page.index_page(self.id)
-    footer_ids = Caboose::Page.home_page_footer_block_ids(index_page)
-    blocks = Caboose::Block.includes(:block_type).where("blocks.parent_id in (?)",footer_ids).where("blocks.cached_js IS NOT NULL").where("block_types.is_dynamic = false").order("blocks.id").all
-    blocks.each do |b|
-      str << b.cached_js
-    end
-    host = Rails.env.production? ? "https://#{ActionController::Base.asset_host}" : ""
-    return str.blank? ? '' : str.gsub('"/assets/',"\"#{host}/assets/")
-  end
-
-  def refresh_footer_css
-    begin
-      rad = rand(999)
-      dom = Rails.env.production? ? self.public_domain : self.dev_domain.domain
-      uri = URI("http://#{dom}/api/generate-asset/site_#{self.id}.css?#{rad}")
-      css = Net::HTTP.get(uri)
-    rescue
-      Caboose.log("Couldn't generate site CSS")
-    end
-  end
-
-  def refresh_footer_js
-    begin
-      rad = rand(999)
-      dom = Rails.env.production? ? self.public_domain : self.dev_domain.domain
-      uri = URI("http://#{dom}/api/generate-asset/site_#{self.id}.js?#{rad}")
-      css = Net::HTTP.get(uri)
-    rescue
-      Caboose.log("Couldn't generate site JS")
-    end
-  end
-
-
-  def footer_css_path(digest = self.footer_css_digest)
-    return "assets/sites/site_#{self.id}_footer_#{digest}.css"
-  end
-
-  def footer_css_url
-    rad = rand(999)
-    old = "/api/generate-asset/site_#{self.id}.css?#{rad}"
-    return old if self.footer_css_digest.blank?
-    if Rails.env.production?
-      return "https://#{Caboose::cdn_domain}/#{footer_css_path}"
-    else
-      path = File.join(Rails.root, 'public', "#{footer_css_path}")
-      if File.file?(path)
-        return "#{ActionController::Base.asset_host}/#{footer_css_path}"
-      else
-        return "https://#{Caboose::cdn_domain}/#{footer_css_path}"
-      end
-    end
-  end
-
-  def update_footer_css_file
-    str = ""
-    footer_css_digest = SecureRandom.urlsafe_base64.to_s
-    old_digest = self.footer_css_digest
-    css = self.refresh_footer_css
-    if css && !css.blank?
-      begin
-        if Rails.env.production?
-          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[self.footer_css_path(footer_css_digest)].write(css, :acl => 'public-read', :content_type => 'text/css', :cache_control => 'public, max-age=86400')
-          if !old_digest.blank? && old_digest != 'empty'
-            key = self.footer_css_path(old_digest)
-            obj = bucket.objects[key]
-            obj.delete
-          end
-        else
-          file_path = File.join(Rails.root, 'public', 'assets', 'sites')
-          FileUtils.mkdir_p(file_path) unless File.directory?(file_path)
-          File.open(File.join(Rails.root, 'public', self.footer_css_path(footer_css_digest)), 'w') { |f| f.write( css ) } 
-          if !old_digest.blank? && old_digest != 'empty'
-            path = File.join(Rails.root, 'public', self.footer_css_path(old_digest))
-            File.delete(path) if File.file?(path)
-          end
-        end
-        self.update_column('footer_css_digest', footer_css_digest)
-      rescue
-        self.update_column('footer_css_digest', old_digest)
-      end
-    else
-      self.update_column('footer_css_digest', 'empty')
-    end
-  end
-
-
-
-
-  def footer_js_path(digest = self.footer_js_digest)
-    return "assets/sites/site_#{self.id}_footer_#{digest}.js"
-  end
-
-  def footer_js_url
-    rad = rand(999)
-    old = "/api/generate-asset/site_#{self.id}.js?#{rad}"
-    return old if self.footer_js_digest.blank?
-    if Rails.env.production?
-      return "https://#{Caboose::cdn_domain}/#{footer_js_path}"
-    else
-      path = File.join(Rails.root, 'public', "#{footer_js_path}")
-      if File.file?(path)
-        return "#{ActionController::Base.asset_host}/#{footer_js_path}"
-      else
-        return "https://#{Caboose::cdn_domain}/#{footer_js_path}"
-      end
-    end
-  end
-
-  def update_footer_js_file
-    str = ""
-    footer_js_digest = SecureRandom.urlsafe_base64.to_s
-    old_digest = self.footer_js_digest
-    js = self.refresh_footer_js
-    if js && !js.blank?
-      begin
-        if Rails.env.production?
-          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[self.footer_js_path(footer_js_digest)].write(js, :acl => 'public-read', :content_type => 'text/javascript', :cache_control => 'public, max-age=86400')
-          if !old_digest.blank? && old_digest != 'empty'
-            key = self.footer_js_path(old_digest)
-            obj = bucket.objects[key]
-            obj.delete
-          end
-        else
-          file_path = File.join(Rails.root, 'public', 'assets', 'sites')
-          FileUtils.mkdir_p(file_path) unless File.directory?(file_path)
-          File.open(File.join(Rails.root, 'public', self.footer_js_path(footer_js_digest)), 'w') { |f| f.write( js ) } 
-          if !old_digest.blank? && old_digest != 'empty'
-            path = File.join(Rails.root, 'public', self.footer_js_path(old_digest))
-            File.delete(path) if File.file?(path)
-          end
-        end
-        self.update_column('footer_js_digest', footer_js_digest)
-      rescue
-        self.update_column('footer_js_digest', old_digest)
-      end
-    else
-      self.update_column('footer_js_digest', 'empty')
-    end
-  end
-
-
-  def refresh_all_page_caches
-    if self.use_caching
-      home_page = Caboose::Page.index_page(self.id)
-      footer = home_page.block.child('footer')
-      Caboose::Page.where(:site_id => self.id).order(:id).all.each do |page|
-        content = page.block ? page.block.child('content') : nil
-        block_ids = content ? Caboose::Block.where("parent_id = ?", content.id).pluck(:id) : []
-        page.update_cached_blocks(block_ids)
-        page.delay(:queue => 'caching', :priority => 8).update_css_file
-        page.delay(:queue => 'caching', :priority => 8).update_js_file
-      end
-      footer_ids = Caboose::Block.where("parent_id = ?", footer.id).pluck(:id)
-      home_page.update_cached_blocks(footer_ids)
-      self.delay(:queue => 'caching', :priority => 9).update_footer_css_file
-      self.delay(:queue => 'caching', :priority => 9).update_footer_js_file
-    end
-  end
-
   
 end

data/app/models/caboose/theme.rb

@@ -102,13 +102,7 @@ class Caboose::Theme < ActiveRecord::Base
 
     :digest,
     :custom_sass,
-    :cl_banner_version,
-    :sass_error,
-    :main_js,
-    :js_digest,
-
-    :default_page_padding,
-    :default_page_constrain
+    :cl_banner_version
 
   def compile(for_site_id = 0)
   	theme = self
@@ -117,7 +111,6 @@ class Caboose::Theme < ActiveRecord::Base
   	body = ERB.new(File.read(File.join(path))).result(theme.get_binding(for_site_id))
   	tmp_themes_path = File.join(Rails.root, 'tmp', 'themes')
   	tmp_asset_name = "theme_#{self.id}_site_#{for_site_id}"
-  	old_digest = self.digest
   	FileUtils.mkdir_p(tmp_themes_path) unless File.directory?(tmp_themes_path)
   	File.open(File.join(tmp_themes_path, "#{tmp_asset_name}.scss"), 'w') { |f| f.write(body) }
 		begin
@@ -138,28 +131,17 @@ class Caboose::Theme < ActiveRecord::Base
 	      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[theme.asset_path(asset.digest, for_site_id)].write(str, :acl => 'public-read', :content_type => 'text/css', :cache_control => 'public, max-age=86400')
-		    # if !old_digest.blank?
-      #     key = self.asset_path(old_digest, for_site_id)
-      #     obj = bucket.objects[key]
-      #     obj.delete
-      #   end
+		    bucket.objects[theme.asset_path(asset.digest, for_site_id)].write(str, :acl => 'public-read', :content_type => 'text/css')
 	    else
 	    	theme_path = File.join(Rails.root, 'public', 'assets', 'themes')
 				FileUtils.mkdir_p(theme_path) unless File.directory?(theme_path)
 	      File.open(File.join(Rails.root, 'public', theme.asset_path(asset.digest, for_site_id)), 'w') { |f| f.write(compressed_body) }
-	      if !old_digest.blank?
-          path = File.join(Rails.root, 'public', self.asset_path(old_digest, for_site_id))
-          File.delete(path) if File.file?(path)
-        end
 	    end
 	    self.update_digest(asset.digest)
 		rescue Sass::SyntaxError => error
 			if Rails.env.development?
 				raise error
 			end
-			theme.sass_error = error
-			theme.save
 			theme.revert
 		end
   end
@@ -197,56 +179,9 @@ class Caboose::Theme < ActiveRecord::Base
 		end
 	end
 
-	def js_path(site_id = 0, digest = self.js_digest)
-		"assets/themes/theme_#{self.id}_site_#{site_id}_#{digest}.js"
-	end
-
-	def upload_js(for_site_id = 0)
-		str = ""
-		js_digest = SecureRandom.urlsafe_base64.to_s
-		old_digest = self.js_digest
-		Caboose::ThemeFile.where("filename ILIKE (?)","%.js%").all.each do |jsfile|
-			if Caboose::ThemeFileMembership.where(:theme_id => self.id, :theme_file_id => jsfile.id).exists?
-				uri = URI(jsfile.filename)
-				str += Net::HTTP.get(uri)
-			end 
-		end
-		str += self.main_js
-		if Rails.env.production?
-      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[self.js_path(for_site_id, js_digest)].write(str, :acl => 'public-read', :content_type => 'application/javascript', :cache_control => 'public, max-age=86400')
-	    # if !old_digest.blank?
-     #    key = self.js_path(for_site_id, old_digest)
-     #    obj = bucket.objects[key]
-     #    obj.delete
-     #  end
-    else
-    	theme_path = File.join(Rails.root, 'public', 'assets', 'themes')
-			FileUtils.mkdir_p(theme_path) unless File.directory?(theme_path)
-      File.open(File.join(Rails.root, 'public', self.js_path(for_site_id, js_digest)), 'w') { |f| f.write( str ) }
-      if !old_digest.blank?
-        path = File.join(Rails.root, 'public', self.js_path(for_site_id, old_digest))
-        File.delete(path) if File.file?(path)
-      end
-    end
-    self.update_column('js_digest', js_digest)
-	end
-
-	def js_url(site_id = 0)
-		old = "https://cabooseit.s3.amazonaws.com/assets/natureseyenri/js/application.js"
-		return old if self.main_js.blank?
-		if Rails.env.production?
-			return "https://#{ActionController::Base.asset_host}/#{js_path(site_id)}"
-		else
-			path = File.join(Rails.root, 'public', "#{js_path(site_id)}")
-			if File.file?(path)
-				return "#{ActionController::Base.asset_host}/#{js_path(site_id)}"
-			else
-				return "https://#{Caboose::cdn_domain}/#{js_path(site_id)}"
-			end
-		end
+	def js_url
+		# TODO - figure out how to do this 
+		"https://cabooseit.s3.amazonaws.com/assets/natureseyenri/js/application.js"
 	end
 
 	def update_digest(digest)

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

@@ -0,0 +1,44 @@
+<div id="admin_flex_wrapper">
+  <!--
+  <div id='admin_nav'>
+    <ul>
+      <% @nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site) %>
+      <% @nav.each do |item| %>
+        <% href = item['href'] || '#' %>
+        <li id="<%= item['id'] %>" class="top-li <%= item['id'] %><% if @request.fullpath.starts_with?(href) %> selected<% end %>">
+          <a title="<%= item['text'] %>" href="<%= href %>">
+            <span class='icon'></span><span class='text'><%= item['text'] %></span>
+          </a>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+  -->
+  <div id="admin_sub_nav">
+    <% @nav.each do |item| %>
+      <% if item['children'] && item['children'].count > 0 %>
+        <ul class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-<%= item['id'] %>">
+          <li><a class="close" data-id="<%= item['id'] %>">&times;</a></li>
+          <% item['children'].each do |item2| %>
+            <% if item2['href'] != '#' %>
+              <li><a href='<%= item2['href'] %>'><%= item2['text'] %></a></li>
+            <% end %>
+          <% end %>
+        </ul>
+      <% end %>
+    <% end %>
+  </div>
+  <% subnav = yield :admin_subnav %>  
+  <% if subnav && subnav.strip.length > 0 
+    %><%= raw subnav %><%
+    subnav = true
+  else
+    subnav = false
+  end %>
+  <div id='admin_content_wrapper'<% if subnav %> class='with_subnav'<% end %>>
+    <div id='admin_content_body'> 
+      <%= yield %>
+    </div>
+  </div>
+</div>
+</div>

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

@@ -0,0 +1,47 @@
+<%
+hf   = nil #Caboose::Font.where(:site_id => @site.id, :name => "heading-font"          ).last
+bf   = nil #Caboose::Font.where(:site_id => @site.id, :name => "body-font"             ).last
+bfb  = nil #Caboose::Font.where(:site_id => @site.id, :name => "body-font-bold"        ).last
+bfi  = nil #Caboose::Font.where(:site_id => @site.id, :name => "body-font-italic"      ).last
+bfbi = nil #Caboose::Font.where(:site_id => @site.id, :name => "body-font-bold-italic" ).last
+btn  = nil #Caboose::Font.where(:site_id => @site.id, :name => "button-font"           ).last
+default = '//fonts.gstatic.com/s/opensans/v13/MTP_ySUJH_bn48VBG8sNSi3USBnSvpkopQaUR-2r7iU.ttf'
+%>
+<style>
+	@font-face {
+		font-family: "heading-font";
+		src: url('<%= hf && !hf.blank? ? hf.url.gsub("http://","//") : default %>') format('truetype');
+		font-weight: normal;
+		font-style: normal;
+	}
+	@font-face {
+		font-family: "body-font";
+		src: url('<%= bf && !bf.blank? ? bf.url.gsub("http://","//") : default %>') format('truetype');
+		font-weight: normal;
+		font-style: normal;
+	}
+	@font-face {
+		font-family: "body-font";
+		src: url('<%= bfb && !bfb.blank? ? bfb.url.gsub("http://","//") : default %>') format('truetype');
+		font-weight: bold;
+		font-style: normal;
+	}
+	@font-face {
+		font-family: "body-font";
+		src: url('<%= bfi && !bfi.blank? ? bfi.url.gsub("http://","//") : default %>') format('truetype');
+		font-weight: normal;
+		font-style: italic;
+	}
+	@font-face {
+		font-family: "body-font";
+		src: url('<%= bfbi && !bfbi.blank? ? bfbi.url.gsub("http://","//") : default %>') format('truetype');
+		font-weight: bold;
+		font-style: italic;
+	}
+	@font-face {
+		font-family: "button-font";
+		src: url('<%= btn && !btn.blank? ? btn.url.gsub("http://","//") : default %>') format('truetype');
+		font-weight: normal;
+		font-style: normal;
+	}
+</style>

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

@@ -0,0 +1 @@
+<footer id='admin_footer'></footer>

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

@@ -0,0 +1,12 @@
+<header id='admin_header'>
+  <div id='admin_logo_link'><a href='/' title='Admin Home'><span>Admin Home</span></a></div>
+	<div id='crumbtrail'></div>
+	<!--
+  <div id='admin_top_nav'>
+    <ul>
+      <li class='my_account' ><a href='/my-account'><span class='icon'></span><span class='text'>My Account</span></a></li>
+      <li class='help'       ><a href='/admin/help'><span class='icon'></span><span class='text'>Help</span></a></li>
+    </ul>
+  </div>
+  -->
+</header>