caboose-cms 0.9.228 → 0.9.229

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

@@ -1,9 +1,10 @@
+<% is_cache = defined?(is_cache) ? is_cache : false %>
 <%== 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 %>
+		<% js_yield = is_cache ? "js_#{block.id}".to_sym : :js %>
+    <% content_for js_yield do %>
 			<% begin %>
 				<% erb = ERB.new(js).result(self.instance_eval { binding }) %>
 				<%== erb %>
@@ -16,7 +17,8 @@
 <% 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 %>
+		<% css_yield = is_cache ? "css_#{block.id}".to_sym : :css %>
+		<% content_for css_yield do %>
 			<% begin %>
 				<% erb = ERB.new(css).result(self.instance_eval { binding }) %>
 				<%== erb %>
@@ -25,4 +27,7 @@
 			<% end %>
 		<% end %>
 	<% end %>
-<% end %>
+<% end %>
+<% block.cached_js = yield( "js_#{block.id}".to_sym ) if is_cache %>
+<% block.cached_css = yield( "css_#{block.id}".to_sym ) if is_cache %>
+<% block.save if is_cache %>

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

@@ -0,0 +1,65 @@
+<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

@@ -0,0 +1,63 @@
+<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

@@ -0,0 +1,42 @@
+<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_index.html.erb

@@ -1,3 +1,5 @@
+<h1>Fonts</h1>
+
 <% if @site.use_fonts %>
 
 <div class="constrain clearfix">
@@ -66,12 +68,23 @@
 		</div>
 		<div class="unit1of3">
 			<a href="#" class="set-font caboose-btn" id="3" data-name="button-font">Set as Button Font</a>
+			<% if @site.theme %>
+			<br />
+			<a href="#" class="set-font caboose-btn" id="7" data-name="custom1-font">Set as Custom1 Font</a>
+			<a href="#" class="set-font caboose-btn" id="8" data-name="custom2-font">Set as Custom2 Font</a>
+			<a href="#" class="set-font caboose-btn" id="9" data-name="custom3-font">Set as Custom3 Font</a>
+			<% end %>
 		</div>
 	</div>
 	<div class="final-box">
 		<h2 id="font1-preview">Your Selected Fonts - <span class="family"><%= @hf.family %></span> <span class="variant"><%= @hf.variant %></span></h2>
 		<p id="font2-preview"><span class="family"><%= @bf.family %></span> <span class="variant"><%= @bf.variant %></span> - Lorem ipsum dolor sit amet, consectetur <strong id="font4-preview">this is bold text</strong>. Dicta, at voluptates assumenda hic <span class="bold-italic" id="font6-preview">this is bold italic text</span> soluta. Beatae illo explicabo, atque deserunt, <em id="font5-preview">this is italic text</em> magni necessitatibus, a eveniet hic. Culpa debitis corporis saepe eum alias eius cum eaque ipsam ducimus sunt, nobis ab quia vitae hic laudantium unde pariatur sapiente numquam.</p>
-		<a id="font3-preview" class="caboose-btn" href="#" style="margin-top:20px;"><span class="family"><%= @btn.family %></span> <span class="variant"><%= @btn.variant %></span></a>
+		<a id="font3-preview" class="caboose-btn" href="#" style="margin:20px 0;"><span class="family"><%= @btn.family %></span> <span class="variant"><%= @btn.variant %></span></a>
+		<% if @site.theme %>
+		<p id="font7-preview">This is the Custom1 Font you have selected. <span class="ff">font-family: "custom1-font";</span></p>
+		<p id="font8-preview">This is the Custom2 Font you have selected. <span class="ff">font-family: "custom2-font";</span></p>
+		<p style="margin-bottom:0;" id="font9-preview">This is the Custom3 Font you have selected. <span class="ff">font-family: "custom3-font";</span></p>
+		<% end %>
 	</div>
 </div>
 
@@ -84,6 +97,9 @@
 
 <% content_for :caboose_css do %>
 	<style>
