caboose-cms 0.9.229 → 1.0.1

data/app/controllers/caboose/change_logs_controller.rb

@@ -1,13 +0,0 @@
-module Caboose
-  class ChangeLogsController < Caboose::ApplicationController  
-
-    # @route GET /admin/logs
-    def admin_index
-      return unless user_is_allowed('logs', 'view')
-      mc = "Media Category"
-      @logs = ChangeLog.where(:site_id => @site.id).where('(is_field = false and (action = ? OR action = ?)) OR (action != ? and action != ?) OR (is_field = true AND description ILIKE (?))','added','deleted','added','deleted',"%#{mc}%").order('timestamp desc, id desc').limit(500)
-      render :layout => 'caboose/admin'
-    end
-
-  end
-end

data/app/models/caboose/change_log.rb

@@ -1,97 +0,0 @@
-module Caboose
-  class ChangeLog < ActiveRecord::Base
-    self.table_name = 'change_logs'
-    
-    belongs_to :site
-    belongs_to :page
-    belongs_to :post
-    belongs_to :block
-    belongs_to :user
-    belongs_to :media
-
-    attr_accessible :id,
-      :site_id,
-      :page_id,
-      :post_id,
-      :block_id,
-      :block_parent_id,
-      :media_id,
-      :user_id,
-      :is_field,
-      :description,
-      :action,
-      :timestamp,
-      :old_value,
-      :new_value,
-      :old_parent_id,
-      :new_parent_id,
-      :old_sort_order,
-      :new_sort_order
-
-
-    def describe_old_position
-    	b = self.block
-    	par = self.old_parent_id.blank? ? false : Caboose::Block.where(:id => self.old_parent_id).first
-    	desc = ""
-      pos = par && par.block_type && par.block_type.name == 'flex_grid_unit' ? par.sort_order + 1 : nil
-      desc += par.block_type.description + " #{pos} -> " if par && par.block_type
-      desc += "position #{self.old_sort_order}"
-      return desc
-    end
-
-    def describe_new_position
-    	b = self.block
-    	par = self.new_parent_id.blank? ? Caboose::Block.where(:id => self.old_parent_id).first : Caboose::Block.where(:id => self.new_parent_id).first
-    	desc = ""
-      pos = par && par.block_type && par.block_type.name == 'flex_grid_unit' ? par.sort_order + 1 : nil
-      desc += par.block_type.description + " #{pos} -> " if par && par.block_type
-      desc += "position #{self.new_sort_order}"
-      return desc
-    end
-
-    def describe_action
-      return 'added' if self.action == 'added'
-    	if !self.old_value.nil? && !self.new_value.nil? && self.old_value != self.new_value
-    		return 'edited'
-    	elsif !self.old_sort_order.nil? && !self.new_sort_order.nil? && self.old_sort_order != self.new_sort_order
-    		return 'moved'
-    	elsif !self.old_parent_id.nil? && !self.new_parent_id.nil? && self.old_parent_id != self.new_parent_id
-    		return 'moved'
-    	else
-    		return self.action
-    	end
-    end
-
-    def describe_old
-    	if self.describe_action == 'moved'
-    		return self.describe_old_position
-    	elsif self.describe_action == 'edited'
-    		return self.old_value == 'EMPTY' ? '' : self.old_value
-    	elsif self.describe_action == 'deleted'
-        ov = self.old_value == 'EMPTY' ? '' : self.old_value
-        opts = ['Title','Text']
-        desc = Caboose::ChangeLog.where("block_parent_id is not null").where(:block_parent_id => self.block_id).where(:description => opts).first
-    		return desc ? desc.old_value : ov
-    	end
-    end
-
-    def describe_new
-      block = Caboose::Block.where(:id => self.block_id).first if !self.block_id.blank?
-    	if self.describe_action == 'moved'
-    		return self.describe_new_position
-    	elsif self.describe_action == 'edited'
-    		return self.new_value == 'EMPTY' ? '' : self.new_value
-    	elsif self.describe_action == 'added'
-        nv = self.new_value.blank? ? (self.old_value == 'EMPTY' ? '' : self.old_value) : (self.new_value == 'EMPTY' ? '' : self.new_value)
-        if block
-          nv = block.cv(false,'text') if block.child('text')
-          nv = block.cv(false,'title') if block.child('title')
-          nv = Caboose::Media.title_for_id(block.child('image_src').media_id) if block.child('image_src') && block.child('image_src').media_id && !block.child('image_src').media_id.blank?
-          nv = block.cv(false,'heading_text') if block.child('heading_text')
-        end
-    		return nv
-    	end
-    end
-
-  end
-end

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

