caboose-cms 0.9.229 → 1.0.1

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

@@ -0,0 +1,6 @@
+<link rel="apple-touch-icon"      sizes="180x180" href="<%= cloudfront_asset_path 'admin/images/icons/apple-touch-icon.png' %>">
+<link rel="icon" type="image/png" sizes="32x32"   href="<%= cloudfront_asset_path 'admin/images/icons/favicon-32x32.png' %>" >
+<link rel="icon" type="image/png" sizes="16x16"   href="<%= cloudfront_asset_path 'admin/images/icons/favicon-16x16.png' %>" >
+<link rel="manifest"                              href="<%= cloudfront_asset_path 'admin/images/icons/manifest.json' %>">
+<link rel="mask-icon"                             href="<%= cloudfront_asset_path 'admin/images/icons/safari-pinned-tab.svg' %>" color="#2475A5">
+<meta name="theme-color" content="#2475A5">

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

@@ -0,0 +1,22 @@
+<div class="delay-show">
+  <div id="mmenu">
+    <ul>
+      <li class='home'><a href="/" title="Home"><span class='icon'></span><span class='text'>Home</span></a></li>
+      <% @nav = Caboose.plugin_hook('admin_nav', [], @user, @page, @site) %>
+      <% @nav.each do |item| %>
+        <% href = item['href'] || '#' %>
+        <li class="<%= item['id'] %><% if @request.fullpath.starts_with?(href) %> selected <% end %>">
+          <a href='<%= href %>'><span class='icon'></span><span class='text'><%= item['text'] %></span></a>                  
+          <% if item['children'] && item['children'].count > 0 %>
+            <ul class="submenu">
+              <% item['children'].each do |item2| %>
+                <% href2 = item2['href'] || '#' %>
+                <li><a href='<%= href2 %>'><span><%= item2['text'] %></span></a></li>
+              <% end %>
+            </ul>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

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

@@ -0,0 +1,74 @@
+<div class="post-details-wrapper" id="block_<%= block.id %>">
+	<div class="constrain">
+		<div class="grid-row">
+			<div class="unit3of4 main-post-content">
+				<% if post.image && !post.image.url.blank? && !post.image.url.include?('placehold') %>
+					<div class="post-image-banner" style="background-image:url(<%= post.image.url(:huge) %>);"></div>
+				<% end %>
+				<div class="post-text">
+					<div class="grid-row">
+						<div class="unit1of2 left">
+							<h2 class="post-title"><%= post.title %></h2>
+							<% if !post.subtitle.blank? %><h3 class="post-subtitle"><%= post.subtitle %></h3><% end %>
+						</div>
+						<div class="unit1of2 right">
+							<% if !post.author.blank? %><h4 class="post-author">by <%= post.author %></h4><% end %>
+							<h6 class="post-date"><%= post.created_at.in_time_zone(logged_in_user.timezone).strftime("%B %-d, %Y, %l:%M%P") %></h6>
+						</div>
+					</div>
+					<div class='share-icons clearfix'>
+						<div class="share-buttons">
+							<% url = "http://" + site.primary_domain.domain + post.uri %>
+							<a href="https://www.facebook.com/sharer/sharer.php?u=<%= url %>" target="_blank" title="Share on Facebook" class="holder" id="facebook" onclick="window.open(this.href, 'mywin',
+	'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"><span class="icon-facebook white"></span></a>
+							<a href="https://twitter.com/home?status=<%= post.title + ' @ ' + url %>" title="Share on Twitter" target="_blank" class="holder" id="twitter" onclick="window.open(this.href, 'mywin',
+	'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"><span class="icon-twitter white"></span></a>
+							<a href="https://plus.google.com/share?url=<%= url %>" title="Share on Google +" target="_blank" class="holder" id="google-plus" onclick="window.open(this.href, 'mywin',
+	'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"><span class="icon-google-plus white"></span></a>
+							<a href="mailto:?subject=<%= post.title %>&amp;body=<%= url %>" title="Share by Email" class="holder" id="email"><span class="icon-mail white"></span></a>
+						</div>
+	        </div>
+					<div class="post-body richtext">
+						<% if block.children.count == 0 && editing %>
+							<p style="padding:8px;border:1px dashed gray;text-align:center;cursor:pointer;">This post has no content yet. To add content, click here and then "Add a child block!"</p>
+						<% end %>
+						<% block.children.each do |b| %>
+			        <%= raw block.render(b, local_assigns) %>
+			      <% end %>
+					</div>
+				</div>
+			</div>
+			<div class="unit1of4 sidebar">
+				<% news = Caboose::Post.where(:site_id => site.id, :published => true).where("id != ?",post.id).order("created_at DESC").take(5) %>
+				<% if news.count > 0 %>
+					<section class="recent-news-wrapper">
+						<h2 class="recent-news-title">More News</h2>
+						<ul class="recent-news-list">
+							<% news.each do |n| %>
+								<% cats = n.post_categories.collect { |c| c.name } %>
+								<li class="clearfix news-item">
+									<div class="left">
+										<% if cats.length > 0 %><h6 class="news-category"><%= cats.join(", ") %></h6><% end %>
+										<a href="<%= n.uri %>" class="news-title"><%= n.title %></a>
+										<h6 class="news-date"><%= (n.created_at - 6.hours).strftime("%B %-d, %Y") %></h6>
+									</div>
+									<div class="right">
+										<% if n.image && !n.image.url.blank? && !n.image.url.include?('placehold') %>
+											<a href="<%= n.uri %>" class="image-holder" style="background-image:url(<%= n.image.url(:thumb) %>);"></a>
+										<% end %>
+									</div>
+								</li>
+							<% end %>
+						</ul>
+					</section>
+				<% else %>
+					<section class="recent-news-wrapper none">
+						<h2 class="recent-news-title">More News</h2>
+						<p>Sorry, no news yet.<br />
+						Check back later!</p>
+					</section>	
+				<% end %>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -7,41 +7,36 @@ width = 200
 %>
 
 <h1>Admin</h1>
