refinerycms 0.9.6.11 → 0.9.6.12

data/VERSION

@@ -1 +1 @@
-0.9.6.11
+0.9.6.12

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -980,7 +980,7 @@ WYMeditor.editor.prototype.exec = function(cmd) {
     case WYMeditor.APPLY_CLASS:
       wym = this;
       $(wym._box).find(this._options.classUnhiddenSelector).toggleClass(this._options.classHiddenSelector.substring(1)); // substring(1) to remove the . at the start
-      $(wym._box).find("a[name=" + WYMeditor.APPLY_CLASS +"]").toggleClass('selected');
+      $(wym._box).find("a[name=" + WYMeditor.APPLY_CLASS +"]").toggleClass('selected').parent().toggleClass('activated');
       // determine whether any classes are already selected and add the enabled class to them.
       $(wym._box).find(this._options.classUnhiddenSelector).find("a[name]").each(function(index, rule){
         if ($(wym.selected()).hasClass($(rule).attr('name'))) {

data/public/stylesheets/wymeditor/skins/refinery/skin.css

@@ -8,7 +8,7 @@
 		.wym_skin_refinery .wym_area_right		 { display: block; }
 
 
-/*TYPO*/	
+/*TYPO*/
 		.wym_skin_refinery				{ font-size: 62.5%; font-family: Verdana, Arial, sans-serif; }
 		.wym_skin_refinery h2			 { font-size: 110%; /* = 11px */}
 		.wym_skin_refinery h3			 { font-size: 100%; /* = 10px */}
@@ -31,7 +31,7 @@
 /*WYM_IFRAME*/
 		.wym_skin_refinery .wym_iframe			 { width: 100%;}
 		.wym_skin_refinery .wym_iframe iframe		{ width: 99%; border: 1px solid gray; background: white }
-		
+
 /* adjust for two rows of icons */
 		.wym_two_column .wym_skin_refinery .wym_iframe iframe, .wym_two_column .wym_skin_refinery .wym_html textarea { height: 376px; }
 
@@ -55,7 +55,7 @@
 		/*hide section titles by default*/
 		.wym_skin_refinery .wym_section h2		 { display: none; }
 		/*disable any margin-collapse*/
-		.wym_skin_refinery .wym_section			{ padding: 0px;}	
+		.wym_skin_refinery .wym_section			{ padding: 0px;}
 		/*auto-clear sections*/
 		.wym_skin_refinery .wym_section ul:after	 { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
  * html .wym_skin_refinery .wym_section ul		 { height: 1%;}
@@ -74,7 +74,7 @@
 		.wym_skin_refinery .wym_buttons li		 { float:left;}
 		.wym_skin_refinery .wym_buttons a 				 { width: 20px; height: 20px; overflow: hidden; padding: 2px }
 		/*image replacements*/
-		.wym_skin_refinery .wym_buttons li a						 { background: url('/images/wymeditor/skins/refinery/icons.png') no-repeat; text-indent: -9999px;} 
+		.wym_skin_refinery .wym_buttons li a						 { background: url('/images/wymeditor/skins/refinery/icons.png') no-repeat; text-indent: -9999px;}
 		.wym_skin_refinery .wym_buttons li.wym_tools_strong a		{ background-position: 0 -382px;}
 		.wym_skin_refinery .wym_buttons li.wym_tools_emphasis a		{ background-position: 0 -22px;}
 		.wym_skin_refinery .wym_buttons li.wym_tools_superscript a	 { background-position: 0 -430px;}
@@ -94,13 +94,13 @@
 		.wym_skin_refinery .wym_buttons li.wym_tools_preview a		 { background-position: 0 -408px;}
 
 		/* make tools and containers play nicely next to eachother */
-		
+
 		.wym_skin_refinery .wym_tools, .wym_skin_refinery .wym_containers	 { float: left; margin: 0px 0px 5px 0px; }
-		
+
 		/* image replacements for containers */
 				.wym_skin_refinery .wym_containers li { float: left; }
 		.wym_skin_refinery .wym_containers li a, .wym_skin_refinery li.wym_tools_class a {background-repeat: no-repeat; background-position: center center;width: 20px; height: 20px; overflow: hidden; padding: 2px; border: 0px none;}
-		
+
 		.wym_skin_refinery li.wym_containers_h1 a	 { background-image: url('/images/wymeditor/skins/refinery/h1.png'); }
 		.wym_skin_refinery li.wym_containers_h2 a	 { background-image: url('/images/wymeditor/skins/refinery/h2.png');}
 		.wym_skin_refinery li.wym_containers_h3 a	 { background-image: url('/images/wymeditor/skins/refinery/h3.png');}
@@ -113,24 +113,24 @@
 /*DECORATION*/
 		.wym_skin_refinery .wym_section h2			 { background: #DDD; border: solid gray; border-width: 0 0 1px;}
 		.wym_skin_refinery .wym_section h2 span		{ color: gray;}
-		.wym_skin_refinery .wym_panel					{ padding: 0; border: solid gray; border-width: 1px; background: white;}	
-		.wym_skin_refinery .wym_panel ul				 { margin: 2px 0 5px; }		
+		.wym_skin_refinery .wym_panel					{ padding: 0; border: solid gray; border-width: 1px; background: white;}
+		.wym_skin_refinery .wym_panel ul				 { margin: 2px 0 5px; }
 		.wym_skin_refinery .wym_dropdown				 { padding: 0; border: solid gray; border-width: 1px 1px 0 1px; }
 		.wym_skin_refinery .wym_dropdown ul			{ border: solid gray; border-width: 0 1px 1px 1px; margin-left: -1px; padding: 5px 10px 5px 3px;}
-		
+
 /*DIALOGS*/
 		.wym_dialog div.row		 { margin-bottom: 5px;}
 		.wym_dialog div.row input	 { margin-right: 5px;}
 		.wym_dialog div.row label	 { float: left; width: 150px; display: block; text-align: right; margin-right: 10px; }
 		.wym_dialog div.row-indent	{ padding-left: 160px; }
-		/*autoclearing*/		
+		/*autoclearing*/
 		.wym_dialog div.row:after			{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 		.wym_dialog div.row					{ display: inline-block; }
 			/* Hides from IE-mac \*/
 			* html .wym_dialog div.row		 { height: 1%; }
 			.wym_dialog div.row				{ display: block; }
-			/* End hide from IE-mac */				
-			
+			/* End hide from IE-mac */
+
 /*WYMEDITOR_LINK*/
 		a.wym_wymeditor_link		{ text-indent: -9999px; float: right; display: block; width: 50px; height: 15px; background: url(../wymeditor_icon.png);	overflow: hidden; text-decoration: none;	}
 
@@ -175,7 +175,7 @@
 .wym_classes_hidden {
 	display: none;
 }
-.wym_tools_class {
+.wym_tools_class.activated {
 	position: relative;
 }
 .wym_skin_refinery .wym_buttons .wym_tools_class .wym_classes li {
@@ -198,10 +198,10 @@
 	font-style: italic;
 	margin: 3px 0px 0px 6px;
 	background: #EDEEDE;
-	
+
 }
 .wym_skin_refinery .wym_tools_class .wym_tools_class_multiple_rules ul li {
-	
+
 }
 .wym_skin_refinery .wym_tools_class .wym_classes .wym_tools_class_multiple_rules ul li a {
 	width: 167px;

data/vendor/plugins/themes/lib/theme_server.rb

@@ -1,7 +1,7 @@
 # Allow the metal piece to run in isolation
 require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
 
-# Servers theme files from the them directory without touching Rails too much
+# Serves theme files from the theme directory without touching Rails too much
 class ThemeServer
 
   def initialize(app)
@@ -9,26 +9,17 @@ class ThemeServer
   end
 
   def call(env)
-    if env["PATH_INFO"] =~ /^\/theme/
-      relative_path = env["PATH_INFO"].gsub(/^\/theme\//, '')
-
-      if (file_path = Rails.root.join("themes", RefinerySetting[:theme], relative_path)).exist?
-        # generate an etag for client-side caching.
-        etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")
-        unless (env["HTTP_IF_NONE_MATCH"] == etag and RefinerySetting.find_or_set(:themes_use_etags, false))
-          [200, {
-                  "Content-Type" => Rack::Mime.mime_type(file_path.extname),
-                  "ETag" => etag
-                }, file_path.open]
-        else
-          [304, {"Content-Type" => Rack::Mime.mime_type(file_path.extname)}, "Not Modified"]
-        end
+    relative_path = env["PATH_INFO"].gsub(/^\/theme\//, '')
+    if (env["PATH_INFO"]) =~ /^\/theme/ and (file_path=Rails.root.join("themes", RefinerySetting[:theme], relative_path)).exist?
+      unless ((etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")) == env["HTTP_IF_NONE_MATCH"])
+        env["PATH_INFO"] = relative_path
+        status, headers, body = Rack::File.new(Rails.root.join("themes", RefinerySetting[:theme])).call(env)
+        [status, headers.update({"ETag" => etag}), body]
       else
-        [404, {"Content-Type" => "text/html"}, ["Not Found"]]
+        [304, {"ETag" => etag}, []]
       end
     else
-      status, headers, response = @app.call(env)
-      [status, headers, response]
+      @app.call(env)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.11
+  version: 0.9.6.12
 platform: ruby
 authors: 
 - Resolve Digital