@@ -1,28 +0,0 @@
-<%== ERB.new(render_function).result(self.instance_eval { binding }) %>
-
-<% if caboose_js && caboose_js.length > 1 %>
-	<% caboose_js.to_a.each_with_index do |js, ind| %>
-		<% next if ind == 0 %>
-		<% content_for :js do %>
-			<% begin %>
-				<% block.cached_js = ERB.new(js).result(self.instance_eval { binding }) %>
-				<% block.save %>
-			<% rescue %>
-				<% Caboose.log("JS ERROR for block #{block.id}") %>
-			<% end %>
-		<% end %>
-	<% end %>
-<% end %>
-<% if caboose_css && caboose_css.length > 1 %>
-	<% caboose_css.to_a.each_with_index do |css, ind| %>
-		<% next if ind == 0 %>
-		<% content_for :css do %>
-			<% begin %>
-				<% block.cached_css = ERB.new(css).result(self.instance_eval { binding }) %>
-				<% block.save %>
-			<% rescue %>
-				<% Caboose.log("CSS ERROR for block #{block.id}") %>
-			<% end %>
-		<% end %>
-	<% end %>
-<% end %>

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

@@ -1,65 +0,0 @@
-<h1>Recent Changes</h1>
-
-<div style="padding-right:30px;">
-	<table cellpadding="0" cellspacing="0">
-<thead>
-	<tr>
-		<th>User</th>
-		<th>Resource</th>
-		<th>Title</th>
-		<th>Date</th>
-		<th>Action</th>
-		<th>Field</th>
-		<th>Old Value</th>
-		<th>New Value</th>
-	</tr>
-</thead>
-<% @logs.each do |log| %>
-	<%
-		res = log.page_id ? Caboose::Page.where(:id => log.page_id).first : (log.post_id ? Caboose::Post.where(:id => log.post_id).first : (log.media_id ? Caboose::Media.where(:id => log.media_id).first : nil))
-		res_type = log.page_id ? "Page" : (log.post_id ? "Post" : (log.description.include?('Media Category') && log.media_id ? ('Media Category') : (log.media_id ? "Media" : nil)))
-		res_title = res ? (log.page_id ? res.title : (log.post_id ? res.title : (log.description.include?('Media Category') && log.media_id ? (log.description.gsub('Media Category: ','')) : (log.media_id ? Caboose::Media.title_for_id(res.id) : "N/A")))) : log.description.gsub("Media Category: ","")
-	%>
-	<tr>
-		<td><%= log.user ? log.user.username : "N/A"  %></td>
-		<td><%= res_type %></td>
-		<td><%= res_title %></td>
-		<td><%= log.timestamp.in_time_zone('Central Time (US & Canada)').strftime('%-m/%-d/%y, %l:%M%P') %></td>
-		<td><%= log.describe_action %></td>
-		<td><%= log.description.blank? ? '' : log.description.gsub("Media Category: ",'') %></td>
-		<td><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_old.blank? && log.describe_old.include?('</')) ? "<pre>" : "" %><%= log.describe_old %><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_old.blank? && log.describe_old.include?('</')) ? "</pre>" : "" %></td>
-		<td><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_new.blank? && log.describe_new.include?('</')) ? "<pre>" : "" %><%= log.describe_new %><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_new.blank? && log.describe_new.include?('</')) ? "</pre>" : "" %></td>
-	</tr>
-<% end %>
-</table>
-</div>
-
-
-<% content_for :caboose_css do %>
-	<style>
-		table {
-			width: 100%;
-		}
-		table tr {
-
-		}
-		table td, table th {
-			font-family: "Roboto";
-			font-weight: 300;
-			font-size: 13px;
-			padding: 6px 8px 6px 4px;
-			text-align: left;
-			max-width: 200px;
-			border-bottom: 1px solid #eaeaea;
-		}
-		td pre {
-			overflow: hidden;
-    	white-space: pre-line;
-    	font-size: 12px;
-    	font-family: monospace;
-		}
-		table th {
-			font-weight: bold;
-		}
-	</style>
-<% end %>

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

@@ -1,63 +0,0 @@
-<h1>Edit Font Family</h1>
-
-<h2><%= @ff.name %></h2>
-<h4>Variants</h4>
-
-<ul>
-	<% @ff.font_variants.order(:sort_order).each do |var| %>
-		<li><a href="/admin/font-variants/<%= var.id %>"><%= var.variant %></a></li>
-	<% end %>
-	<li style="margin-top:15px;"><a href="#" onclick="new_variant();return false;">New Variant</a></li>
-</ul>
-
-<div id="new-variant">
-	<h5>Add New Font Variant</h5>
-	<form method="POST" action="/admin/font-variants">
-		<input type="hidden" name="family_id" value="<%= @ff.id %>" />
-		<input style="width:200px;" id="var" type="text" name="variant" placeholder="Variant Name" />
-		<a href="#" id="submit-variant" class="caboose-btn">Add</a>
-		<div style="margin-top:5px;" id="message"></div>
-	</form>
-</div>
-
-
-<br /><br />
-<a href="/admin/font-families" class="caboose-btn">Back</a>
-
-<% content_for :caboose_js do %>
-<script>
-	function new_variant() {
-		$("#new-variant").slideToggle();
-	}
-	$("#submit-variant").click(function(e) {
-		e.preventDefault();
-		$.ajax({
-	    url: '/admin/font-variants',
-	    type: 'post',
-	    data: {
-	    	family_id: <%= @ff.id %>,
-	    	variant: $("#var").val()
-	    },
-	    success: function(resp) {
-	      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
-	      if (resp.redirect) window.location = resp.redirect;
-	    }
-	  });
-	});
-</script>
-<% end %>
-
-<% content_for :caboose_css do %>
-<style>
-	#new-variant {
-		padding: 15px;
-		border: 1px solid gray;
-		width: 400px;
-		background: #dfffd2;
-		display: none;
-	}
-	#new-variant h5 {
-		margin: 0 0 8px 0;
-	}
-</style>
-<% end %>

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

@@ -1,42 +0,0 @@
-<h1>Font Families</h1>
-
-<div id='fonts'></div>
-
-<% content_for :caboose_css do %>
-<style>
-  table.data {
-    margin-right: 20px;
-  }
-</style>
-<% end %>
-
-<% 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: 'fonts',
-    base_url: '/admin/font-families',
-    allow_bulk_edit: false,
-    allow_bulk_import: false,
-    allow_duplicate: false,
-    allow_bulk_delete: false,
-    after_add: 'redirect',      
-    fields: [
-      { name: 'name'        , sort: 'name'              , show: true , editable: false, bulk_edit: false, nice_name: 'Name'        , type: 'text' , value: function(site) { return site.name;        }, width: 400 }
-    ],
-    search_fields: [
-      { name: 'name_like', nice_name: 'Name', type: 'text', width: 400 }      
-    ],
-    new_model_text: 'New Font Familiy',
-    new_model_fields: [
-      { name: 'name', nice_name: 'Name', type: 'text', width: 400 }                      
-    ],    
-  });
-});
-    
-</script>
-<% end %>

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