-<div class="admin-index-menu" id="admin-list">
-
-  <div class="admin-intro">
-    <h4>Welcome to Caboose</h4>
-    <p>For assistance, please email <a href="mailto:support@nine.is">support@nine.is</a>.</p>
-  </div>
-<ul>
-  <% i = 0 %>
-  <% @nav.each do |item| %>
-    <% id = item['id'].nil? ? i.to_s : item['id'] %>
-    <% href = item['href'].nil? ? '#' : item['href'] %>
-    <% modal = item['modal'].nil? ? false : item['modal'] %>
-    <li id='nav_item_<%= id %>'>
-      <% if href != "#" %><a href='<%= href %>'<%= raw (modal ? " rel='modal'" : "") %>><% end %>
-        <span class='icon'></span><span class='text'><%= item['text'] %></span>
-      <% if href != "#" %></a><% end %>
-    <% if (!item['children'].nil? && item['children'].count > 0) %>
-      <ul>
-        <% item['children'].each do |item2| %>
-          <% next if item2['text'].blank? %>
-          <% modal = item2['modal'].nil? ? false : item2['modal'] %>
-          <% icon = item2['text'].parameterize %>
-          <% icon = 'rets' if item['text'] == 'RETS' %>
-          <% icon = 'store' if item['text'] == 'Store' %>
-          <% icon = item2['icon'] if item2['icon'] %>
-          <li><a href='<%= item2['href'] %>'<%= raw (modal ? " rel='modal'" : "") %>>
-            <span class="icon3-<%= icon %>"></span>
-            <span class="text"><%= item2['text'] %></span></a></li>
-        <% end %>
-      </ul>
+<div class="admin-index-menu" id="admin-list">  
+  <ul>
+    <% i = 0 %>
+    <% @nav.each do |item| %>
+      <% id = item['id'].nil? ? i.to_s : item['id'] %>
+      <% href = item['href'].nil? ? '#' : item['href'] %>
+      <% modal = item['modal'].nil? ? false : item['modal'] %>
+      <li id='nav_item_<%= id %>'>
+        <% if href != "#" %><a href='<%= href %>'<%= raw (modal ? " rel='modal'" : "") %>><% end %>
+          <span class='icon'></span><span class='text'><%= item['text'] %></span>
+        <% if href != "#" %></a><% end %>
+      <% if (!item['children'].nil? && item['children'].count > 0) %>
+        <ul>
+          <% item['children'].each do |item2| %>
+            <% next if item2['text'].blank? %>
+            <% modal = item2['modal'].nil? ? false : item2['modal'] %>
+            <% icon = item2['text'].parameterize %>
+            <% icon = 'rets' if item['text'] == 'RETS' %>
+            <% icon = 'store' if item['text'] == 'Store' %>
+            <% icon = item2['icon'] if item2['icon'] %>
+            <li><a href='<%= item2['href'] %>'<%= raw (modal ? " rel='modal'" : "") %>>
+              <span class="icon3-<%= icon %>"></span>
+              <span class="text"><%= item2['text'] %></span></a></li>
+          <% end %>
+        </ul>
+      <% end %>
+      </li>
+      <% i + 1 %>
     <% end %>
