cytoplasm 0.3.5 → 0.3.6

data/app/assets/javascripts/cytoplasm/cytoField.js.erb

@@ -17,7 +17,7 @@
 	var methods = {
 		init:function(options){
 			return this.each(function(){
-				var $this = $(this);
+				var $this = $(this).addClass('cytoField');
 				var settings = $.extend(true,{},defaults,options);
 				
 				// Setup widget
@@ -52,5 +52,25 @@
 	};
 	
 	$(window).resize(function(){$('.cytoField').cytoField('resize');});
-	$.Cytoplasm("ready",function(){$('.cytoField').cytoField();});
+	$.Cytoplasm("ready",function(){
+		$.Cytoplasm("addStyles","cytofield_styles",{
+			".cytoField":{
+				width:"100%",
+				border:"1px solid #aaa",
+				"border-radius":"5px",
+				"font":$.Cytoplasm("vars","fonts.sizes.normal")+" "+$.Cytoplasm("vars","fonts.faces.regular"),
+				"box-shadow":"inset 0px 0px 5px rgba(0,0,0,0.25)",
+				"&[type=text],&[type=password],&[type=email]":{
+					height:"28px",
+					padding:"0px 7px"
+				}
+			},
+			"textarea.cytoField":{
+				resize:"none",
+				height:"200px",
+				padding:"7px"
+			}
+		});
+		$('.cytoField').cytoField();
+	});
 })(jQuery);

data/app/assets/javascripts/cytoplasm/cytoMenu.js.erb

@@ -170,4 +170,8 @@
 		else $.error('Method ' +  method + ' does not exist on $.CytoMenu!');
 	};
 	
+	$.Cytoplasm("ready",function(){
+		
+	});
+	
 })(jQuery);

data/app/assets/javascripts/cytoplasm/cytoSelect.js.erb

@@ -461,5 +461,10 @@
 	};
 	
 	$(window).resize(function(){$('select.cytoSelect').cytoSelect("resize");});
-	$.Cytoplasm("ready",function(){$('select.cytoSelect').cytoSelect();});
+	$.Cytoplasm("ready",function(){
+		$.Cytoplasm("addStyles","cytoselect_styles",{
+			
+		});
+		$('select.cytoSelect').cytoSelect();
+	});
 })(jQuery);

data/app/assets/javascripts/cytoplasm/cytoSlider.js.erb

@@ -168,5 +168,7 @@
 	};
 	
 	$(window).resize(function(){$('.cytoSlider').cytoSlider('resize');});
-	$.Cytoplasm("ready",function(){$('.cytoSlider').cytoSlider();});
+	$.Cytoplasm("ready",function(){
+		$('.cytoSlider').cytoSlider();
+	});
 })(jQuery);

data/app/assets/javascripts/cytoplasm/cytoTable.js.erb

@@ -55,10 +55,7 @@
 								css:{}
 							},
 							label:{
-								css:{
-									font:"<%=Cytoplasm.vars()[:fonts][:sizes][:small]+" "+Cytoplasm.vars()[:fonts][:faces][:light]%>",
-									width:100
-								}
+								css:{}
 							}
 						}
 					}
@@ -201,5 +198,22 @@
 	};
 	
 	$(window).resize(function(){$('.cytoTable').cytoTable('resize');});
-	$.Cytoplasm("ready",function(){$('.cytoTable').cytoTable();});
+	$.Cytoplasm("ready",function(){
+		$.Cytoplasm("addStyles","cytotable_styles",{
+			'table.cytoTable':{
+				background:$.Cytoplasm("vars","colors.plugins.cytoTable.background"),
+				table:{
+					'margin-bottom':'0px',
+					"font-family":$.Cytoplasm("vars","fonts.faces.light"),
+					"font-weight":($.Cytoplasm("vars","fonts.faces.light")==$.Cytoplasm("vars","fonts.faces.regular"))?"lighter":"normal"
+				},
+				td:{
+					border:$.Cytoplasm("vars","colors.plugins.cytoTable.border"),
+					"&[data-type=label]":{"width":"100px"},
+					"&[data-type=label],&[data-type=info]":{"font":$.Cytoplasm("vars","fonts.sizes.small")+" "+$.Cytoplasm("vars","fonts.faces.light")}
+				}
+			}
+		});
+		$('.cytoTable').cytoTable();
+	});
 })(jQuery);

data/app/assets/javascripts/cytoplasm/cytoplasm.js.erb

