caboose-cms 0.9.166 → 0.9.167

data/app/models/caboose/site.rb

@@ -9,7 +9,7 @@ class Caboose::Site < ActiveRecord::Base
   has_many :domains, :class_name => 'Caboose::Domain', :dependent => :delete_all
   has_many :fonts, :class_name => 'Caboose::Font', :dependent => :delete_all
   has_many :post_categories, :class_name => 'Caboose::PostCategory'
-  has_one :store_config
+  has_one  :store_config
   has_attached_file :logo, 
     :path => ':caboose_prefixsite_logos/:id_:style.:extension',    
     :default_url => 'http://placehold.it/300x300',    
@@ -38,9 +38,22 @@ class Caboose::Site < ActiveRecord::Base
     :sitemap_xml             ,
     :robots_txt              ,
     :theme_color             ,
-    :assets_url              
+    :assets_url              ,
+    :theme_id
             
   before_save :validate_presence_of_store_config
+
+  def theme
+    Caboose::Theme.where(:id => self.theme_id).first
+  end
+
+  def build_new_site
+   # if defined?(SuiteBuilder) == 'constant' && SuiteBuilder.class == Class  
+      helper = Caboose::SiteBuilder.new(self.name)
+      helper.create_site_blocks(self.id)
+   # end
+  #  self.init_users_and_roles
+  end
   
   def validate_presence_of_store_config
     if self.use_store && !Caboose::StoreConfig.where(:site_id => self.id).exists?

data/app/models/caboose/theme.rb

@@ -0,0 +1,146 @@
+class Caboose::Theme < ActiveRecord::Base
+
+  self.table_name = "themes"
+
+  has_attached_file :default_banner_image,      
+    :path => 'banner_images/:id_:style.:extension',      
+    :default_url => 'https://res.cloudinary.com/caboose/image/upload/c_scale,f_auto,q_auto:good,w_1800/v1539265856/default_banner.jpg',
+    :s3_protocol => :https,
+    :styles      => {
+      huge:   '1800x1800>'
+    }
+  do_not_validate_attachment_file_type :default_banner_image
+
+	attr_accessible :id,
+    :color_main,
+    :color_alt,
+		:color_dark,
+		:color_light,
+		:max_width,
+		:body_bg_color,
+		:font_size,
+		:header_height,
+		:header_bg_color,
+		:header_font_color,
+		:dropdown_color,
+		:mobile_menu_bg_color,
+		:mobile_menu_font_color,
+		:mobile_menu_border_color,
+		:mobile_menu_icon_color,
+		:mobile_menu_icon_top,
+		:footer_height,
+		:footer_bg_color,
+		:footer_font_color,
+		:btn_border_radius,
+		:btn_border_width,
+		:btn_border_color,
+		:btn_font_color,
+		:btn_font_size,
+		:btn_font_weight,
+		:btn_font_case,
+		:btn_border_side,
+		:input_border_radius,
+		:input_bg_color,
+		:input_border_color,
+		:input_border_width,
+		:input_font_color,
+		:input_font_size,
+		:input_padding,
+
+		:body_line_height,
+		:body_font_color,
+		:button_padding,
+		:button_line_height,
+		:footer_padding,
+		:footer_font_size,
+		:header_font_size,
+		:note_padding,
+		:header_nav_spacing,
+		:logo_width,
+		:logo_height,
+		:logo_top_padding,
+		:heading_line_height,
+		:mobile_menu_nav_padding,
+		:mobile_menu_font_size,
+		:banner_padding,
+		:banner_overlay_color,
+		:banner_overlay_opacity,
+		:default_header_style,
+		:default_header_position,
+		:sidebar_width,
+		:sidebar_bg_color,
+
+    :digest
+
+  def compile(for_site_id = 0)
+  	theme = self
+  	theme_name = 'default'
+  	path = Rails.root.join(Caboose::site_assets_path, 'themes', "#{theme_name}.scss.erb")
+  	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}"
+  	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
+	    env = if Rails.application.assets.is_a?(Sprockets::Index)
+	      Rails.application.assets.instance_variable_get('@environment')
+	    else
+	      Rails.application.assets
+	    end
+	    asset = env.find_asset(tmp_asset_name)
+	    compressed_body = ::Sass::Engine.new(asset.body, {
+	      :syntax => :scss,
+	      :cache => false,
+	      :read_cache => false,
+	      :style => :compressed
+	    }).render
+	    str = StringIO.new(compressed_body)
+	    theme.delete_asset
+	    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[theme.asset_path(asset.digest, for_site_id)].write(str, :acl => 'public-read', :content_type => 'text/css')
+	    else
+	      File.open(File.join(Rails.root, 'public', theme.asset_path(asset.digest, for_site_id)), 'w') { |f| f.write(compressed_body) }
+	    end
+	    self.update_digest(asset.digest)
+	 	rescue Sass::SyntaxError => error
+	 		theme.revert
+	 	end
+  end
+
+  def revert
+ 		Caboose.log("reverting theme")
+  end
+
+  def get_binding(site_id)
+  	binding
+  end
+
+  def delete_asset
+  	return unless digest?
+  end
+
+  def asset_path(digest = self.digest, site_id = 0)
+		"assets/themes/#{asset_name(digest, site_id)}.css"
+	end
+
+	def asset_name(digest = self.digest, site_id = 0)
+		"theme_#{self.id}_site_#{site_id}-#{digest}"
+	end
+
+	def asset_url(site_id = 0)
+		"#{ActionController::Base.asset_host}/#{asset_path(self.digest,site_id)}"
+	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)
+		self.update_column('digest', digest)
+	end
+    
+end