-    </li>
-    <% i + 1 %>
-  <% end %>
-</ul>
+  </ul>
 </div>
 
 <%= content_for :caboose_js do %>
@@ -49,10 +44,12 @@ width = 200
 <script type='text/javascript'>
 var modal = false;
 var station = false;
-$(document).ready(function() {
+$(document).ready(function() {    
+  add_to_crumbtrail('/admin', 'Admin');
   modal = new CabooseModal(<%= width %>);
-  station = new CabooseStation(modal<%= raw @tab ? ", '#{@tab}'" : '' %>);
+  station = new CabooseStation(modal<%= raw @tab ? ", '#{@tab}'" : '' %>);  	
 });
+
 </script>
 <% end %>
 <% content_for :caboose_css do %>

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

@@ -16,6 +16,8 @@ bt = @block_type
 
 <h2>Children</h2>
 <div id='block_types'></div>
+
+
     
 <h2>Advanced</h2>
 <p><div id='blocktype_<%= bt.id %>_block_type_category_id'          ></div></p>
@@ -28,16 +30,17 @@ bt = @block_type
 <p><div id='blocktype_<%= bt.id %>_options'                         ></div></p>
 <!-- <p><div id='blocktype_<%= bt.id %>_is_global'                       ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_use_render_function'             ></div></p>
-<!-- <p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p> -->
+<p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p>
 <p><div id='blocktype_<%= bt.id %>_use_js_for_modal'                ></div></p>
 <p><div id='blocktype_<%= bt.id %>_allow_child_blocks'              ></div></p>
-<p><div id='blocktype_<%= bt.id %>_is_dynamic'                      ></div></p>
 <p><div id='blocktype_<%= bt.id %>_default_child_block_type_id'     ></div></p>
 <!-- <p><div id='blocktype_<%= bt.id %>_default_constrain'               ></div></p>
 <p><div id='blocktype_<%= bt.id %>_default_full_width'              ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_default_included'              ></div></p>
+<p>
 
-<!-- <p><div id='blocktype_<%= bt.id %>_options_function'                ></div></p> -->
+</p>
+<p><div id='blocktype_<%= bt.id %>_options_function'                ></div></p>
 
 <div id='message'></div>
 
@@ -99,7 +102,7 @@ $(document).ready(function() {
       { name: 'block_type_category_id'         , sort: 'block_type_category_id'         , show: false , bulk_edit: false, nice_name: 'Category'                       , type: 'select'            , value: function(bt) { return bt.block_type_category_id;          }, width: 400, options_url: '/admin/block-type-categories/tree-options' },
   //    { name: 'is_global'                      , sort: 'is_global'                      , show: false , bulk_edit: false, nice_name: 'Global'                         , type: 'checkbox'          , value: function(bt) { return bt.is_global;                       }, text: function(bt) { return bt.is_global                      ? 'Yes' : 'No' }, width: 400 },
       { name: 'use_render_function'            , sort: 'use_render_function'            , show: true  , bulk_edit: false, nice_name: 'Use Render Function'            , type: 'checkbox'          , value: function(bt) { return bt.use_render_function;             }, text: function(bt) { return bt.use_render_function            ? 'Yes' : 'No' }, width: 400 },
-  //    { name: 'use_render_function_for_layout' , sort: 'use_render_function_for_layout' , show: true  , bulk_edit: false, nice_name: 'Use Render Function for Modal'  , type: 'checkbox'          , value: function(bt) { return bt.use_render_function_for_layout;  }, text: function(bt) { return bt.use_render_function_for_layout ? 'Yes' : 'No' }, width: 400 },
+      { name: 'use_render_function_for_layout' , sort: 'use_render_function_for_layout' , show: true  , bulk_edit: false, nice_name: 'Use Render Function for Modal'  , type: 'checkbox'          , value: function(bt) { return bt.use_render_function_for_layout;  }, text: function(bt) { return bt.use_render_function_for_layout ? 'Yes' : 'No' }, width: 400 },
       { name: 'use_js_for_modal'               , sort: 'use_js_for_modal'               , show: true  , bulk_edit: false, nice_name: 'Use JS for Modal'               , type: 'checkbox'          , value: function(bt) { return bt.use_js_for_modal;                }, text: function(bt) { return bt.use_js_for_modal               ? 'Yes' : 'No' }, width: 400 },
       { name: 'allow_child_blocks'             , sort: 'allow_child_blocks'             , show: true  , bulk_edit: false, nice_name: 'Allow Child Blocks'             , type: 'checkbox'          , value: function(bt) { return bt.allow_child_blocks;              }, text: function(bt) { return bt.allow_child_blocks             ? 'Yes' : 'No' }, width: 400 },
       { name: 'default_child_block_type_id'    , sort: 'default_child_block_type_id'    , show: false , bulk_edit: false, nice_name: 'Default Child Block Type ID'       , type: 'text'            , value: function(bt) { return bt.default_child_block_type_id;     }, width: 400 },          
@@ -134,7 +137,6 @@ $(document).ready(function() {
       { name: 'use_render_function_for_layout' , nice_name: 'Use Render Function for Modal'  , type: 'checkbox' , value: <%= bt.use_render_function_for_layout ? 'true' : 'false' %>, width: 400 },
       { name: 'use_js_for_modal'               , nice_name: 'Use JS for Modal'               , type: 'checkbox' , value: <%= bt.use_js_for_modal               ? 'true' : 'false' %>, width: 400 },
       { name: 'allow_child_blocks'             , nice_name: 'Allow Child Blocks'             , type: 'checkbox' , value: <%= bt.allow_child_blocks             ? 'true' : 'false' %>, width: 400 },
-      { name: 'is_dynamic'             , nice_name: 'Dynamic Block'             , type: 'checkbox' , value: <%= bt.is_dynamic      ? 'true' : 'false' %>, width: 400 },
       { name: 'default_child_block_type_id'    , nice_name: 'Default Child Block Type ID'       , type: 'text'   , value: <%= raw Caboose.json(bt.default_child_block_type_id)     %>,  width: 400 },   
       { name: 'field_type'                     , nice_name: 'Field type'                     , type: 'select'   , value: <%= raw Caboose.json(bt.field_type)                      %>, text: <%= raw Caboose.json(bt.field_type) %>, width: 400, options_url: '/admin/block-types/field-type-options' },
       { name: 'default'                        , nice_name: 'Default value'                  , type: 'text'     , value: <%= raw Caboose.json(bt.default)                         %>, width: 400 },
@@ -142,7 +144,7 @@ $(document).ready(function() {
       { name: 'height'                         , nice_name: 'Height'                         , type: 'text'     , value: <%= raw Caboose.json(bt.height)                          %>, width: 400 },
       { name: 'fixed_placeholder'              , nice_name: 'Fixed placeholder'              , type: 'checkbox' , value: <%= raw Caboose.json(bt.fixed_placeholder)               %>, width: 400 },
       { name: 'options_url'                    , nice_name: 'Options URL'                    , type: 'text'     , value: <%= raw Caboose.json(bt.options_url)                     %>, width: 400 },
-    //  { name: 'options_function'               , nice_name: 'Options Function'               , type: 'textarea' , value: <%= raw Caboose.json(bt.options_function)                %>, width: 400, height: 100 },
+      { name: 'options_function'               , nice_name: 'Options Function'               , type: 'textarea' , value: <%= raw Caboose.json(bt.options_function)                %>, width: 400, height: 100 },
       { name: 'options'                        , nice_name: 'Options'                        , type: 'textarea' , value: <%= raw Caboose.json(bt.options)                         %>, width: 400, height: 100 }, 
       { name: 'default_included'             , sort: 'default_included'             ,  nice_name: 'Include on New Sites'          , type: 'checkbox'          , value: <%= bt.default_included ? 'true' : 'false' %> , width: 400 }
     ]

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

@@ -12,9 +12,9 @@ end
 
 if editing
   if url.nil? || url.starts_with?('http://placehold.it') || url.include?('missing')  
-    %><div id='block_<%= block.id %>' class='file-select'><p>Click to select file for <%= block.block_type.description %>.</p></div><%
+    %><div id='block_<%= block.id %>'><p>Click to select a file.</p></div><%
   else
-    %><div id='block_<%= block.id %>' class='file-select'><p><%= block.block_type.description %> file:<br /><span><%= name %></span></p></div><%
+    %><div id='block_<%= block.id %>'><p><span><%= name %></span></p></div><%
   end
 elsif url
   %><div id='block_<%= block.id %>'><p><a href="<%= raw file.url %>">Download File</a></p></div><%

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

@@ -1,5 +1,6 @@
 <% sc = site.social_config %>
-<% if sc.auto_ga_js && !sc.google_analytics_id.blank? && !editing && Rails.env.production? %>
+
+<% if sc.auto_ga_js && !sc.google_analytics_id.blank? %>
 <script async src="https://www.googletagmanager.com/gtag/js?id=<%== sc.google_analytics_id %>"></script>
 <script>
   window.dataLayer = window.dataLayer || [];

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

@@ -1,15 +1,12 @@
 <% 
 url = nil
-mc = "Media"
 if block.media  
   url = block.media.image.url(:tiny)
-  mc = block.media.media_category ? block.media.media_category.name : mc
 elsif block.image
   url = block.image.url(:tiny)
 end
 if editing && url.include?('placehold') %>
 <div class="img-wrap" style="position:relative;display:inline-block;">
-	<% if block.media %><span>Media > <%= mc %> > <%= block.media.original_name %></span><% end %>
 	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
 		<img src='https://cabooseit.s3.amazonaws.com/assets/select_image.png' width="150" style="max-width:100%;display:block;" />
 		<span style="opacity:0;" class="select">Select an Image</span>
@@ -17,7 +14,6 @@ if editing && url.include?('placehold') %>
 </div>
 <% elsif editing %>
 <div class="img-wrap" style="position:relative;display:inline-block;">
-	<% if block.media %><span>Media > <%= mc %> > <%= block.media.original_name %></span><% end %>
 	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
 		<img src='<%== url %>' width="200" style="max-width:100%;display:block;" />
 		<span style="opacity:0;" class="select">Select an Image</span>

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

@@ -1,10 +1,9 @@
-<% 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 %>
-		<% js_yield = is_cache ? "js_#{block.id}".to_sym : :js %>
-    <% content_for js_yield do %>
+		<% content_for :js do %>
 			<% begin %>
 				<% erb = ERB.new(js).result(self.instance_eval { binding }) %>
 				<%== erb %>
@@ -17,8 +16,7 @@
 <% if caboose_css && caboose_css.length > 1 %>
 	<% caboose_css.to_a.each_with_index do |css, ind| %>
 		<% next if ind == 0 %>
-		<% css_yield = is_cache ? "css_#{block.id}".to_sym : :css %>
-		<% content_for css_yield do %>
+		<% content_for :css do %>
 			<% begin %>
 				<% erb = ERB.new(css).result(self.instance_eval { binding }) %>
 				<%== erb %>
@@ -27,7 +25,4 @@
 			<% 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 %>
+<% end %>

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

@@ -1,5 +1,3 @@
-<h1>Fonts</h1>
-
 <% if @site.use_fonts %>
 
 <div class="constrain clearfix">
@@ -68,23 +66,12 @@
 		</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: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 %>
+		<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>
 	</div>
 </div>
 
@@ -97,9 +84,6 @@
 
 <% 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;
 		}
@@ -224,18 +208,6 @@
 			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;
@@ -251,21 +223,6 @@
 			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; 
@@ -352,7 +309,7 @@
 			var variant;
 			for (i = min; i < max; i++) {
 				font = window.google_fonts[i];
-				variant = font ? font.variants[0] : null;
+				variant = font.variants[0];
 				load_css(i, variant);
 				var index = (i % 10) + 1;
 		//		console.log("family: " + font.family, ", index: " + index);
@@ -388,8 +345,8 @@
 				var cssId = font_id + "_" + variant;
 				if (!document.getElementById(cssId)) {
 		//			console.dir(font);
-					var weight = variant ? variant.replace("italic","").replace("regular","normal") : "N/A";
-					var style = variant ? (variant.indexOf("italic") >= 0 ? "italic" : "normal") : "N/A";
+					var weight = variant.replace("italic","").replace("regular","normal");
+					var style = variant.indexOf("italic") >= 0 ? "italic" : "normal";
 					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');
@@ -426,13 +383,13 @@
 		//	console.dir(font);
 			$(".font-preview").css("font-family",font.family);
 			$(".font-preview .family").text(font.family);
-			if ( variant && variant.indexOf("italic") >= 0 ) {
+			if ( variant.indexOf("italic") >= 0 ) {
 				$(".font-preview").css("font-style","italic");
 			}
 			else {
 				$(".font-preview").css("font-style","normal");
 			}
-			var weight = variant ? variant.match(/\d+/) : 400;
+			var weight = variant.match(/\d+/);
 			if ( weight && weight != "" ) {
 				$(".font-preview").css("font-weight",weight);
 			}
@@ -449,7 +406,6 @@
 			  data: {
 			  	family: family,
 			  	variant: variant,
-			//  	variant_id: variant_id,
 			  	url: url,
 			  	name: name
 			  },
@@ -467,20 +423,19 @@
 		$(document).ready(function() {
 
 			$.ajax({
-			  url: 'https://www.googleapis.com/webfonts/v1/webfonts?sort=popularity&key=AIzaSyAv6j9aPfc18FwIoTixYhvq1kr8vWT7H2g',
+			  url: 'https://www.googleapis.com/webfonts/v1/webfonts?sort=popularity&key=AIzaSyAjSs-Jq6hpuT35RG9wD6LuqaDFzYDCOPk',
 			  type: 'get',
 			  success: function(resp) {
 			  	if ( resp.items ) {
-		//	  		console.dir(resp.items);
+	//		  		console.dir(resp.items);
 			  <% fonts = Caboose::FontFamily.all %>
 			  <% fonts.each do |f| %>
-			  	<% next if f.font_variants.count == 0 %>
-			  	<% variants = f.font_variants.where("weight is not null").order(:sort_order).all %>
+			  	<% variants = f.font_variants.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_file && !v.ttf_file.url.include?('missing') ? v.ttf_file.url : v.ttf_url %>",
+			  			<%= v.style ? (v.weight == 'regular' && v.style == 'italic' ? 'italic' : (v.style + v.weight)) : v.weight %>: "<%= 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 %>",