@@ -1,84 +0,0 @@
-
-<h1>Edit Font Variant</h1>
-
-<h4><%= @variant.font_family.name %></h4>
-<p><div id='fontvariant_<%= @variant.id %>_variant'           ></div></p>
-<p><div id='fontvariant_<%= @variant.id %>_style'           ></div></p> 
-<p><div id='fontvariant_<%= @variant.id %>_weight'           ></div></p> 
-<p><div id='fontvariant_<%= @variant.id %>_sort_order'           ></div></p> 
-<p><div id='fontvariant_<%= @variant.id %>_ttf_url'           ></div></p>
-
-<div class="file-wrapper">
-  <div id='fontvariant_<%= @variant.id %>_ttf_file'           ></div>
-  <p class="current">Current file: <%= @variant.ttf_file_file_name.blank? ? "None" : @variant.ttf_file_file_name %></p>
-</div>
-<div class="file-wrapper">
-  <div id='fontvariant_<%= @variant.id %>_woff_file'           ></div>
-  <p class="current">Current file: <%= @variant.woff_file_file_name.blank? ? "None" : @variant.woff_file_file_name %></p>
-</div>
-
-
-<div id='message'></div>
-
-<a class="caboose-btn" href="/admin/font-families/<%= @variant.font_family_id %>">Back</a>
-
-
-<% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/model/all" %>
-<script type="text/javascript">
-
-$(document).ready(function() {
-  m = new ModelBinder({
-    name: 'FontVariant',
-    id: <%= @variant.id %>,
-    update_url: '/admin/font-variants/<%= @variant.id %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [
-      { name: 'variant'    , nice_name: 'Name'      , type: 'text'     , value: <%= raw Caboose.json(@variant.variant  ) %>, width: 500 },
-      { name: 'style'    , nice_name: 'Style'      , type: 'text'     , value: <%= raw Caboose.json(@variant.style  ) %>, width: 500 },
-      { name: 'weight'    , nice_name: 'Weight'      , type: 'text'     , value: <%= raw Caboose.json(@variant.weight  ) %>, width: 500 },
-      { name: 'sort_order'    , nice_name: 'Sort Order'      , type: 'text'     , value: <%= raw Caboose.json(@variant.sort_order  ) %>, width: 500 },
-      { name: 'ttf_url'    , nice_name: 'TTF URL (deprecated)'      , type: 'text'     , value: <%= raw Caboose.json(@variant.ttf_url  ) %>, width: 800 },
-      { name: 'ttf_file'  , nice_name: 'TTF File'   , type: 'file'  , value: <%= raw Caboose.json(@variant.ttf_file ? @variant.ttf_file.url : 'No File') %>, width: 800, update_url: '/admin/font-variants/<%= @variant.id %>/ttf-file' },
-      { name: 'woff_file'  , nice_name: 'WOFF File'   , type: 'file'  , value: <%= raw Caboose.json(@variant.woff_file ? @variant.woff_file.url : 'No File') %>, width: 800, update_url: '/admin/font-variants/<%= @variant.id %>/woff-file' }
-    ]
-  });  
-});
-
-</script>
-<% end %>
-
-
-<% content_for :caboose_css do %>
-  <style>
-    .file-wrapper {
-      position: relative;
-      right: 9px;
-    }
-    .file-wrapper::after {
-      content: ".";
-      visibility: hidden;
-      display: block;
-      height: 0;
-      clear: both;
-    }
-    .file-wrapper .mb_placeholder span {
-      font-size: 15px;
-      position: relative;
-      bottom: 7px;
-    }
-    .file-wrapper .mb_container {
-      display: inline-block;
-      width: auto;
-    }
-    .current {
-      color: #0357FF;
-      font-size: 13px;
-      padding-left: 10px;
-      position: relative;
-      bottom: 33px;
-      margin-top: 0;
-      display: inline-block;
-    }
-  </style>
-<% end %>

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

@@ -1,56 +0,0 @@
-<%= render :partial => 'caboose/pages/admin_header' %>
-
-<div style="padding-right:30px;">
-	<table cellpadding="0" cellspacing="0">
-<thead>
-	<tr>
-		<th>User</th>
-		<th>Date</th>
-		<th>Action</th>
-		<th>Field</th>
-		<th>Old Value</th>
-		<th>New Value</th>
-	</tr>
-</thead>
-<% @logs.each do |log| %>
-	<tr>
-		<td><%= log.user.username %></td>
-		<td><%= log.timestamp.in_time_zone('Central Time (US & Canada)').strftime('%-m/%-d/%y, %l:%M%P') %></td>
-		<td><%= log.describe_action %></td>
-		<td><%= log.description %></td>
-		<td><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_old.blank? && log.describe_old.include?('</')) ? "<pre>" : "" %><%= log.describe_old %><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_old.blank? && log.describe_old.include?('</')) ? "</pre>" : "" %></td>
-		<td><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_new.blank? && log.describe_new.include?('</')) ? "<pre>" : "" %><%= log.describe_new %><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_new.blank? && log.describe_new.include?('</')) ? "</pre>" : "" %></td>
-	</tr>
-<% end %>
-</table>
-</div>
-
-
-<% content_for :caboose_css do %>
-	<style>
-		table {
-			width: 100%;
-		}
-		table tr {
-
-		}
-		table td, table th {
-			font-family: "Roboto";
-			font-weight: 300;
-			font-size: 13px;
-			padding: 6px 8px 6px 4px;
-			text-align: left;
-			max-width: 200px;
-			border-bottom: 1px solid #eaeaea;
-		}
-		td pre {
-			overflow: hidden;
-    	white-space: pre-line;
-    	font-size: 12px;
-    	font-family: monospace;
-		}
-		table th {
-			font-weight: bold;
-		}
-	</style>
-<% end %>