data/app/models/caboose/user.rb

@@ -50,24 +50,22 @@ class Caboose::User < ActiveRecord::Base
     self.email
   end
   
-  def is_allowed(resource, action)          
-    elo = Caboose::Role.logged_out_role(self.site_id)
-    elo_is_allowed = elo.is_allowed(resource, action)    
-    return true if elo_is_allowed
-    return false if !elo_is_allowed && self.is_logged_out_user?     
-    eli = Caboose::Role.logged_in_role(self.site_id)
-    return true if self.id != elo.id && eli.is_allowed(resource, action)
-    for role in roles
-      #Caboose.log("Checking permissions for #{role.name} role")
-      if role.is_allowed(resource, action)
-        #Caboose.log("Role #{role.name} is allowed to view page")
-        return true
-      else
-        #Caboose.log("Role #{role.name} is not allowed to view page")
+  def is_allowed(resource, action)
+    if self.username == 'elo'
+      elo = Caboose::Role.logged_out_role(self.site_id)
+      elo_is_allowed = elo.is_allowed(resource, action)    
+      return true if elo_is_allowed
+      return false if !elo_is_allowed && self.is_logged_out_user?     
+      eli = Caboose::Role.logged_in_role(self.site_id)
+      return true if self.id != elo.id && eli.is_allowed(resource, action)
+    else
+      for role in roles
+        if role.is_allowed(resource, action)
+          return true
+        end
       end
-      #return true if role.is_allowed(resource, action)
     end
-    return false;
+    return false
   end
   
   def self.validate_token(token)

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

@@ -4,7 +4,7 @@ bts = @block_type_source
 <div id='crumbtrail'>
   <a href='/admin'>Admin</a> >
   <a href='/admin/block-types'>Block Types</a> >
-  <a href='/admin/block-types/store'>Store</a> >
+  <a href='/admin/block-type-store'>Store</a> >
   <a href='/admin/block-types/store/sources'>Sources</a>
 </div>
 

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

@@ -16,7 +16,7 @@
       <th>URL</th>      
     </tr>
   <% @block_type_sources.each do |bts| %>
-    <tr onclick="window.location='/admin/block-types/store/sources/<%= bts.id %>/edit';">
+    <tr onclick="window.location='/admin/block-types/store/sources/<%= bts.id %>';">
       <td><%= bts.name  %></td>
       <td><%= bts.url   %></td>    
     </tr>

data/app/views/caboose/block_type_store/admin_details.html.erb

@@ -4,7 +4,7 @@ bts = @block_type_summary
 <div id='crumbtrail'>
   <a href='/admin'>Admin</a> >
   <a href='/admin/block-types'>Block Types</a> >
-  <a href='/admin/block-types/store'>Store</a>
+  <a href='/admin/block-type-store'>Store</a>
 </div>
 
 <h1>Block Type Details</h1>
@@ -13,7 +13,7 @@ bts = @block_type_summary
 <p>Description: <%= bts.description %></p>
 <div id='message'></div> 
 <p>
-<input type='button' value='< Back' onclick="window.location='/admin/block-types/store';" />
+<input type='button' value='< Back' onclick="window.location='/admin/block-type-store';" />
 <input type='button' value='Download from Source' onclick="download_block_type(<%= bts.id %>);" />
 </p>
 

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

@@ -7,15 +7,15 @@
 
 <p><a href='/admin/block-types/store/sources'>Store Sources</a></p>
 
-<form action='/admin/block-types/store' method='get'>
+<form action='/admin/block-type-store' method='get'>
 <table>
 <tr><td>Source:</td><td>
   <select name='block_type_source_id'>
     <option value=''>-- Any Source --</option>
     <% Caboose::BlockTypeSource.reorder(:name).all.each do |bts| %><option value='<%= bts.id %>'><%= bts.name %></option><% end %>
   </select></td></tr>
-<tr><td><p>Name:        </td><td><input type='name_like' value="<%= @pager.params['name_like'] %>" /></td></tr>
-<tr><td><p>Description: </td><td><input type='name_like' value="<%= @pager.params['name_like'] %>" /></td></tr>
+<tr><td><p>Name:        </td><td><input type="text" name='name_like' value="<%= @pager.params['name_like'] %>" /></td></tr>
+<tr><td><p>Description: </td><td><input type="text" name='description_like' value="<%= @pager.params['description_like'] %>" /></td></tr>
 </table>
 <p><input type='submit' value='Search' /></p>
 </form>

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

@@ -75,6 +75,13 @@
 	</div>
 </div>
 
+<% if @site.theme %>
+	<div style="text-align:center;">
+		<a href="#" id="compile-btn" class="caboose-btn">Compile Theme</a>
+		<div id="cmessage"></div>
+	</div>
+<% end %>
+
 <% content_for :caboose_css do %>
 	<style>
 		#font-form {
@@ -248,6 +255,22 @@
 
 <% content_for :caboose_js do %>
 	<script>
+
+		$("#compile-btn").click(function(e) {
+		  $('#cmessage').html("<p class='note loading'>Compiling theme...</p>").fadeIn();
+		  e.preventDefault();
+		  $.ajax({
+		    url: '/admin/themes/<%= @site.theme_id %>/compile',
+		    type: 'get',    
+		    success: function(resp) {
+		      if (resp.error) $('#cmessage').html("<p class='note error'>" + resp.error + "</p>").fadeIn();
+		      if (resp.success && resp.message) {
+		        $('#cmessage').html("<p class='note success'>" + resp.message + "</p>").fadeIn().delay(2000).fadeOut();
+		      }
+		    }
+		  });
+		});
+
 		window.google_fonts = [];
 
 		$(".page-link#next").click(function(event) {

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

@@ -1,5 +1,10 @@
+<% if request && request.url.include?('user_id') %>
+  <%= render :partial => 'caboose/users/admin_header' %>
+<% else %>
+  <h1>Login Logs</h1>
+  <h4><%= request.url %></h4>
+<% end %>
 
-<h1>Login Logs</h1>
 <div id='login_logs'></div>
 
 <% content_for :caboose_js do %>

data/app/views/caboose/login_logs/admin_index_for_user.html.erb

@@ -0,0 +1,36 @@
+<%= render :partial => 'caboose/users/admin_header' %>
+
+<div id='login_logs'></div>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'login_logs',
+    base_url: '/admin/login-logs',
+    allow_add: false,
+    allow_bulk_import: false,
+    allow_bulk_edit: false,
+    allow_bulk_delete: false,
+    allow_duplicate: false,
+    allow_advanced_edit: false,
+    fields: [       
+      { show: true, name: 'date_attempted'  , nice_name: 'Date'       , sort: 'date_attempted' , type: 'text'     , value: function(ll) { return ll.date_attempted }, width: 150, align: 'left', bulk_edit: false, editable: false },
+      { show: true, name: 'ip'              , nice_name: 'IP Address' , sort: 'ip'             , type: 'text'     , value: function(ll) { return ll.ip             }, width: 150, align: 'left', bulk_edit: false, editable: false },
+      { show: true, name: 'success'         , nice_name: 'Success'    , sort: 'success'        , type: 'checkbox' , value: function(ll) { return ll.success ? 'Yes' : 'No'        }, width: 150, align: 'left', bulk_edit: false, editable: false }            
+    ],
+    search_fields: [   
+      { name: 'date_attempted_gte'  , nice_name: 'Date Min'   , type: 'text'     , width: 150, align: 'left' },
+      { name: 'date_attempted_lte'  , nice_name: 'Date Max'   , type: 'text'     , width: 150, align: 'left' },
+      { name: 'ip_like'             , nice_name: 'IP Address' , type: 'text'     , width: 150, align: 'left' }  
+    ],
+    no_models_text: "There are no login logs right now."
+  });        
+});
+
+</script>
+<% end %>

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

@@ -0,0 +1,68 @@
+<h1>Edit Page Template</h1>
+
+<div id='pagetemplate_<%= @template.id %>_title' ></div>
+<div id='pagetemplate_<%= @template.id %>_description' ></div>
+<div id='pagetemplate_<%= @template.id %>_category_id' ></div>
+<div id='pagetemplate_<%= @template.id %>_page_id' ></div>
+<div id='pagetemplate_<%= @template.id %>_sort_order' ></div>
+<div id='pagetemplate_<%= @template.id %>_screenshot' ></div>
+
+<div id="message"></div>
+<br />
+<p>
+<input type='button' value='Back' onclick="window.location='/admin/templates';" >
+<input type='button' value='Delete Page Template' onclick="delete_template(<%= @template.id %>);" >
+</p>
+
+<% content_for :caboose_css do %>
+<style>
+	.mb_container {
+		margin-bottom: 15px;
+		clear: both;
+	}
+</style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type='text/javascript'>
+function delete_template(rep_id, confirm) 
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append("Are you sure you want to delete the template? ")
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_template(rep_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));      
+    $('#message').empty().append(p);
+    return;
+  }  
+  $('#message').empty().html($('<p/>').addClass('loading').html("Deleting template..."));
+  $.ajax({
+    url: '/admin/templates/' + rep_id,
+    type: 'delete',    
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'PageTemplate',
+    id: <%= @template.id %>,
+    update_url: '/admin/templates/<%= @template.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'title'                 , nice_name: 'Title'                , type: 'text'       , value: <%= raw Caboose.json(@template.title           ) %> , width: 500 },
+      { name: 'description'                 , nice_name: 'Description'                , type: 'textarea'       , value: <%= raw Caboose.json(@template.description           ) %> , width: 500, height: 250 },
+      { name: 'page_id'                 , nice_name: 'Reference Page ID'                , type: 'text'       , value: <%= raw Caboose.json(@template.page_id           ) %> , width: 500 },
+      { name: 'category_id'                 , nice_name: 'Category'                , type: 'select'       , value: <%= raw Caboose.json(@template.category_id           ) %>, options: <%== Caboose::PageTemplateCategory.all_options(true) %> , width: 500 },
+      { name: 'sort_order'                 , nice_name: 'Sort Order'                , type: 'text'       , value: <%= raw Caboose.json(@template.sort_order           ) %> , width: 500 },
+      { name: 'screenshot'  , nice_name: 'Screenshot (800x800)'   , type: 'image'  , value: <%= raw Caboose.json(@template.screenshot ? @template.screenshot.url(:small) : 'https://cabooseit.s3.amazonaws.com/assets/shared/template.png') %>, width: 300, update_url: '/admin/templates/<%= @template.id %>/screenshot' }
+    ]
+  });
+});
+
+</script>
+<% end %>

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

@@ -0,0 +1,24 @@
+<h1>Page Templates</h1>
+
+<div class="page-templates-wrapper">
+	<% @categories.each do |cat| %>
+		<div class="category clearfix">
+			<h3><%= cat.title %></h3>
+			<p class="description"><%= cat.description %></p>
+			<div class="cat-templates">
+				<% cat.page_templates.order(:sort_order).each do |tem| %>
+					<a href="/admin/templates/<%= tem.id %>" class="template">
+						<img src="<%= tem.screenshot.url(:small) %>" width="200" height="200" alt="<%= tem.title %>" srcset="<%= tem.screenshot.url(:medium) %> 2x" />
+						<div class="text">
+							<span class="title"><%= tem.title.blank? ? 'New Template' : tem.title %></span>
+							<% if !tem.description.blank? %><span class="desc"><%= tem.description %></span><% end %>
+						</div>
+					</a>
+				<% end %>
+			</div>
+			<div class="btn-holder">
+				<a href="/admin/templates/new?category=<%= cat.id %>" class="caboose-btn-white">New Page Template</a>
+			</div>
+		</div>
+	<% end %>
+</div>