caboose-cms 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a50bc705322c621bfae1116e28e9b4ce8bf6e971
-  data.tar.gz: 287158bedbcca2a553ad2831bdc4d94b21a0a52c
+  metadata.gz: 5cbedc8eb22cdc7fe35035da2e8a2115b21242af
+  data.tar.gz: 32d51d39f8312a4a9a46e994c485efbf4c531fa4
 SHA512:
-  metadata.gz: edbd6b8c76a106e41b43e200b6e836de91095f4c7a9a064295ddcde5e8b808669c9e13738d282307fa0d8288bcf4eb387e1c6af42ed4f20ed32063822dddf872
-  data.tar.gz: 48acb5c5c35c0bc443c928c653c001aa0a0cb87aaa4a1353c29eeb187c8af2a20b49a077643978da19781872e805b386e2e728b6c20733e05c8bba6ae316f142
+  metadata.gz: 236bd5322624a04ea7b2cc4b6c06e1c3216b556b24f5f62cc07a5f6c8d7ca4159622498d8acc53dd2427442afd538ac6bd24d1afe690dfa120949af803b76ee4
+  data.tar.gz: 05916a5469fdc4c67e88df67179a4977184efa71dbfeaaec8b9839a11164b87fcfe04118687454b3e6074d76eaa5850907d181292397e8a89fdca3a3286eab04

data/app/assets/stylesheets/caboose/admin_main.css

@@ -51,10 +51,9 @@ body {
 #top_nav ul li a {
   display: block;
   margin: 8px 4px;
-  padding: 8px 16px;
+  padding: 0 16px;
   border: #333 1px solid;
   text-decoration: none;
-  height: 16px;
 }
 
 #top_nav ul li a        { color: #ccc; border: #333 1px solid; background: #000; }
@@ -489,12 +488,12 @@ Page Bar Generator
   background: #141516; 
   color: #f7f7f7;
   text-align: center; 
-  padding: 8px 15px 6px 15px;
+  padding: 0 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
   font-size: 15px;
-  line-height: 18px;
+  line-height: 32px;
   cursor: pointer;
   border: 1px solid #fff;
   -webkit-border-radius: 5px;
@@ -510,7 +509,7 @@ Page Bar Generator
   border: 1px solid #fff;
   color: #141516;
   text-align: center; 
-  padding: 8px 15px 6px 15px;
+  padding: 0 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
@@ -521,7 +520,7 @@ Page Bar Generator
   -webkit-appearance: none;
   -moz-border-radius: 5px;
   border-radius: 5px;
-  line-height: 18px;
+  line-height: 32px;
   text-decoration: none;
 }
 

data/app/models/caboose/font_family.rb

@@ -0,0 +1,5 @@
+class Caboose::FontFamily < ActiveRecord::Base
+  self.table_name = "font_families"
+  has_many :font_variants, :class_name => 'Caboose::FontVariant', :dependent => :delete_all
+  attr_accessible :id, :name
+end

data/app/models/caboose/font_variant.rb

@@ -0,0 +1,5 @@
+class Caboose::FontVariant < ActiveRecord::Base
+  self.table_name = "font_variants"
+  belongs_to :font_family, :class_name => 'Caboose::FontFamily'
+  attr_accessible :id, :ttf_url, :font_family_id, :variant, :weight, :style, :sort_order
+end

data/app/models/caboose/schema.rb

@@ -290,6 +290,17 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :variant            , :string  ],
         [ :url                , :string  ]
       ],
+      Caboose::FontFamily => [
+        [ :name               , :string  ]
+      ],
+      Caboose::FontVariant => [
+        [ :font_family_id     , :integer ],
+        [ :variant            , :string  ],
+        [ :ttf_url            , :string  ],
+        [ :weight             , :string  ],
+        [ :style              , :string  ],
+        [ :sort_order         , :integer ]
+      ],
       Caboose::GiftCard => [
         [ :site_id         , :integer  ],        
         [ :name            , :string   ],

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

@@ -107,7 +107,7 @@
 			font-weight: normal;
 		}
 		.caboose-btn {
-			padding: 8px 15px;
+			padding: 0 15px;
 		}
 		.final-box p .bold-italic {
 			font-family: "body-font-bold-italic";
@@ -303,7 +303,13 @@
 			$(".body-variant-selector").html("");
 			if ( font && font.variants ) {
 				$.each(font.variants, function(key, variant) {
-					$("#variant-selector").append("<option value='" + variant + "'>" + variant + "</option>");
+					if (font.variant_names && font.variant_names[key]) {
+						$("#variant-selector").append("<option value='" + variant + "'>" + font.variant_names[key] + "</option>");
+					}
+					else {
+						$("#variant-selector").append("<option value='" + variant + "'>" + variant + "</option>");
+					}
+					
 					$(".body-variant-selector").append("<option value='" + variant + "'>" + variant + "</option>");
 				});
 			}
@@ -311,33 +317,49 @@
 
 		function load_css(font_id, variant) {
 			var font = window.google_fonts[font_id];
-		//	 console.dir(font);
-			// console.log("family: " + font.family);
-			// console.log("variant: " + variant);
-			var apiUrl = [];
-			apiUrl.push('//fonts.googleapis.com/css?family=');
-			apiUrl.push(font.family.replace(/ /g, '+'));
-			if ( variant && variant != "" ) {
-			  apiUrl.push(':');
-			  apiUrl.push(variant);
+			if ( font.version == "custom" ) {
+				var head  = document.getElementsByTagName('head')[0];
+				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";
+					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');
+					style.appendChild(css);
+					style.id = cssId;
+					head.appendChild(style);
+				}
 			}
-			var url = apiUrl.join('');
-			var cssId = font_id + "_" + variant;
-			if (!document.getElementById(cssId)) {
-		    var head  = document.getElementsByTagName('head')[0];
-		    var link  = document.createElement('link');
-		    link.id   = cssId;
-		    link.rel  = 'stylesheet';
-		    link.type = 'text/css';
-		    link.href = url;
-		    link.media = 'all';
-		    head.appendChild(link);
+			else {
+				var apiUrl = [];
+				apiUrl.push('//fonts.googleapis.com/css?family=');
+				apiUrl.push(font.family.replace(/ /g, '+'));
+				if ( variant && variant != "" ) {
+				  apiUrl.push(':');
+				  apiUrl.push(variant);
+				}
+				var url = apiUrl.join(''); 
+				var cssId = font_id + "_" + variant;
+				if (!document.getElementById(cssId)) {
+			    var head  = document.getElementsByTagName('head')[0];
+			    var link  = document.createElement('link');
+			    link.id   = cssId;
+			    link.rel  = 'stylesheet';
+			    link.type = 'text/css';
+			    link.href = url;
+			    link.media = 'all';
+			    head.appendChild(link);
+				}
 			}
 		}
 
 		function change_preview(font_id, variant) {
 			var font = window.google_fonts[font_id];
+		//	console.dir(font);
 			$(".font-preview").css("font-family",font.family);
+			$(".font-preview .family").text(font.family);
 			if ( variant.indexOf("italic") >= 0 ) {
 				$(".font-preview").css("font-style","italic");
 			}
@@ -382,6 +404,26 @@
 			  type: 'get',
 			  success: function(resp) {
 			  	if ( resp.items ) {
+	//		  		console.dir(resp.items);
+			  <% fonts = Caboose::FontFamily.all %>
+			  <% fonts.each do |f| %>
+			  	<% 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_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 %>",
+			  		<% end %> ],
+			  		variant_names: [ <% variants.each_with_index do |v,i| %>
+			  			"<%= v.variant %>",
+			  		<% end %> ],
+			  		version: "custom"
+			  	});
+			  <% end %>
+			  		console.dir(resp.items);
 			  		window.google_fonts = resp.items;
 						update_fonts(0, 10);
 			  		var first_font = $(".font-li.selected").data("index");
@@ -408,6 +450,7 @@
 				event.preventDefault(); 
 				var font_id = $(".font-li.selected").data("index");
 				var variant = $("#variant-selector").val();
+				var variant_name = $("#variant-selector option:selected").first().text();
 				var font = window.google_fonts[font_id];
 				var preview = $("#font" + $(this).attr("id") + "-preview");
 				preview.css("font-family",font.family);
@@ -425,7 +468,7 @@
 					preview.css("font-weight","normal");
 				}
 				preview.find(".family").html(font.family);
-				preview.find(".variant").html(variant);
+				preview.find(".variant").html(variant_name);
 				save_font(font.family, variant, font.files[variant], $(this).data("name"));
 			});
 

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

@@ -34,9 +34,9 @@ $(document).ready(function() {
       { name: 'facebook_page_id'     , nice_name: 'Facebook Page ID'                       , type: 'text'     , value: <%= raw Caboose.json(sc.facebook_page_id) %>, width: 500 },
       { name: 'twitter_username'     , nice_name: 'Twitter Username'                       , type: 'text'     , value: <%= raw Caboose.json(sc.twitter_username) %>, width: 500 },
       { name: 'instagram_username'   , nice_name: 'Instagram Username'                     , type: 'text'     , value: <%= raw Caboose.json(sc.instagram_username) %>, width: 500 },
-      { name: 'youtube_url'          , nice_name: 'YouTube Channel ID'                     , type: 'text'     , value: <%= raw Caboose.json(sc.youtube_url) %>, width: 500 },
+      { name: 'youtube_url'          , nice_name: 'YouTube Channel URL'                     , type: 'text'     , value: <%= raw Caboose.json(sc.youtube_url) %>, width: 500 },
       { name: 'pinterest_url'        , nice_name: 'Pinterest URL'                          , type: 'text'     , value: <%= raw Caboose.json(sc.pinterest_url) %>, width: 500 },
-      { name: 'vimeo_url'            , nice_name: 'Vimeo URL'                              , type: 'text'     , value: <%= raw Caboose.json(sc.vimeo_url) %>, width: 500 },
+      { name: 'vimeo_url'            , nice_name: 'Vimeo Username'                              , type: 'text'     , value: <%= raw Caboose.json(sc.vimeo_url) %>, width: 500 },
       { name: 'rss_url'              , nice_name: 'RSS Feed URL'                           , type: 'text'     , value: <%= raw Caboose.json(sc.rss_url) %>, width: 500 },
       { name: 'google_plus_url'      , nice_name: 'Google Plus URL'                        , type: 'text'     , value: <%= raw Caboose.json(sc.google_plus_url) %>, width: 500 },
       { name: 'linkedin_url'         , nice_name: 'LinkedIn URL'                           , type: 'text'     , value: <%= raw Caboose.json(sc.linkedin_url) %>, width: 500 },

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.25'
+  VERSION = '0.7.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.26
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -792,6 +792,8 @@ files:
 - app/models/caboose/discount.rb
 - app/models/caboose/domain.rb
 - app/models/caboose/font.rb
+- app/models/caboose/font_family.rb
+- app/models/caboose/font_variant.rb
 - app/models/caboose/ga.rb
 - app/models/caboose/gift_card.rb
 - app/models/caboose/line_item.rb