+		.ff {
+			font-family:monospace;font-size:13px;display:inline-block;color:gray;float: right;
+		}
 		#font-form {
 			margin-top: 20px;
 		}
@@ -208,6 +224,18 @@
 			font-family: "button-font";
 			src: url('<%= @btn.url %>') format('truetype');
 		}
+		@font-face {
+			font-family: "custom1-font";
+			src: url('<%= @custom1.url %>') format('truetype');
+		}
+		@font-face {
+			font-family: "custom2-font";
+			src: url('<%= @custom2.url %>') format('truetype');
+		}
+		@font-face {
+			font-family: "custom3-font";
+			src: url('<%= @custom3.url %>') format('truetype');
+		}
 		#font1-preview {
 			font-family: "heading-font";
 			font-style: normal;
@@ -223,6 +251,21 @@
 			font-style: normal;
 			font-weight: normal;
 		}
+		#font7-preview {
+			font-family: "custom1-font";
+			font-style: normal;
+			font-weight: normal;
+		}
+		#font8-preview {
+			font-family: "custom2-font";
+			font-style: normal;
+			font-weight: normal;
+		}
+		#font9-preview {
+			font-family: "custom3-font";
+			font-style: normal;
+			font-weight: normal;
+		}
 		.clearfix::after { 
 		   content: "."; 
 		   visibility: hidden; 
@@ -309,7 +352,7 @@
 			var variant;
 			for (i = min; i < max; i++) {
 				font = window.google_fonts[i];
-				variant = font.variants[0];
+				variant = font ? font.variants[0] : null;
 				load_css(i, variant);
 				var index = (i % 10) + 1;
 		//		console.log("family: " + font.family, ", index: " + index);
@@ -345,8 +388,8 @@
 				var cssId = font_id + "_" + variant;
 				if (!document.getElementById(cssId)) {
 		//			console.dir(font);
-					var weight = variant.replace("italic","").replace("regular","normal");
-					var style = variant.indexOf("italic") >= 0 ? "italic" : "normal";
+					var weight = variant ? variant.replace("italic","").replace("regular","normal") : "N/A";
+					var style = variant ? (variant.indexOf("italic") >= 0 ? "italic" : "normal") : "N/A";
 					weight = weight == "" ? "normal" : weight;
 					var css = document.createTextNode("@font-face {font-family:'" + font.family + "';src:url('" + font.files[variant] + "') format('truetype');font-weight:" + weight + ";font-style:" + style + ";}");
 					var style  = document.createElement('style');
@@ -383,13 +426,13 @@
 		//	console.dir(font);
 			$(".font-preview").css("font-family",font.family);
 			$(".font-preview .family").text(font.family);
-			if ( variant.indexOf("italic") >= 0 ) {
+			if ( variant && variant.indexOf("italic") >= 0 ) {
 				$(".font-preview").css("font-style","italic");
 			}
 			else {
 				$(".font-preview").css("font-style","normal");
 			}
-			var weight = variant.match(/\d+/);
+			var weight = variant ? variant.match(/\d+/) : 400;
 			if ( weight && weight != "" ) {
 				$(".font-preview").css("font-weight",weight);
 			}
@@ -406,6 +449,7 @@
 			  data: {
 			  	family: family,
 			  	variant: variant,
+			//  	variant_id: variant_id,
 			  	url: url,
 			  	name: name
 			  },
@@ -423,19 +467,20 @@
 		$(document).ready(function() {
 
 			$.ajax({
-			  url: 'https://www.googleapis.com/webfonts/v1/webfonts?sort=popularity&key=AIzaSyAjSs-Jq6hpuT35RG9wD6LuqaDFzYDCOPk',
+			  url: 'https://www.googleapis.com/webfonts/v1/webfonts?sort=popularity&key=AIzaSyAv6j9aPfc18FwIoTixYhvq1kr8vWT7H2g',
 			  type: 'get',
 			  success: function(resp) {
 			  	if ( resp.items ) {
-	//		  		console.dir(resp.items);
+		//	  		console.dir(resp.items);
 			  <% fonts = Caboose::FontFamily.all %>
 			  <% fonts.each do |f| %>
-			  	<% variants = f.font_variants.order(:sort_order).all %>
+			  	<% next if f.font_variants.count == 0 %>
+			  	<% variants = f.font_variants.where("weight is not null").order(:sort_order).all %>
 			  	resp.items.unshift({
 			  		category: "sans-serif",
 			  		family: "<%= f.name %>",
 			  		files: { <% variants.each do |v| %>
-			  			<%= v.style ? (v.weight == 'regular' && v.style == 'italic' ? 'italic' : (v.style + v.weight)) : v.weight %>: "<%= v.ttf_url %>",
+			  			<%= v.style ? (v.weight == 'regular' && v.style == 'italic' ? 'italic' : (v.style + v.weight)) : v.weight %>: "<%= v.ttf_file && !v.ttf_file.url.include?('missing') ? v.ttf_file.url : v.ttf_url %>",
 			  		<% end %> },
 			  		variants: [ <% variants.each_with_index do |v,i| %>
 			  			"<%= v.style ? (v.weight == 'regular' && v.style == 'italic' ? 'italic' : (v.style + v.weight)) : v.weight %>",

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

@@ -0,0 +1,84 @@
+
+<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/invoices_mailer/customer_status_updated.html.erb

@@ -5,16 +5,15 @@ logo = logo.gsub('//','https://') if !logo.nil?
 
 <p><img src='<%= logo %>' /></p>
 
-<h1>Your invoice has been updated</h1>
+<h1>Your order has been updated</h1>
 
-<h2>Invoice Details</h2>
+<h2>Order Details</h2>
 
 <p>Invoice #<%= @invoice.invoice_number %></p>
 <p>Status:  <%= @invoice.status %></p>
 
 <table border='1' style='border-collapse: collapse;'>
   <tr>
-    <th>Package</th>
     <th>Line Item</th>
     <th>Unit Price</th>
     <th>Quantity</th>
@@ -25,13 +24,6 @@ logo = logo.gsub('//','https://') if !logo.nil?
       <% v = li.variant %>
       <% p = v.product %>
       <tr>
-        <% if i == 0 %>
-          <td rowspan="<%= op.line_items.count %>">
-            <div><%= op.shipping_method.service_name %></div>
-            <div><%= op.status %></div>
-            <% if op.tracking_number %><div><%= op.tracking_number %></div><% end %>
-          </td>
-        <% end %>
         <td>
           <%= p.title %>
           <% if li.is_gift %>
@@ -53,8 +45,7 @@ logo = logo.gsub('//','https://') if !logo.nil?
     <% next if li.invoice_package_id %>
     <% v = li.variant %>
     <% p = v.product %>
-    <tr>
-      <td>Not assigned to a package</td>                
+    <tr>             
       <td><%= p.title %></td></td>
       <td align='right'><%= number_to_currency(li.unit_price) %></td>
       <td align='right'><%= li.quantity %></td>
@@ -78,7 +69,7 @@ logo = logo.gsub('//','https://') if !logo.nil?
   <tr><td colspan="4" align='right'>Total:     </td><td align='right'><%= number_to_currency(@invoice.total) %></td></tr>
 </table>
 
-<% if @invoice.shipping_address %>
+<% if @invoice.shipping_address && !@invoice.shipping_address.address1.blank? %>
   <% sa = @invoice.shipping_address %>
   <h2>Shipping Address</h2>
   <p>
@@ -89,7 +80,7 @@ logo = logo.gsub('//','https://') if !logo.nil?
   </p>
 <% end %>
 
-<% if @invoice.billing_address %>
+<% if @invoice.billing_address && !@invoice.billing_address.address1.blank? %>
   <% ba = @invoice.billing_address %>
   <h2>Billing Address</h2>
   <p>