refinerycms 0.9.5.7 → 0.9.5.8

data/public/javascripts/refinery/dialog.js

@@ -33,7 +33,7 @@ FastInit.addOnLoad(function()
 		switch_area(selected);
 	}
 	
-	$$('.close_dialog').each(function(close) {
+	$$('#TB_window .close_dialog').each(function(close) {
 		close.observe('click', function(e)
 		{
 			if (parent && typeof(parent.tb_remove) == "function") {

data/public/javascripts/thickbox.js

@@ -129,7 +129,7 @@ function tb_show(caption, url, imageGroup, ajax_loaded_callback) {//function cal
 			TB_HEIGHT = imageHeight + 60;
 			jQuery("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
 			
-			jQuery(".close_dialog").click(tb_remove);
+			jQuery("#TB_window .close_dialog").click(tb_remove);
 			
 			if (!(TB_PrevHTML === "")) {
 				function goPrev(){
@@ -222,7 +222,7 @@ function tb_show(caption, url, imageGroup, ajax_loaded_callback) {//function cal
 					}
 			}
 					
-			jQuery(".close_dialog").click(tb_remove);
+			jQuery("#TB_window .close_dialog").click(tb_remove);
 			
 			if(url.indexOf('TB_inline') != -1){	
 				jQuery("#TB_ajaxContent").append(jQuery('#' + params['inlineId']).children());
@@ -306,7 +306,7 @@ function tb_showIframe(){
 
 function tb_remove() {
  	jQuery("#TB_imageOff").unbind("click");
-	jQuery(".close_dialog").unbind("click");
+	jQuery("#TB_window .close_dialog").unbind("click");
 	jQuery("#TB_window").fadeOut("fast",function(){jQuery('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();});
 	jQuery("#TB_load").remove();
 	if (typeof document.body.style.maxHeight == "undefined") {//if IE 6

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

@@ -1528,7 +1528,7 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
 	var dialogType = doc.getElementById('wym_dialog_type').value;
 	var replaceable = wym._selected_image ? jQuery(wym._selected_image) : jQuery(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
 
-	[dialog.select(".close_dialog"), $(doc.body).select(".close_dialog")].flatten().uniq().each(function(button)
+	[dialog.select("#TB_window .close_dialog"), $(doc.body).select("#TB_window .close_dialog")].flatten().uniq().each(function(button)
 	{
 		button.observe('click', function(e){this.close_dialog(e, true)}.bind(wym));
 	});

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

@@ -12,8 +12,7 @@
 	</div>
 	<div class='form-actions'>
 		<%= f.submit 'Save', :id => "submit_button" %>
-		or 
-		<%= link_to "Cancel", admin_images_url, :title => "Cancelling will lose all changes you've made to this image", :class => 'close_dialog' %>
+		<%= "or #{link_to "Cancel", admin_images_url, :title => "Cancelling will lose all changes you've made to this image", :class => "close_dialog"}" if !from_dialog? or @thickbox %>
 	</div>
 
   <% if @thickbox %>

data/vendor/plugins/inquiries/app/controllers/inquiries_controller.rb

@@ -1,41 +1,49 @@
 class InquiriesController < ApplicationController
-  
+
   before_filter :find_page, :only => [:create, :new]
-  
+
   def thank_you
     @page = Page.find_by_menu_match("^/inquiries/thank_you$", :include => [:parts, :slugs])
+    
+    respond_to do |wants|
+      wants.html
+    end
   end
-  
+
   def new
     @inquiry = Inquiry.new
+    
+    respond_to do |wants|
+      wants.html
+    end
   end
-  
+
   def create
     @inquiry = Inquiry.new(params[:inquiry])
-    
+
     if @inquiry.save
       begin
         InquiryMailer.deliver_notification(@inquiry, request)
       rescue
         logger.warn "There was an error delivering an inquiry notification.\n#{$!}\n"
       end
-      
+
       begin
         InquiryMailer.deliver_confirmation(@inquiry, request)
       rescue
         logger.warn "There was an error delivering an inquiry confirmation:\n#{$!}\n"
       end
-      
+
       redirect_to thank_you_inquiries_url
     else
       render :action => 'new'
     end
   end
-  
+
 protected
 
   def find_page
     @page = Page.find_by_link_url('/inquiries/new', :include => [:parts, :slugs])
   end
-  
+
 end

data/vendor/plugins/news/app/controllers/news_items_controller.rb

@@ -1,11 +1,21 @@
 class NewsItemsController < ApplicationController
-  
+
   before_filter :get_latest_posts
   before_filter :load_page, :only => [:index, :show]
-  
-	def show
-	  @news_item = NewsItem.find(params[:id], :conditions => ["publish_date < ?", Time.now])
-	end
+
+  def index
+    respond_to do |wants|
+      wants.html
+    end
+  end
+
+  def show
+    @news_item = NewsItem.find(params[:id], :conditions => ["publish_date < ?", Time.now])
+    
+    respond_to do |wants|
+     wants.html
+    end
+  end
 
 protected
 
@@ -16,5 +26,5 @@ protected
   def load_page
     @page = Page.find_by_link_url("/news", :include => [:parts, :slugs])
   end
-  
+
 end

data/vendor/plugins/pages/app/controllers/pages_controller.rb

@@ -3,18 +3,26 @@ class PagesController < ApplicationController
   def home
     @page = Page.find_by_link_url("/", :include => [:parts, :slugs])
     error_404 if @page.nil?
+    
+    respond_to do |wants|
+      wants.html
+    end
   end
 
   def show
     @page = Page.find(params[:id], :include => [:parts, :slugs])
-		
+
     error_404 unless @page.live? or (logged_in? and current_user.authorized_plugins.include?("Pages"))
-		
+
     # if the admin wants this to be a "placeholder" page which goes to its first child, go to that instead.
     if @page.skip_to_first_child
       first_live_child = @page.children.find_by_draft(false, :order => "position ASC")
       redirect_to first_live_child.url unless first_live_child.nil?
     end
+    
+    respond_to do |wants|
+      wants.html
+    end
   end
 
 end

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

@@ -116,7 +116,10 @@
 	</div>
 	<div class='form-actions'>
 		<%= f.submit 'Save', :id => "submit_button", :class => "wymupdate" %> 
-		or 
+		or
+		<%= hidden_field_tag :continue_editing, false %>
+		<%= f.submit 'Save &amp; Continue Editing', :id => "submit_continue_button", :class => "wymupdate" %> 
+		or
 		<%= link_to "Cancel", admin_pages_url, :title => "Cancelling will lose all changes you've made to this page", :id => "cancel_button", :class => "close_dialog" %>
 	</div>
 	<div id='new_page_part_dialog' style='display: none'>
@@ -160,6 +163,10 @@
 			}
 		});
 		
+		$('submit_continue_button').observe("click", function(e) {
+		  $('continue_editing').value = true;
+		});
+		
 <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
 		$('add_page_part').observe('click', function(e) {
 			tb_show('Create Content Section', '#?auto_size_content=true&draggable=true&titlebar=true&inlineId=new_page_part_dialog&TB_inline=true&modal=true');

data/vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb

@@ -6,6 +6,7 @@
 	content_for :head do 
 %>
 <script type='text/javascript'>
+  reordering_button_enabled = true;
 	FastInit.addOnLoad(function()
 	{
 		$('reorder_action').observe('click', enable_reordering);
@@ -14,17 +15,15 @@
 	
 	disable_reordering = function(e)
 	{
-		$('<%= list_id %>').removeClassName('reordering');
+	  if (reordering_button_enabled) {
+  		$('<%= list_id %>').removeClassName('reordering');
 		
-		Sortable.destroy("<%= list_id %>");
+  		Sortable.destroy("<%= list_id %>");
 		
-		$('reorder_action_done').hide();
-		$('reorder_action').show();
-		
-		if (e)
-		{
-			e.stop();
-		}
+  		$('reorder_action_done').hide();
+  		$('reorder_action').show();
+	  }
+	  if (e) { e.stop(); }
 	}
 	
 	enable_reordering = function(e)
@@ -50,11 +49,13 @@
 			, scroll: window
 			, tree: <%= tree %>
 			, onUpdate:function() {
+			  reordering_button_enabled = false;
 				new Ajax.Updater('<%= list_id %>', '<%= update_url %>', 
 				{
 					asynchronous:true
 					, evalScripts:true
 					, parameters: Sortable.serialize('<%= list_id %>') + '&tree=<%= tree %>' + '&authenticity_token=' + encodeURIComponent($('reorder_authenticity_token').value)
+					, onComplete: function(e) { reordering_button_enabled = true; }
 				});
 			}
 		});
@@ -62,10 +63,7 @@
 		$('reorder_action').hide();
 		$('reorder_action_done').show();
 		
-		if (e) 
-		{
-			e.stop();
-		}
+		if (e) { e.stop(); }
 	}
 </script>
 <% end %>

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

@@ -37,7 +37,11 @@ module Crud
           @#{singular_name} = #{class_name}.create(params[:#{singular_name}])
           if @#{singular_name}.valid?
             flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully created."
-            redirect_to :action => 'index'
+            unless params[:continue_editing] =~ /true|on|1/
+              redirect_to admin_#{plural_name}_url
+            else
+              redirect_to :back
+            end
           else 
             render :action => 'new'
           end
@@ -51,7 +55,11 @@ module Crud
           @#{singular_name}.update_attributes(params[:#{singular_name}])
           if @#{singular_name}.valid?
             flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully updated."
-            redirect_to admin_#{plural_name}_url
+            unless params[:continue_editing] =~ /true|on|1/
+              redirect_to admin_#{plural_name}_url
+            else
+              redirect_to :back
+            end
           else
             render :action => 'edit'
           end

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

@@ -19,7 +19,7 @@ protected
   def error_404
     @page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])
     @page[:body] = @page[:body].gsub(/href=(\'|\")\/(\'|\")/, "href='/admin'").gsub("home page", "Dashboard")
-    render :template => "/pages/show"
+    render :template => "/pages/show", :status => 404
   end
   
   def restrict_plugins

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

@@ -13,7 +13,7 @@ class Refinery::ApplicationController < ActionController::Base
 
 	  def error_404
 	    @page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])
-	    render :template => "/pages/show"
+	    render :template => "/pages/show", :status => 404
 	  end
 
 	  def home_page?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.7
+  version: 0.9.5.8
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 +13:00
+date: 2009-11-16 00:00:00 +13:00
 default_executable: refinery
 dependencies: []