@@ -32,7 +32,7 @@ var Cytoplasm;
 	];
 	
 	// Default styles
-	var static_styles = "body{margin:0;height:100%;overflow-y:scroll}h1,h2,h3,h4,h5,h6{margin:20px 0}header{overflow:hidden;h1{margin:0;white-space:nowrap;cursor:pointer;display:inline;text-shadow:0 0 10px rgba(0,0,0,0.5)}#logo{z-index:1000}}nav{ul{padding:0;list-style:none;li{display:inline-block}}}section{min-height:400px;background:white;overflow:hidden;box-shadow:0 0 10px rgba(0,0,0,0.8);clear:both;&>:first-child{margin-top:0;padding-top:0}&>:last-child{margin-bottom:0;padding-bottom:0}}footer{overflow:hidden}.cytoField{width:100%;border:1px solid #aaa;border-radius:5px;font-size:14px;box-shadow:inset 0 0 5px rgba(0,0,0,0.25);&[type=text],&[type=password],&[type=email]{height:28px;padding:0 7px}}textarea.cytoField{resize:none;height:200px;padding:7px}button,input[type=submit]{&.cytoButton{border-radius:5px;cursor:pointer;&.large{width:100%;height:50px}}}";
+	var static_styles = "body{margin:0;height:100%;overflow-y:scroll}h1,h2,h3,h4,h5,h6{margin:20px 0}header{overflow:hidden;h1{margin:0;white-space:nowrap;cursor:pointer;display:inline;text-shadow:0 0 10px rgba(0,0,0,0.5)}#logo{z-index:1000}}nav{ul{padding:0;list-style:none;li{display:inline-block}}}section{min-height:400px;background:white;overflow:hidden;box-shadow:0 0 10px rgba(0,0,0,0.8);clear:both;&>:first-child{margin-top:0;padding-top:0}&>:last-child{margin-bottom:0;padding-bottom:0}}footer{overflow:hidden}button,input[type=submit]{&.cytoButton{border-radius:5px;cursor:pointer;&.large{width:100%;height:50px}}}";
 	
 	// Gradient manipulation library
 	var parseGradient = function(grad,reverse){
@@ -179,7 +179,7 @@ var Cytoplasm;
 					"font-family":vars.fonts.faces.bold,
 					"font-weight":boldweight
 				},
-				'h2,h4,h6,table.cytoTable,.cytoButton':{
+				'h2,h4,h6,.cytoButton':{
 					"font-family":vars.fonts.faces.light,
 					"font-weight":lightweight
 				},
@@ -226,17 +226,6 @@ var Cytoplasm;
 						color:vars.colors.links.active.text
 					}
 				},
-				'table.cytoTable':{
-					background:vars.colors.plugins.cytoTable.background,
-					table:{
-						'margin-bottom':'0px'
-					},
-					td:{
-						border:vars.colors.plugins.cytoTable.border,
-						"&[data-type=label]":{"font-size":vars.fonts.sizes.small}
-					}
-				},
-				'.cytoField':{"font-family":vars.fonts.faces.regular},
 				'.cytoButton':{
 					border:vars.colors.plugins.cytoButton.border,
 					color:vars.colors.plugins.cytoButton.text,

data/app/controllers/cytoplasm/dash_controller.rb

@@ -0,0 +1,9 @@
+module Cytoplasm
+	class DashController < ApplicationController
+		
+		def index
+			
+		end
+		
+	end
+end

data/app/controllers/cytoplasm/fonts_controller.rb

@@ -332,6 +332,15 @@ module Cytoplasm
 			@font = Cytoplasm::FontsController.fetch_family(params[:directory],params[:family])
 		end
 		
+		def install
+			
+		end
+		
+		def manage
+			@installed = Cytoplasm::FontsController.fetch_imported()
+			@enabled = Cytoplasm::FontsController.fetch_enabled()
+		end
+		
 		def import
 			render :text => Cytoplasm::Ajax.success(Cytoplasm::FontsController.import(params[:directory],params[:family]))
 		end

data/app/controllers/cytoplasm/performance_controller.rb

@@ -0,0 +1,16 @@
+module Cytoplasm
+	class PerformanceController < ApplicationController
+		
+		def index
+			
+		end
+		
+		def precompile
+			if request.post?
+				Cytoplasm.precompile_styles(params[:styles])
+				render :text => Cytoplasm::Ajax.success()
+			end
+		end
+		
+	end
+end

data/app/controllers/cytoplasm/settings_controller.rb

@@ -27,13 +27,6 @@ module Cytoplasm
 			redirect_to cytoplasm_settings_url
 		end
 		
-		def precompile
-			if request.post?
-				Cytoplasm.precompile_styles(params[:styles])
-				render :text => Cytoplasm::Ajax.success()
-			end
-		end
-		
 		def fetch_vars
 			Cytoplasm.load_vars_from("config/cytoplasm-config.yml")
 			return Cytoplasm.vars()

data/app/controllers/cytoplasm/transitions_controller.rb

@@ -0,0 +1,9 @@
+module Cytoplasm
+	class TransitionsController < ApplicationController
+		
+		def index
+			
+		end
+		
+	end
+end

data/app/views/cytoplasm/dash/index.html.erb

@@ -0,0 +1,72 @@
+<h2>Cytoplasm <b>Backstage</b></h2>
+<hr />
+
+<ul class="tile_list">
+	<li>
+		<%=image_tag("cytoplasm/settings-settings-3.png")%>
+		<h3><%=link_to("Settings",cytoplasm_settings_url)%></h3>
+		<ul>
+			<li><%=link_to("Layout General Settings",cytoplasm_layout_settings_url)%></li>
+			<li><%=link_to("Layout Color Settings",cytoplasm_colors_settings_url)%></li>
+			<li><%=link_to("Advanced Configuration Tool",cytoplasm_advanced_config_url)%></li>
+		</ul>
+	</li>
+	
+	<li>
+		<%=image_tag("cytoplasm/text-underline-color.png")%>
+		<h3><%=link_to("Fonts",cytoplasm_fonts_url)%></h3>
+		<ul>
+			<li><%=link_to("Layout Font Settings",cytoplasm_layout_fonts_url)%></li>
+			<li><%=link_to("Install New Fonts",cytoplasm_install_fonts_url)%></li>
+			<li><%=link_to("Manage Installed Fonts",cytoplasm_manage_fonts_url)%></li>
+		</ul>
+	</li>
+	
+	<li>
+		<%=image_tag("cytoplasm/transition.png")%>
+		<h3><%=link_to("Transitions",cytoplasm_transitions_url)%></h3>
+		<ul>
+			<li><%=link_to("Layout Transition Settings","#")%></li>
+			<li><%=link_to("Create a Transition","#")%></li>
+		</ul>
+	</li>
+	
+	<li>
+		<%=image_tag("cytoplasm/settings-dashboard.png")%>
+		<h3><%=link_to("Performance",cytoplasm_performance_url)%></h3>
+		<ul>
+			<li><%=link_to("Layout Performance Settings","#")%></li>
+			<li><%=link_to("Precompile CSS",cytoplasm_precompile_url)%></li>
+		</ul>
+	</li>
+</ul>
+
+<script type="text/javascript">
+(function($){
+$.Cytoplasm("ready",function(){
+	$('.tile_list').css({
+		'list-style':'none',
+		margin:0,
+		padding:"25px 0px"
+	}).children('li').css({
+		float:'left',
+		width:'25%',
+		'text-align':'center',
+	}).hover(
+		function(e){$(this).children("img").css("opacity",1);},
+		function(e){$(this).children("img").css("opacity",0.8);}
+	).children('img').css({
+		width:256,
+		opacity:0.8
+	}).click(function(e){
+		window.location = $(this).siblings("h3").find("a").attr("href");
+	}).end().children('ul').css({
+		'list-style':'none',
+		padding:0,
+		margin:0
+	}).children('li').css({
+		
+	});
+});
+})(jQuery);
+</script>

data/app/views/cytoplasm/fonts/_installer.html.erb

@@ -1,4 +1,3 @@
-<h3>Install New Fonts</h3>
 <table class="cytoTable">
 	<tr>
 		<td class='labelcell'>Directory:</td>

data/app/views/cytoplasm/fonts/{_style_list.html.erb → _layout_settings.html.erb}

@@ -4,10 +4,8 @@ sizes = Cytoplasm.vars()[:fonts][:sizes]
 %>
 <form id="cytoplasm_fonts_settings_form" action="<%=cytoplasm_update_url%>" method="post">
 	<table class="cytoTable">
-		<tr><td class='headercell' colspan=2><h3>Typography Settings</h3></td></tr>
-		<tr><td class='infocell' colspan=2>Select individual fonts below if desired.</td></tr>
-		
 		<tr><td class='headercell' colspan=2><h4>Font Faces</h4></td></tr>
+		<tr><td class='infocell' colspan=2>Select individual fonts below if desired.</td></tr>
 		<% styles.each do |style| %>
 		<tr>
 			<td class='labelcell'><%=style.capitalize%>:</td>

data/app/views/cytoplasm/fonts/index.html.erb

@@ -1,4 +1,4 @@
-<h2>Cytoplasm Font Manager</h2>
+<h2>Cytoplasm Font Settings</h2>
 
 <hr />
 
@@ -17,6 +17,8 @@
 	<hr />
 <% end %>
 
+<h3>Install New Fonts</h3>
 <%=render :partial => 'installer'%>
 
-<%=render :partial => "cytoplasm/fonts/style_list.html.erb" %>
+<h3>Layout Font Settings</h3>
+<%=render :partial => "layout_settings" %>

data/app/views/cytoplasm/fonts/install.html.erb

@@ -0,0 +1,2 @@
+<h2>Install New Fonts</h2>
+<%=render :partial => "installer" %>

data/app/views/cytoplasm/fonts/layout.html.erb

@@ -0,0 +1,2 @@
+<h2>Layout Font Settings</h2>
+<%=render :partial => "layout_settings"%>

data/app/views/cytoplasm/fonts/manage.html.erb

@@ -0,0 +1,16 @@
+<h2>Cytoplasm <b>Font Manager</b></h2>
+
+<% if @enabled["fontsquirrel"].any? or @enabled["googlewebfonts"].any? %>
+	<hr />
+	<h3>Enabled Fonts</h3>
+	<p>The following fonts are being loaded into every page of your site. To use them, simply add a font-family CSS rule referencing the <b>CSS Name</b> to any element.</p>
+	<p><b>Remember: less is more!</b> Loading tons of fonts can severely affect page load times, and using more than a few at a time is widely considered poor design practice anyway. It is recommended that you simply disable any fonts that you aren't using.</p>
+	<%=render :partial => 'list', :object => @enabled %>
+<% end %>
+
+<% if @installed["fontsquirrel"].any? or @installed["googlewebfonts"].any? %>
+	<hr />
+	<h3>Installed Fonts</h3>
+	<p>This includes all fonts that are currently installed into this Cytoplasm project.</p>
+	<%=render :partial => 'list', :object => @installed %>
+<% end %>

data/app/views/cytoplasm/performance/index.html.erb

@@ -0,0 +1 @@
+<h2>Performance</h2>

data/app/views/cytoplasm/settings/index.html.erb

@@ -1,65 +1,3 @@
-<h2 style="margin:0px;">Cytoplasm Backstage</h2>
+<h2>Cytoplasm <b>Settings</b></h2>
 <hr />
 
-<ul class="tile_list">
-	<li>
-		<%=image_tag("cytoplasm/settings-settings-3.png",:width => 256)%>
-		<h3><%=link_to("Settings",cytoplasm_general_settings_url)%></h3>
-		<ul>
-			<li><%=link_to("Layout Settings",cytoplasm_layout_settings_url)%></li>
-			<li><%=link_to("Colors Settings",cytoplasm_colors_settings_url)%></li>
-			<li><%=link_to("Advanced Configuration Tool",cytoplasm_advanced_config_url)%></li>
-		</ul>
-	</li>
-	
-	<li>
-		<%=image_tag("cytoplasm/text-underline-color.png",:width => 256)%>
-		<h3><%=link_to("Fonts",cytoplasm_fonts_url)%></h3>
-		<ul>
-			<li><%=link_to("Install New Fonts","#")%></li>
-			<li><%=link_to("Manage Installed Fonts",cytoplasm_fonts_url)%></li>
-			<li><%=link_to("Layout Font Settings","#")%></li>
-		</ul>
-	</li>
-	
-	<li>
-		<%=image_tag("cytoplasm/transition.png",:width => 256)%>
-		<h3><%=link_to("Transitions","#")%></h3>
-		<ul>
-			<li><%=link_to("Layout Transition Settings","#")%></li>
-			<li><%=link_to("Create a Transition","#")%></li>
-		</ul>
-	</li>
-	
-	<li>
-		<%=image_tag("cytoplasm/settings-dashboard.png",:width => 256)%>
-		<h3><%=link_to("Performance","#")%></h3>
-		<ul>
-			<li><%=link_to("Precompile CSS",cytoplasm_precompile_url)%></li>
-		</ul>
-	</li>
-</ul>
-
-<script type="text/javascript">
-(function($){
-$.Cytoplasm("ready",function(){
-	$('.tile_list').css({
-		'list-style':'none',
-		margin:0,
-		padding:"25px 0px"
-	}).children('li').css({
-		float:'left',
-		width:'25%',
-		'text-align':'center'
-	}).children('img').click(function(e){
-		window.location = $(this).siblings("h3").find("a").attr("href");
-	}).end().children('ul').css({
-		'list-style':'none',
-		padding:0,
-		margin:0
-	}).children('li').css({
-		
-	});
-});
-})(jQuery);
-</script>

data/app/views/cytoplasm/transitions/index.html.erb

@@ -0,0 +1 @@
+<h2>Transitions</h2>

data/config/routes.rb

@@ -1,8 +1,11 @@
 Rails.application.routes.draw do
-	# Development environment only
+	# --- Development environment only ---
 	if Rails.env.development?
+		# Dashboard
+		get "/cytoplasm" => "Cytoplasm/dash#index", :as => :cytoplasm
+		
 		# Settings
-		get "/cytoplasm" => "Cytoplasm/settings#index", :as => :cytoplasm_settings
+		get "/cytoplasm/settings" => "Cytoplasm/settings#index", :as => :cytoplasm_settings
 		get "/cytoplasm/general" => "Cytoplasm/settings#general", :as => :cytoplasm_general_settings
 		get "/cytoplasm/layout" => "Cytoplasm/settings#layout", :as => :cytoplasm_layout_settings
 		get "/cytoplasm/colors" => "Cytoplasm/settings#colors", :as => :cytoplasm_colors_settings
@@ -10,20 +13,32 @@ Rails.application.routes.draw do
 		post "/cytoplasm/update" => "Cytoplasm/settings#update", :as => :cytoplasm_update
 		
 		# Fonts
-		get "/cytoplasm/fonts" => "Cytoplasm/fonts#index", :controller => Cytoplasm::FontsController, :action => :index, :as => :cytoplasm_fonts
-		get "/cytoplasm/fonts/:directory/:family" => "Cytoplasm/fonts#show", :controller => Cytoplasm::FontsController, :action => :show, :as => :cytoplasm_show_font
+		get "/cytoplasm/fonts" => "Cytoplasm/fonts#index", :as => :cytoplasm_fonts
+		get "/cytoplasm/fonts/:directory/:family" => "Cytoplasm/fonts#show", :as => :cytoplasm_show_font
+		get "/cytoplasm/fonts/install" => "Cytoplasm/fonts#install", :as => :cytoplasm_install_fonts
+		get "/cytoplasm/fonts/manage" => "Cytoplasm/fonts#manage", :as => :cytoplasm_manage_fonts
+		get "/cytoplasm/fonts/layout" => "Cytoplasm/fonts#layout", :as => :cytoplasm_layout_fonts
 		post "/cytoplasm/fonts/import" => "Cytoplasm/fonts#import"
 		post "/cytoplasm/fonts/remove" => "Cytoplasm/fonts#remove"
 		post "/cytoplasm/fonts/enable" => "Cytoplasm/fonts#enable"
 		post "/cytoplasm/fonts/disable" => "Cytoplasm/fonts#disable"
+		
+		# Transitions
+		get "/cytoplasm/transitions" => "Cytoplasm/transitions#index", :as => :cytoplasm_transitions
+		get "/cytoplasm/transitions/layout" => "Cytoplasm/transitions#layout", :as => :cytoplasm_layout_transitions
+		get "/cytoplasm/transitions/new" => "Cytoplasm/transitions#new", :as => :cytoplasm_new_transition
+		
+		# Performance
+		get "/cytoplasm/performance" => "Cytoplasm/performance#index", :as => :cytoplasm_performance
+		get "/cytoplasm/precompile" => "Cytoplasm/performance#precompile", :as => :cytoplasm_precompile
+		post "/cytoplasm/precompile" => "Cytoplasm/performance#precompile"
 	end
 	
-	# All environments
-	# Settings
-	get "/cytoplasm/precompile" => "Cytoplasm/settings#precompile", :as => :cytoplasm_precompile
-	post "/cytoplasm/precompile" => "Cytoplasm/settings#precompile"
+	# --- All environments ---
+	
+	#     Settings
 	post "/cytoplasm/settings/fetch" => "Cytoplasm/settings#fetch"
 	
-	# Fonts
+	#     Fonts
 	post "/cytoplasm/fonts/fetch_all" => "Cytoplasm/fonts#fetch_all"
 end