refinerycms 0.9.5.25 → 0.9.5.26

data/VERSION

@@ -1 +1 @@
-0.9.5.25
+0.9.5.26

data/config/environments/production.rb

@@ -17,3 +17,6 @@ config.action_controller.perform_caching             = true
 
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
+
+# We don't really need all the other stuff:
+config.log_level = :warn

data/public/javascripts/refinery/boot_wym.js

@@ -1,13 +1,14 @@
-jQuery.noConflict();
 var wymeditor_inputs = [];
 var wymeditors_loaded = 0;
-var wymeditor_boot_options = {
+// supply custom_wymeditor_boot_options if you want to override anything here.
+if (typeof(custom_wymeditor_boot_options) == "undefined") { custom_wymeditor_boot_options = {}; }
+var wymeditor_boot_options = jQuery.extend({
   skin: 'refinery'
   , basePath: "/javascripts/wymeditor/"
   , wymPath: "/javascripts/wymeditor/jquery.refinery.wymeditor.js"
   , cssSkinPath: "/stylesheets/wymeditor/skins/"
   , jsSkinPath: "/javascripts/wymeditor/skins/"
-  ,  langPath: "/javascripts/wymeditor/lang/"
+  , langPath: "/javascripts/wymeditor/lang/"
   , iframeBasePath: '/'
   , toolsItems: [
     {'name': 'Bold', 'title': 'Bold', 'css': 'wym_tools_strong'}
@@ -19,7 +20,7 @@ var wymeditor_boot_options = {
     ,{'name': 'InsertImage', 'title': 'Image', 'css': 'wym_tools_image'}
     ,{'name': 'InsertTable', 'title': 'Table', 'css': 'wym_tools_table'}
     ,{'name': 'ToggleHtml', 'title': 'HTML', 'css': 'wym_tools_html'}
-      ,{'name': 'Paste', 'title': 'Paste_From_Word', 'css': 'wym_tools_paste'}
+    ,{'name': 'Paste', 'title': 'Paste_From_Word', 'css': 'wym_tools_paste'}
   ]
 
   ,toolsHtml: "<ul class='wym_tools wym_section'>" + WYMeditor.TOOLS_ITEMS + WYMeditor.CLASSES + "</ul>"
@@ -140,7 +141,7 @@ var wymeditor_boot_options = {
       WYMeditor.loaded();
     }
   }
-};
+}, custom_wymeditor_boot_options);
 
 // custom function added by us to hook into when all wymeditor instances on the page have finally loaded:
 WYMeditor.loaded = function(){};

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -4,6 +4,7 @@
     <%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery
   </title>
   <%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips' %>
+  <%= render :partial => "/shared/admin/head_before_javascript_libraries" %>
   <% if RefinerySetting.find_or_set(:use_google_ajax_libraries, true) %>
     <% unless local_request? %>
       <script type='text/javascript' src="http://www.google.com/jsapi"></script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.25
+  version: 0.9.5.26
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 +13:00
+date: 2009-12-14 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -462,6 +462,7 @@ files:
 - vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_error_messages_for.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb
+- vendor/plugins/refinery/app/views/shared/admin/_head_before_javascript_libraries.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb