refinerycms-core 0.9.9.21 → 0.9.9.22

data/app/controllers/admin/dialogs_controller.rb

@@ -6,9 +6,9 @@ module Admin
         url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
 
         @iframe_src = if @dialog_type == 'image'
-          insert_admin_images_url(url_params.merge(:id => nil, :modal => true))
+          insert_admin_images_path(url_params.merge(:id => nil, :modal => true))
         elsif @dialog_type == 'link'
-          link_to_admin_pages_dialogs_url(url_params.merge(:id => nil))
+          link_to_admin_pages_dialogs_path(url_params.merge(:id => nil))
         end
 
         render :layout => false

data/app/views/shared/_google_analytics.html.erb

@@ -1,7 +1,7 @@
 <% unless refinery_user? or
   (page_code = RefinerySetting.find_or_set(:analytics_page_code, 'UA-xxxxxx-x').to_s.strip) =~ /^(UA-xxxxxx-x)?$/ -%>
 <!-- asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet -->
-<script>var _gaq=[['_setAccount','<%= page_code %>'],['_trackPageview']];(function(d,t){
+<script>var _gaq=[['_setAccount','<%= page_code %>'],['_trackPageview'],['_trackPageLoadTime']];(function(d,t){
 var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
 g.async=1;g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)
 }(document,'script'))</script>

data/app/views/shared/_header.html.erb

@@ -3,5 +3,6 @@
 </h1>
 <%= render(:partial => "/shared/menu", :locals => {
              :dom_id => 'menu',
-             :css => 'menu'
+             :css => 'menu',
+             :roots => @menu_pages
            }) %>

data/app/views/shared/_menu.html.erb

@@ -2,17 +2,20 @@
   dom_id ||= 'menu'
   caching = (cache_menu ||= RefinerySetting.find_or_set(:cache_menu, false))
   cache_key = [Refinery.base_cache_key, 'pages_menus', dom_id, Globalize.locale].join('_')
-  # cache the pages first
-  collection = if caching
-    Rails.cache.fetch(cache_key) { (collection ||= @menu_pages).to_a }
-  else
-    (collection ||= @menu_pages).to_a
-  end
 
   # cache the generation of the menu based on the pages.
   cache_if(caching, ([cache_key, cache_path ||= request.path].join('_'))) do
+    # cache the pages first
+    if caching
+      collection = Rails.cache.fetch(cache_key) { (collection ||= @menu_pages).to_a }
+      roots = local_assigns[:roots] || Rails.cache.fetch([cache_key, "roots"].join("_")) { roots = collection.select{|c| c.parent_id.nil?} } unless roots
+    else
+      collection ||= @menu_pages
+      roots = local_assigns[:roots] || collection.select{|c| c.parent_id.nil?}
+    end
+
     # Select top menu items unless 'roots' is supplied.
-    if (roots ||= collection.select{|c| c.parent_id.nil?}).present?
+    if roots.present?
       css = [(css || 'menu'), 'clearfix'].flatten.join(' ')
       hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) if hide_children.nil?
   -%>
@@ -23,10 +26,8 @@
                      :locals => {
                        :hide_children => hide_children,
                        :sibling_count => (roots.length - 1),
-                       :collection => collection,
                        :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
-                     }
-          -%>
+                     } -%>
         </ul>
       </nav>
   <% end -%>

data/app/views/shared/_menu_branch.html.erb

@@ -2,9 +2,9 @@
   if !!local_assigns[:apply_css] and (classes = menu_branch_css(local_assigns)).any?
     css = "class='#{classes.join(' ')}'".html_safe
   end
-  dom_id = "id='item_#{menu_branch_counter}'".html_safe
+  dom_id = "id='item_#{menu_branch_counter}'".html_safe if menu_branch.parent_id.nil?
 
-  children = menu_branch.children.live.in_menu unless hide_children
+  children = menu_branch.children.live.in_menu unless hide_children or menu_branch.rgt == menu_branch.lft + 1
 -%>
 <li<%= ['', css, dom_id].compact.join(' ').gsub(/\ *$/, '').html_safe %>>
   <%= link_to menu_branch.title, menu_branch.url -%>
@@ -14,9 +14,7 @@
                  :collection => children,
                  :locals => {
                    :apply_css => local_assigns[:apply_css],
-                   :hide_children => !!hide_children,
-                   :collection => collection,
-                   :sibling_count => children.length - 1
+                   :hide_children => !!hide_children
                  } -%>
     </ul>
   <% end -%>

data/app/views/shared/admin/_form_actions.html.erb

@@ -32,7 +32,7 @@
     delete_title        ||= nil
     delete_confirmation ||= nil
     delete_button_id    ||= "delete_button"
-    delete_url          ||= eval("admin_#{f.object_name}_url(#{f.object.id})")
+    delete_url          ||= eval("admin_#{f.object_name}_path(#{f.object.id})")
   end
 
   paginate_collection = nil

data/app/views/shared/admin/_image_picker.html.erb

@@ -2,16 +2,17 @@
   description ||= 'image'
   thumbnail ||= 'medium'
   toggle_image_display ||= false
+  conditions ||= nil
   randomiser = rand(Time.now.yesterday.to_i * Time.now.to_i)
-  current_image_link_href = insert_admin_images_url(:dialog => true, :callback => "image_picker_#{randomiser}_changed",
-                                                    :width => 866, :height => 510)
+  current_image_link_href = insert_admin_images_path(:dialog => true, :callback => "image_picker_#{randomiser}_changed",
+                                                    :width => 866, :height => 510, :conditions => conditions)
   current_image_title = t('.change', :what =>  description.titleize)
 -%>
 <div id='image_picker_container_<%= randomiser %>'>
   <%= link_to t('.show'), '', :class => "current_image_toggler" if toggle_image_display %>
   <%= f.hidden_field field, :class => "current_image_id" -%>
 
-  <div class='current_image_container'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
+  <div class='current_image_container' style="margin-top: 10px<%= ";display: none" if toggle_image_display %>">
     <a class='current_image_link dialog' href="<%= current_image_link_href %>" style='border: 0px' title='<%= current_image_title  %>' name='<%= current_image_title %>'>
       <% unless image.nil? -%>
         <%= image_fu image, ::Image.user_image_sizes[thumbnail.to_sym],

data/app/views/shared/admin/_resource_picker.html.erb

@@ -1,15 +1,17 @@
 <%
+  conditions ||= nil
   insert_text = "<span id='no_resource_selected_#{field}' class='nothing_selected' #{"style='display: none;'" if resource.present?}>
                    #{t('.no_resource_selected')}
                  </span>".html_safe
-  insert_link = insert_admin_resources_url({
+  insert_link = insert_admin_resources_path({
                   :dialog => true,
                   :update_resource => "current_resource_#{field}",
                   :update_text => "current_resource_text_#{field}",
                   :callback => "resource_changed_#{field}",
                   :field => [f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, ""), field].join('_'),
                   :current_link => "#{resource.url if resource.present?}",
-                  :height => 480
+                  :height => 480,
+                  :conditions => conditions
                 })
               %>
 <%= f.hidden_field field %>
@@ -18,18 +20,16 @@
               :name => t('.name'),
               :id => "current_resource_link_#{field}"
   %>
-  <div id='current_resource_container_<%= field %>' <%= "style='display:none'" unless resource.present? %>>
-    <span id='current_resource_tag'><%= t('.current') %>:</span>
-    <span id='current_resource_text_<%= field %>'>
-      <%= "#{resource.title} (#{resource.file_name})" if resource.present? %>
-    </span>
-    <br/>
-    <%= link_to "#{refinery_icon_tag("page_white_put.png")}
-                 #{t('.download_current')}
-                 (<em>#{t('.opens_in_new_window')}</em>)".html_safe,
-                 "#{resource.url if resource.present?}",
-                 :id => "current_resource_#{field}",
-                 :target => "_blank" %>
+  <div id='current_resource_container_<%= field %>' style='margin-top: 10px<%= ";display: none" unless resource.present? %>'>
+    <%= link_to "#{refinery_icon_tag('page_white_put.png')} ".html_safe +
+                content_tag(
+                  :span,
+                  "#{resource.title} (#{resource.file_name})",
+                  :id => "current_resource_text_#{field}"
+                ),
+                resource.url,
+                :id => "current_resource_#{field}",
+                :target => "_blank" if resource.present? %>
   </div>
   <br/>
   <%= link_to t('.remove_current'), "",

data/config/locales/de.yml

@@ -44,9 +44,9 @@ de:
         change: Klicken Sie hier, um ein Bild auszuwählen
         show: anzeigen
       resource_picker:
-        download_current: Aktuelles %{what} herunterladen
+        download_current: Datei herunterladen
         opens_in_new_window: Öffnet in einem neuen Fenster
-        remove_current: "Entferne aktuelles %{what}"
+        remove_current: "Entferne Datei"
         no_resource_selected: Es ist momentan keine Datei ausgewählt, klicken Sie hier, um eine hinzuzufügen.
         name: Datei hinzufügen
         current: Aktuelle Datei

data/config/locales/fi.yml

@@ -16,8 +16,8 @@ fi:
     continue: Jatka...
   admin:
     menu:
-      reorder_menu: Uudelleenjärjestä valikko
-      reorder_menu_done: Olen valmis
+      reorder_menu: Muuta valikon järjestystä
+      reorder_menu_done: Tallenna
     dialogs:
       show:
         save: Tallenna
@@ -58,7 +58,7 @@ fi:
         results_for: "Hakutulokset haulle '%{query}'"
         no_results: 'Valitettavasti mitään ei löytynyt'
       delete:
-        message: "Oletko varma, että haluat poistaa sivun '%{title}'?"
+        message: "Oletko varma, että haluat poistaa sisältöesineen '%{title}'?"
       error_messages:
         problems_in_following_fields: Seuraavissa kentissä oli virheitä
       help: apua

data/lib/gemspec.rb

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
-  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
+  s.add_dependency 'globalize3',                  '>= 0.1.0.beta2'
+  s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'rails',                       '~> 3.0.7'
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'

data/lib/generators/templates/.gitignore

@@ -78,7 +78,6 @@ capybara-*html
 # Always keep this section at the bottom.
 
 config/database.yml
-config/amazon_s3.yml
 config/rackspace_cloudfiles.yml
 your_*.*
 db/schema.rb

data/lib/refinery/activity.rb

@@ -30,7 +30,7 @@ module Refinery
     end
 
     def url
-      "#{self.url_prefix}#{@url ||= "admin_#{self.class.name.underscore.downcase}_url"}"
+      "#{self.url_prefix}#{@url ||= "admin_#{self.class.name.underscore.downcase}_path"}"
     end
 
     def class

data/lib/refinery/crud.rb

@@ -253,11 +253,11 @@ module Refinery
               0.upto((newlist ||= params[:ul]).length - 1) do |index|
                 hash = newlist[index.to_s]
                 moved_item_id = hash['id'].split(/#{singular_name}\\_?/)
-                @current_#{singular_name} = #{class_name}.find_by_id(moved_item_id)
+                @current_#{singular_name} = #{class_name}.where(:id => moved_item_id).first
 
                 if @current_#{singular_name}.respond_to?(:move_to_root)
                   if previous.present?
-                    @current_#{singular_name}.move_to_right_of(#{class_name}.find_by_id(previous))
+                    @current_#{singular_name}.move_to_right_of(#{class_name}.where(:id => previous).first)
                   else
                     @current_#{singular_name}.move_to_root
                   end
@@ -280,7 +280,7 @@ module Refinery
               0.upto(node['children'].length - 1) do |child_index|
                 child = node['children'][child_index.to_s]
                 child_id = child['id'].split(/#{singular_name}\_?/)
-                child_#{singular_name} = #{class_name}.find_by_id(child_id)
+                child_#{singular_name} = #{class_name}.where(:id => child_id).first
                 child_#{singular_name}.move_to_child_of(#{singular_name})
 
                 if child['children'].present?

data/lib/refinery/helpers/image_helper.rb

@@ -32,7 +32,7 @@ module Refinery
           unless geometry.nil? or !(split_geometry = geometry.to_s.split('#')).many? or !(split_geometry = split_geometry.first.split('x')).many?
             image_width, image_height = split_geometry
           else
-            image_with = nil
+            image_width = nil
             image_height = nil
           end
 

data/lib/refinery/helpers/menu_helper.rb

@@ -16,7 +16,7 @@ module Refinery
 
       # This was extracted from app/views/shared/_menu_branch.html.erb
       # to remove the complexity of that template by reducing logic in the view.
-      def css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count = nil, collection = [], selected_item = nil, warning = true)
+      def css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count = nil, collection = nil, selected_item = nil, warning = true)
         # DEPRECATION. Remove at version 1.1
         if warning
           warn "\n-- DEPRECATION WARNING --"
@@ -25,17 +25,29 @@ module Refinery
           warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
         end
 
+        if collection
+          warn "\n-- DEPRECATION WARNING --"
+          warn "The use of 'collection' is deprecated and will be removed at version 1.1."
+          warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
+        end
+
+        if selected_item
+          warn "\n-- DEPRECATION WARNING --"
+          warn "The use of 'selected_item' is deprecated and will be removed at version 1.1."
+          warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
+        end
+
         css = []
         css << "selected" if selected_page_or_descendant_page_selected?(menu_branch, collection, selected_item)
         css << "first" if menu_branch_counter == 0
-        css << "last" if menu_branch_counter == sibling_count
+        css << "last" if (sibling_count ? (menu_branch_counter == sibling_count - 1) : (menu_branch.rgt == menu_branch.parent.rgt - 1))
         css
       end
 
       # New method which accepts the local_assigns hash.
       # This maps to the older css_for_menu_branch method.
       def menu_branch_css(local_assigns)
-        options = {:collection => []}.merge(local_assigns)
+        options = local_assigns.dup
         options.update(:sibling_count => options[:menu_branch].shown_siblings.size) unless options[:sibling_count]
 
         css_for_menu_branch(options[:menu_branch],
@@ -49,14 +61,8 @@ module Refinery
       # Determines whether any page underneath the supplied page is the current page according to rails.
       # Just calls selected_page? for each descendant of the supplied page.
       # if you pass a collection it won't check its own descendants but use the collection supplied.
-      def descendant_page_selected?(page, collection = [], selected_item = nil)
-        if selected_item
-          warn "\n-- DEPRECATION WARNING --"
-          warn "The use of 'selected_item' is deprecated and will be removed at version 1.1."
-          warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
-        end
-
-        return false unless page.has_descendants?
+      def descendant_page_selected?(page, collection = nil, selected_item = nil)
+        return false if page.rgt == page.lft + 1
         return false unless selected_item.nil? or !selected_item.in_menu?
 
         page.descendants.any? { |descendant|
@@ -64,7 +70,7 @@ module Refinery
         }
       end
 
-      def selected_page_or_descendant_page_selected?(page, collection = [], selected_item = nil)
+      def selected_page_or_descendant_page_selected?(page, collection = nil, selected_item = nil)
         return true if selected_page?(page) || selected_item === page
         return true if descendant_page_selected?(page, collection, selected_item)
         false
@@ -87,6 +93,7 @@ module Refinery
           path == page.link_url or
           path == page.nested_path or
           URI.decode(path) == page.nested_path or
+          path == "/#{page.id}" or
           current_page?(page)
       end
 

data/lib/refinery/helpers/meta_helper.rb

@@ -47,7 +47,13 @@ module Refinery
           else
             obj.title
           end
-          title << link_to_if(options[:link] && obj.respond_to?(:url), obj_title, obj.url)
+
+          # Only link when the object responds to a url method.
+          if options[:link] && obj.respond_to?(:url)
+            title << link_to(obj_title, obj.url)
+          else
+            title << obj_title
+          end
         end
 
         final_title = title.pop

data/lib/refinerycms-core.rb

@@ -34,6 +34,10 @@ module Refinery
       def attach_to_application!
         ::Rails::Application.subclasses.each do |subclass|
           begin
+            # Fix Rake 0.9.0 issue
+            subclass.send :include, ::Rake::DSL if defined?(::Rake::DSL)
+
+            # Include our logic inside your logic
             subclass.send :include, ::Refinery::Application
           rescue
             $stdout.puts "Refinery CMS couldn't attach to #{subclass.name}."

data/public/javascripts/jquery/jquery.html5-placeholder-shim.js

@@ -1,88 +1,95 @@
 (function($) {
-	$.extend($,{ placeholder: {
-			browser_supported: function() {
-				return this._supported !== undefined ?
-					this._supported :
-					( this._supported = !!('placeholder' in $('<input type="text">')[0]) );
-			},
-			shim: function(opts) {
-				var config = {
-					color: '#888',
-					cls: '',
-					lr_padding:4,
-					selector: 'input[placeholder], textarea[placeholder]'
-				};
-				$.extend(config,opts);
-				!this.browser_supported() && $(config.selector)._placeholder_shim(config);
-			}
-	}});
+  // @todo Document this.
+  $.extend($,{ placeholder: {
+      browser_supported: function() {
+        return this._supported !== undefined ?
+          this._supported :
+          ( this._supported = !!('placeholder' in $('<input type="text">')[0]) );
+      },
+      shim: function(opts) {
+        var config = {
+          color: '#888',
+          cls: 'placeholder',
+          lr_padding:4,
+          selector: 'input[placeholder], textarea[placeholder]'
+        };
+        $.extend(config,opts);
+        !this.browser_supported() && $(config.selector)._placeholder_shim(config);
+      }
+  }});
 
-	$.extend($.fn,{
-		_placeholder_shim: function(config) {
-			function calcPositionCss(target)
-			{
-				var op = $(target).offsetParent().offset();
-				var ot = $(target).offset();
+  $.extend($.fn,{
+    _placeholder_shim: function(config) {
+      function calcPositionCss(target)
+      {
+        var op = $(target).offsetParent().offset();
+        var ot = $(target).offset();
 
-				return {
-					top: ot.top - op.top + ($(target).outerHeight() - $(target).height()) /2,
-					left: ot.left - op.left + config.lr_padding,
-					width: $(target).width() - config.lr_padding
-				};
-			}
-			return this.each(function() {
-				if( $(this).data('placeholder') ) {
-					var $ol = $(this).data('placeholder');
-					$ol.css(calcPositionCss($(this)));
-					return true;
-				}
-				
-				var possible_line_height = {};
-				if( $(this).css('height') != 'auto') {
-				  possible_line_height = { lineHeight: $(this).css('height') };
-				}
+        return {
+          top: ot.top - op.top + ($(target).outerHeight() - $(target).height()) /2,
+          left: ot.left - op.left + config.lr_padding,
+          width: $(target).width() - config.lr_padding
+        };
+      }
+      return this.each(function() {
+        if( $(this).data('placeholder') ) {
+          var $ol = $(this).data('placeholder');
+          $ol.css(calcPositionCss($(this)));
+          return true;
+        }
 
-				var ol = $('<label />')
-					.text($(this).attr('placeholder'))
-					.addClass(config.cls)
-					.css($.extend({
-						position:'absolute',
-						display: 'inline',
-						float:'none',
-						overflow:'hidden',
-						whiteSpace:'nowrap',
-						textAlign: 'left',
-						color: config.color,
-						cursor: 'text',
-						fontSize: $(this).css('font-size')
-					}, possible_line_height))
-					.css(calcPositionCss(this))
-					.attr('for', this.id)
-					.data('target',$(this))
-					.click(function(){
-						$(this).data('target').focus()
-					})
-					.insertBefore(this);
-				$(this)
-					.data('placeholder',ol)
-					.focus(function(){
-						ol.hide();
-					}).blur(function() {
-						ol[$(this).val().length ? 'hide' : 'show']();
-					}).triggerHandler('blur');
-				$(window)
-					.resize(function() {
-						var $target = ol.data('target')
-						ol.css(calcPositionCss($target))
-					});
-			});
-		}
-	});
+        var possible_line_height = {};
+        if( $(this).css('height') != 'auto') {
+          possible_line_height = { lineHeight: $(this).css('height') };
+        }
 
+        var ol = $('<label />')
+          .text($(this).attr('placeholder'))
+          .addClass(config.cls)
+          .css($.extend({
+            position:'absolute',
+            display: 'inline',
+            float:'none',
+            overflow:'hidden',
+            whiteSpace:'nowrap',
+            textAlign: 'left',
+            color: config.color,
+            cursor: 'text',
+            paddingTop: $(this).css('padding-top'),
+            paddingLeft: $(this).css('padding-left'),
+            fontSize: $(this).css('font-size'),
+            fontFamily: $(this).css('font-family'),
+            fontStyle: $(this).css('font-style'),
+            fontWeight: $(this).css('font-weight'),
+            textTransform: $(this).css('text-transform'),
+            zIndex: 99
+          }, possible_line_height))
+          .css(calcPositionCss(this))
+          .attr('for', this.id)
+          .data('target',$(this))
+          .click(function(){
+            $(this).data('target').focus()
+          })
+          .insertBefore(this);
+        $(this)
+          .data('placeholder',ol)
+          .focus(function(){
+            ol.hide();
+          }).blur(function() {
+            ol[$(this).val().length ? 'hide' : 'show']();
+          }).triggerHandler('blur');
+        $(window)
+          .resize(function() {
+            var $target = ol.data('target')
+            ol.css(calcPositionCss($target))
+          });
+      });
+    }
+  });
 })(jQuery);
 
-$(document).ready(function() {
-  if ($.placeholder) {
-    $.placeholder.shim();
+jQuery(document).add(window).bind('ready load', function() {
+  if (jQuery.placeholder) {
+    jQuery.placeholder.shim();
   }
 });

data/public/javascripts/refinery/admin.js

@@ -412,9 +412,12 @@ init_tooltips = function(args){
 var link_tester = {
   initialised: false
   , init: function(test_url, test_email) {
-    this.test_url    = test_url;
-    this.test_email  = test_email;
-    this.initialised = true;
+    
+    if (!this.initialised) {
+      this.test_url    = test_url;
+      this.test_email  = test_email;
+      this.initialised = true;
+    }
   },
 
   email: function(value, callback) {
@@ -479,13 +482,16 @@ var link_tester = {
 var link_dialog = {
   initialised: false
   , init: function(){
-    this.init_tabs();
-    this.init_resources_submit();
-    this.init_close();
-    this.page_tab();
-    this.web_tab();
-    this.email_tab();
-    this.initialised = true;
+    
+    if (!this.initialised) {
+      this.init_tabs();
+      this.init_resources_submit();
+      this.init_close();
+      this.page_tab();
+      this.web_tab();
+      this.email_tab();
+      this.initialised = true;
+    }
   },
 
   init_tabs: function(){
@@ -630,30 +636,33 @@ var link_dialog = {
 var page_options = {
   initialised: false
   , init: function(enable_parts, new_part_url, del_part_url){
-    // set the page tabs up, but ensure that all tabs are shown so that when wymeditor loads it has a proper height.
-    page_options.tabs = $('#page-tabs');
-    page_options.tabs.tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'});
-    page_options.tabs.find(' > ul li a').corner('top 5px');
-
-    part_shown = $('#page-tabs .page_part.field').not('.ui-tabs-hide');
-    $('#page-tabs .page_part.field').removeClass('ui-tabs-hide');
-
-    this.enable_parts = enable_parts;
-    this.new_part_url = new_part_url;
-    this.del_part_url = del_part_url;
-    this.show_options();
-    this.title_type();
-
-    $(document).ready($.proxy(function(){
-      // hide the tabs that are supposed to be hidden.
-      $('#page-tabs .page_part.field').not(this).addClass('ui-tabs-hide');
-      $('#page-tabs > ul li a').corner('top 5px');
-    }, part_shown));
-
-    if(this.enable_parts){
-      this.page_part_dialog();
+    
+    if (!this.initialised) {
+      // set the page tabs up, but ensure that all tabs are shown so that when wymeditor loads it has a proper height.
+      page_options.tabs = $('#page-tabs');
+      page_options.tabs.tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'});
+      page_options.tabs.find(' > ul li a').corner('top 5px');
+
+      part_shown = $('#page-tabs .page_part.field').not('.ui-tabs-hide');
+      $('#page-tabs .page_part.field').removeClass('ui-tabs-hide');
+
+      this.enable_parts = enable_parts;
+      this.new_part_url = new_part_url;
+      this.del_part_url = del_part_url;
+      this.show_options();
+      this.title_type();
+
+      $(document).ready($.proxy(function(){
+        // hide the tabs that are supposed to be hidden.
+        $('#page-tabs .page_part.field').not(this).addClass('ui-tabs-hide');
+        $('#page-tabs > ul li a').corner('top 5px');
+      }, part_shown));
+
+      if(this.enable_parts){
+        this.page_part_dialog();
+      }
+      this.initialised = true;
     }
-    this.initialised = true;
   },
 
   show_options: function(){
@@ -766,11 +775,14 @@ var image_dialog = {
   , callback: null
 
   , init: function(callback){
-    this.callback = callback;
-    this.init_tabs();
-    this.init_select();
-    this.init_actions();
-    this.initialised = true;
+    
+    if (!this.initialised) {
+      this.callback = callback;
+      this.init_tabs();
+      this.init_select();
+      this.init_actions();
+      this.initialised = true;
+    }
     return this;
   }
 
@@ -884,43 +896,46 @@ var image_dialog = {
 var list_reorder = {
   initialised: false
   , init: function() {
-    $('#reorder_action').click(list_reorder.enable_reordering);
-    $('#reorder_action_done').click(list_reorder.disable_reordering);
-    if(list_reorder.tree === false) {
-      list_reorder.sortable_list.find('li').addClass('no-nest');
-    }
-    list_reorder.sortable_list.nestedSortable({
-      disableNesting: 'no-nest',
-      forcePlaceholderSize: true,
-      handle: list_reorder.tree ? 'div' : null,
-      items: 'li',
-      opacity: .6,
-      placeholder: 'placeholder',
-      tabSize: 25,
-      tolerance: 'pointer',
-      toleranceElement: list_reorder.tree ? '> div' : null,
-      disabled: true,
-      start: function () {
-      },
-      change: function () {
-        if (list_reorder.tree) {
-          list_reorder.reset_branch_classes(this);
-        }
-      },
-      stop: function () {
-        if (list_reorder.tree) {
-          list_reorder.reset_branch_classes(this);
-        } else {
-          list_reorder.reset_on_off_classes(this);
+    
+    if (!this.initialised) {
+      $('#reorder_action').click(list_reorder.enable_reordering);
+      $('#reorder_action_done').click(list_reorder.disable_reordering);
+      if(list_reorder.tree === false) {
+        list_reorder.sortable_list.find('li').addClass('no-nest');
+      }
+      list_reorder.sortable_list.nestedSortable({
+        disableNesting: 'no-nest',
+        forcePlaceholderSize: true,
+        handle: list_reorder.tree ? 'div' : null,
+        items: 'li',
+        opacity: .6,
+        placeholder: 'placeholder',
+        tabSize: 25,
+        tolerance: 'pointer',
+        toleranceElement: list_reorder.tree ? '> div' : null,
+        disabled: true,
+        start: function () {
+        },
+        change: function () {
+          if (list_reorder.tree) {
+            list_reorder.reset_branch_classes(this);
+          }
+        },
+        stop: function () {
+          if (list_reorder.tree) {
+            list_reorder.reset_branch_classes(this);
+          } else {
+            list_reorder.reset_on_off_classes(this);
+          }
         }
+      });
+      if (list_reorder.tree) {
+        list_reorder.reset_branch_classes(list_reorder.sortable_list);
+      } else {
+        list_reorder.reset_on_off_classes(list_reorder.sortable_list);
       }
-    });
-    if (list_reorder.tree) {
-      list_reorder.reset_branch_classes(list_reorder.sortable_list);
-    } else {
-      list_reorder.reset_on_off_classes(list_reorder.sortable_list);
+      this.initialised = true;
     }
-    this.initialised = true;
   }
   , reset_on_off_classes: function(ul) {
     $("> li", ul).each(function(i, li) {
@@ -1005,13 +1020,16 @@ var image_picker = {
   }
 
   , init: function(new_options){
-    this.options = $.extend(this.options, new_options);
-    $(this.options.picker_container).find(this.options.remove_image_button)
-      .click($.proxy(this.remove_image, {container: this.options.picker_container, picker: this}));
-    $(this.options.picker_container).find(this.options.image_toggler)
-      .click($.proxy(this.toggle_image, {container: this.options.picker_container, picker: this}));
-
-    this.initialised = true;
+    
+    if (!this.initialised) {
+      this.options = $.extend(this.options, new_options);
+      $(this.options.picker_container).find(this.options.remove_image_button)
+        .click($.proxy(this.remove_image, {container: this.options.picker_container, picker: this}));
+      $(this.options.picker_container).find(this.options.image_toggler)
+        .click($.proxy(this.toggle_image, {container: this.options.picker_container, picker: this}));
+
+      this.initialised = true;
+    }
 
     return this;
   }
@@ -1060,8 +1078,11 @@ var resource_picker = {
   , callback: null
 
   , init: function(callback) {
-    this.callback = callback;
-    this.initialised = true;
+    
+    if (!this.initialised) {
+      this.callback = callback;
+      this.initialised = true;
+    }
   }
 };
 

data/public/javascripts/refinery/site_bar.js

@@ -3,7 +3,7 @@ if (typeof($) == 'function') {
     $logo = $('#site_bar_content #site_bar_refinery_cms_logo');
     $logo.css('left', ($('#site_bar_content').width() / 2) - ($logo.width() / 2));
 
-    $switch_anchor = $('#editor_switch a').not('.ie7 #editor_switch a, .ie6 #editor_swtich a');
+    $switch_anchor = $('#editor_switch a').not('.ie7 #editor_switch a, .ie6 #editor_switch a');
     if ($.isFunction($switch_anchor.corner)) {
       $switch_anchor.corner('6px');
     }

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

@@ -3759,7 +3759,8 @@ WYMeditor.XhtmlSaxListener = function()
   this._open_tags = {};
   this.validator = WYMeditor.XhtmlValidator;
   this._tag_stack = [];
-  this.avoided_tags = [];
+
+  this.avoided_tags = ['area'];
 
   this.entities = {
     ' ':' ','¡':'¡','¢':'¢',
@@ -3977,7 +3978,9 @@ WYMeditor.XhtmlSaxListener.prototype.inlineTag = function(tag, attributes)
 
 WYMeditor.XhtmlSaxListener.prototype.openUnknownTag = function(tag, attributes)
 {
-  //this.output += this.helper.tag(tag, attributes, true);
+  if(tag === 'area') {
+    this.output += this.helper.tag(tag, attributes, true);
+  }
 };
 
 WYMeditor.XhtmlSaxListener.prototype.closeBlockTag = function(tag)

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.21}
+  s.version           = %q{0.9.9.22}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-05-03}
+  s.date              = %q{2011-05-22}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '= 0.9.9.21'
-  s.add_dependency 'refinerycms-settings',        '= 0.9.9.21'
+  s.add_dependency 'refinerycms-base',            '= 0.9.9.22'
+  s.add_dependency 'refinerycms-settings',        '= 0.9.9.22'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
-  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
+  s.add_dependency 'globalize3',                  '>= 0.1.0.beta2'
+  s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'rails',                       '~> 3.0.7'
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.21
+  version: 0.9.9.22
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 Z
+date: 2011-05-22 00:00:00 +12:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-base
@@ -23,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -34,7 +35,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -78,18 +79,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0.beta
+        version: 0.1.0.beta2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: moretea-awesome_nested_set
+  name: awesome_nested_set
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.4"
+        version: "2.0"
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -472,6 +473,7 @@ files:
 - refinerycms-core.gemspec
 - spec/lib/refinery/plugin_spec.rb
 - spec/lib/refinery/plugins_spec.rb
+has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -495,10 +497,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Core engine for Refinery CMS
 test_files: []
 
-has_rdoc: