refinerycms 0.9.2.2 → 0.9.3

data/public/javascripts/wymeditor/boot_wym.js

@@ -1,10 +1,15 @@
-jQuery.noConflict(); 
+jQuery.noConflict();
+var wymeditor_inputs = [];
 jQuery(function()
 {
 	var wym_editors_loaded = 0;
-	jQuery('.wymeditor').wymeditor(
+  wymeditor_inputs = jQuery('.wymeditor');
+  wymeditor_inputs.hide();
+	wymeditor_inputs.wymeditor(
 	{
 	  skin: 'refinery'
+	  , basePath: "/javascripts/wymeditor/"
+	  , wymPath: "/javascripts/wymeditor/jquery.refinery.wymeditor.js"
 		, cssSkinPath: "/stylesheets/wymeditor/skins/"
 		, jsSkinPath: "/javascripts/wymeditor/skins/"
 		,	langPath: "/javascripts/wymeditor/lang/"
@@ -136,9 +141,8 @@ jQuery(function()
 	  , postInit: function(wym)
 	  {
 			wym._iframe.style.height = wym._element.height() + "px";
-			
 			wym_editors_loaded += 1;			
-			if(WYMeditor.INSTANCES.length == wym_editors_loaded){
+			if(WYMeditor.INSTANCES.length == wym_editors_loaded){	  
 				WYMeditor.loaded();
 			}
 		}
@@ -146,18 +150,5 @@ jQuery(function()
 
 });
 
-WYMeditor.XhtmlParser.prototype.normalizeTag = function(tag)
-{
-    // hack to solve unknown issue of whole page being eaten by safari on dialog open. (TODO: revisit)
-    if (jQuery.browser.safari && tag.id == "content")
-    {}
-    else
-    {
-        tag = tag.replace(/^([\s<\/>]*)|([\s<\/>]*)$/gm,'').toLowerCase();
-    }
-    var tags = this._Listener.getTagReplacements();
-    return tags[tag] ? tags[tag] : tag;
-};
-
 // custom function added by us to hook into when all wymeditor instances on the page have finally loaded:
 WYMeditor.loaded = function(){}

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

@@ -30,17 +30,16 @@ if(!WYMeditor) var WYMeditor = {};
 
 //Wrap the Firebug console in WYMeditor.console
 (function() {
-		if ( !window.console || !console.firebug ) {
-				var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
-				"group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
+    if ( !window.console || !console.firebug ) {
+        var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
+        "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
 
-				WYMeditor.console = {};
-				for (var i = 0; i < names.length; ++i)
-						WYMeditor.console[names[i]] = function() {}
+        WYMeditor.console = {};
+        for (var i = 0; i < names.length; ++i)
+            WYMeditor.console[names[i]] = function() {}
 
-		} else WYMeditor.console = window.console;
+    } else WYMeditor.console = window.console;
 })();
-
 jQuery.extend(WYMeditor, {
 
 /*
@@ -238,7 +237,6 @@ jQuery.extend(WYMeditor, {
 		*/
 
 		editor : function(elem, options) {
-
 				/*
 						Constructor: WYMeditor.editor
 
@@ -271,31 +269,23 @@ jQuery.extend(WYMeditor, {
 				//store the HTML option, if any
 				if(this._options.html) this._html = this._options.html;
 				//get or compute the base path (where the main JS file is located)
-				this._options.basePath = this._options.basePath
-				|| this.computeBasePath();
+				this._options.basePath = this._options.basePath || this.computeBasePath();
 				//get or set the skin path (where the skin files are located)
-				this._options.skinPath = this._options.skinPath
-				|| this._options.basePath + WYMeditor.SKINS_DEFAULT_PATH
-					 + this._options.skin + '/';
+				this._options.skinPath = this._options.skinPath	|| this._options.basePath + WYMeditor.SKINS_DEFAULT_PATH + this._options.skin + '/';
 				// set css and js skin paths
 				this._options.cssSkinPath = (this._options.cssSkinPath || this._options.skinPath) + this._options.skin + "/";
 				this._options.jsSkinPath = (this._options.jsSkinPath || this._options.skinPath) + this._options.skin + "/";
 				//get or compute the main JS file location
-				this._options.wymPath = this._options.wymPath
-				|| this.computeWymPath();
+				this._options.wymPath = this._options.wymPath || this.computeWymPath();
 				//get or set the language files path
-				this._options.langPath = this._options.langPath
-				|| this._options.basePath + WYMeditor.LANG_DEFAULT_PATH;
+				this._options.langPath = this._options.langPath || this._options.basePath + WYMeditor.LANG_DEFAULT_PATH;
 				//get or set the designmode iframe's base path
-				this._options.iframeBasePath = this._options.iframeBasePath
-				|| this._options.basePath + WYMeditor.IFRAME_DEFAULT;
+				this._options.iframeBasePath = this._options.iframeBasePath || this._options.basePath + WYMeditor.IFRAME_DEFAULT;
 				//get or compute the jQuery JS file location
-				this._options.jQueryPath = this._options.jQueryPath
-				|| this.computeJqueryPath();
+				this._options.jQueryPath = this._options.jQueryPath || this.computeJqueryPath();
 
 				//initialize the editor instance
 				this.init();
-	
 	}
 
 });
@@ -1165,7 +1155,9 @@ WYMeditor.editor.prototype.replaceStrings = function(sVal) {
 			eval(jQuery.ajax({url:this._options.langPath
 				+ this._options.lang + '.js', async:false}).responseText);
 		} catch(e) {
+		  if (WYMeditor.console) {
 				WYMeditor.console.error("WYMeditor: error while parsing language file.");
+			}
 				return sVal;
 		}
 	}
@@ -1394,27 +1386,29 @@ WYMeditor.editor.prototype.addCssRules = function(doc, aCss) {
 /********** CONFIGURATION **********/
 
 WYMeditor.editor.prototype.computeBasePath = function() {
-	return jQuery(jQuery.grep(jQuery('script'), function(s){
-		return (s.src && s.src.match(/jquery\.refinery\.wymeditor(\.pack){0,1}\.js(\?.*)?$/ ))
-	})).attr('src').replace(/jquery\.refinery\.wymeditor(\.pack){0,1}\.js(\?.*)?$/, '');
+  if ((script_path = this.computeWymPath()) != null) {
+    if ((src_parts = script_path.split('/')).length > 1) { src_parts.pop(); }
+    return src_parts.join('/') + "/";
+  }
+  else {
+    return null;
+  }
 };
 
 WYMeditor.editor.prototype.computeWymPath = function() {
-	return jQuery(jQuery.grep(jQuery('script'), function(s){
-		return (s.src && s.src.match(/jquery\.refinery\.wymeditor(\.pack){0,1}\.js(\?.*)?$/ ))
-	})).attr('src');
+  return jQuery('script[src*=jquery.refinery.wymeditor]').attr('src');
 };
 
 WYMeditor.editor.prototype.computeJqueryPath = function() {
-	return jQuery(jQuery.grep(jQuery('script'), function(s){
-		return (s.src && s.src.match(/jquery(-(.*)){0,1}(\.pack){0,1}\.js(\?.*)?$/ ))
-	})).attr('src');
+  return jQuery(jQuery.grep(jQuery('script'), function(s){
+    return (s.src && s.src.match(/jquery(-(.*)){0,1}(\.pack|\.min|\.packed)?\.js(\?.*)?$/ ))
+  })).attr('src');
 };
 
 WYMeditor.editor.prototype.computeCssPath = function() {
-	return jQuery(jQuery.grep(jQuery('link'), function(s){
-	 return (s.href && s.href.match(/wymeditor\/skins\/(.*)screen\.css(\?.*)?$/ ))
-	})).attr('href');
+  return jQuery(jQuery.grep(jQuery('link'), function(s){
+   return (s.href && s.href.match(/wymeditor\/skins\/(.*)screen\.css(\?.*)?$/ ))
+  })).attr('href');
 };
 
 WYMeditor.editor.prototype.configureEditorUsingRawCss = function() {

data/vendor/plugins/authentication/init.rb

@@ -2,7 +2,7 @@ Refinery::Plugin.register do |plugin|
   plugin.title = "Users"
   plugin.description = "Manage users"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/(users)/
+  plugin.menu_match = /admin\/users$/
   plugin.activity = {
     :class => User, 
     :url_prefix => "edit_", 

data/vendor/plugins/images/init.rb

@@ -3,6 +3,6 @@ Refinery::Plugin.register do |plugin|
 	plugin.title = "Images"
 	plugin.description = "Manage images"
 	plugin.version = 1.0
-	plugin.menu_match = /admin\/(images)|(image_dialogs)/
+	plugin.menu_match = /admin\/((images)|(image_dialogs))$/
 	plugin.activity = {:class => Image, :title => 'title', :url_prefix => 'edit', :conditions => "parent_id IS NULL", :created_image => "image_add.png", :updated_image => "image_edit.png"}
 end

data/vendor/plugins/inquiries/init.rb

@@ -3,7 +3,7 @@ Refinery::Plugin.register do |plugin|
 	plugin.title = "Inquiries"
 	plugin.description = "Provides a contact form and stores inquiries"
 	plugin.version = 1.0
-	plugin.menu_match = /admin\/((inquiries)|(inquiry_settings))/
+	plugin.menu_match = /admin\/((inquiries)|(inquiry_settings))$/
 	plugin.activity = [
 	  {:class => Inquiry, :title => "name", :url_prefix => "", :created_image => "user_comment.png", :updated_image => "user_edit.png"}, 
 	  {:class => InquirySetting, :url_prefix => "edit", :title => 'name', :url_prefix => 'edit', :created_image => "user_comment.png", :updated_image => "user_edit.png"}

data/vendor/plugins/news/init.rb

@@ -3,5 +3,6 @@ Refinery::Plugin.register do |plugin|
 	plugin.title = "News"
 	plugin.description = "Provides a blog-like news section"
 	plugin.version = 1.0
+	plugin.menu_match = /admin\/((news)|(news_items))$/
 	plugin.activity = {:class => NewsItem, :title => 'title', :url_prefix => 'edit'}
 end

data/vendor/plugins/pages/app/views/admin/pages/_form.html.erb

@@ -10,7 +10,7 @@
   	  <ul id='page_parts'>
 			<% @page.parts.each do |p| %>
 				<li class='tab'>
-					<%= link_to p.title.titleize, "#part_#{p.title}" %>
+					<%= link_to p.title.titleize, "#part_#{p.title}", :class => ((@page.parts.index(p) == 0) ? "active" : nil) %>
 				</li>
 			<% end %>
   		</ul>
@@ -133,7 +133,7 @@
 		$('custom_title_' + type).show();
 	}
 	
-	FastInit.addOnLoad(function(){
+	FastInit.addOnLoad(function(){		
 		$('toggle_advanced_options').observe('click', function(e)
 		{
 			$('more_options').toggle();

data/vendor/plugins/pages/init.rb

@@ -3,6 +3,6 @@ Refinery::Plugin.register do |plugin|
 	plugin.title = "Pages"
 	plugin.description = "Manage content pages"
 	plugin.version = 1.0
-	plugin.menu_match = /admin\/(pages)|(page_dialogs)|(page_parts)/
+	plugin.menu_match = /admin\/((pages)|(page_dialogs)|(page_parts))$/
 	plugin.activity = {:class => Page, :url_prefix => "edit_", :title => "title", :created_image => "page_add.png", :updated_image => "page_edit.png"}
 end

data/vendor/plugins/refinery/lib/refinery/plugin.rb

@@ -12,7 +12,7 @@ module Refinery
     end
 
     def highlighted?(params)
-      params[:controller] =~ menu_match
+      params[:controller] =~ self.menu_match
     end
   
     def activity
@@ -32,7 +32,7 @@ module Refinery
   	end
 	
   	def menu_match
-  		@menu_match ||= /admin\/#{self.title.downcase}/
+  		@menu_match ||= /admin\/#{self.title.gsub(" ", "_").downcase}$/
   	end
   	
   	def hide_from_menu

data/vendor/plugins/refinery_settings/init.rb

@@ -4,6 +4,6 @@ Refinery::Plugin.register do |plugin|
 	plugin.description = "Manage Refinery settings"
 	plugin.version = 1.0
 	plugin.url = "/admin/settings"
-	plugin.menu_match = /admin\/((refinery_settings)|(settings))/
+	plugin.menu_match = /admin\/((refinery_settings)|(settings))$/
 	plugin.activity = {:class => RefinerySetting, :title => 'title', :url_prefix => 'edit', :created_image => "cog_add.png", :updated_image => "cog_edit.png"}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.2.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 +13:00
+date: 2009-10-12 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency