refinerycms 0.9.5.12 → 0.9.5.13

data/db/schema.rb

@@ -51,6 +51,7 @@ ActiveRecord::Schema.define(:version => 20091109012126) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "publish_date"
+    t.text     "blurb"
   end
 
   create_table "page_parts", :force => true do |t|

data/public/javascripts/refinery/admin.js

@@ -1,8 +1,9 @@
 init_tooltips = function(){
-	$$('a[title]', '#image_grid img[title]').each(function(element)
+    arguments = arguments.length > 0 ? arguments : ['a[title]', '#image_grid img[title]'];
+	$$(arguments).each(function(element)
 	{
 		new Tooltip(element, {mouseFollow:false, delay: 0, opacity: 1, appearDuration:0, hideDuration: 0, rounded: false});
-	})
+	});
 };
 
 FastInit.addOnLoad(function()

data/public/javascripts/refinery/boot_wym.js

@@ -66,9 +66,8 @@ var wymeditor_boot_options = {
                
 	, iframeHtml:   
 		"<div class='wym_iframe wym_section'>"
-     	+ "<iframe src='" + WYMeditor.IFRAME_BASE_PATH + "wymiframe' frameborder='0'"
-      	+ "onload='this.contentWindow.parent.WYMeditor.INSTANCES[" + WYMeditor.INDEX + "].initIframe(this); init_tooltips();'>"
-			+ "</iframe>"
+     	+ "<iframe id='WYMeditor_" + WYMeditor.INDEX + "' src='" + WYMeditor.IFRAME_BASE_PATH + "wymiframe' frameborder='0'"
+      	+ " onload='this.contentWindow.parent.WYMeditor.INSTANCES[" + WYMeditor.INDEX + "].initIframe(this);'></iframe>"
 		+"</div>"
 
 	, dialogImageHtml: ""

data/public/javascripts/refinery/tooltips.js

@@ -3,50 +3,49 @@ var Tooltip = Class.create();
 Tooltip.prototype = {
 	initialize: function(el, options) {
 		this.el = $(el);
-		this.el.tooltip = this;
-		this.initialized = false;
-		this.setOptions(options);
-		this.options.relativeTo = $(this.options.relativeTo);
-		
-		// Event handlers
-		this.showEvent = this.show.bindAsEventListener(this);
-		this.hideEvent = this.hide.bindAsEventListener(this);
-		this.updateEvent = this.update.bindAsEventListener(this);
-		Event.observe(this.el, "mouseover", this.showEvent );
-		Event.observe(this.el, "mouseout", this.hideEvent );
-		
 		// Removing title from DOM element to avoid showing it
-		this.content = this.el.title;
-		this.el.title = "";
+    	if ((this.content = this.el.title) != null && this.content.length > 0) {
+    		this.el.tooltip = this;
+    		this.initialized = false;
+    		this.setOptions(options);
+    		this.options.relativeTo = $(this.options.relativeTo);
+		
+    		// Event handlers
+    		this.showEvent = this.show.bindAsEventListener(this);
+    		this.hideEvent = this.hide.bindAsEventListener(this);
+    		this.updateEvent = this.update.bindAsEventListener(this);
+    		Event.observe(this.el, "mouseover", this.showEvent );
+    		Event.observe(this.el, "mouseout", this.hideEvent );
 
-		// If descendant elements has 'alt' attribute defined, clear it
-		this.el.descendants().each(function(el){
-			if(Element.readAttribute(el, 'alt'))
-				el.alt = "";
-		});
+    		// If descendant elements has 'alt' attribute defined, clear it
+    		this.el.descendants().each(function(el){
+    			if(Element.readAttribute(el, 'alt'))
+    				el.alt = "";
+    		});
 		
-		rounding = this.options.rounded ? ["xb1", "xb2", "xb3", "xb4"] : [];
+    		rounding = this.options.rounded ? ["xb1", "xb2", "xb3", "xb4"] : [];
 		
-		// Building tooltip container
-		tooltipClassName = this.options.rounded ? "tooltip tooltip-rounded" : "tooltip tooltip-square";
-		this.tooltip = new Element("div", {style: 'display:none'}).addClassName(tooltipClassName);
+    		// Building tooltip container
+    		tooltipClassName = this.options.rounded ? "tooltip tooltip-rounded" : "tooltip tooltip-square";
+    		this.tooltip = new Element("div", {style: 'display:none'}).addClassName(tooltipClassName);
 
-		xtop = new Element("div").addClassName("xtop");
-		rounding.each(function(rounder)
-		{
-			xtop.insert(new Element("div").addClassName(rounder));
-		});
-		this.tooltip.insert(xtop);
-		this.tooltip.insert(new Element("div").addClassName("xboxcontent").update(this.content));
+    		xtop = new Element("div").addClassName("xtop");
+    		rounding.each(function(rounder)
+    		{
+    			xtop.insert(new Element("div").addClassName(rounder));
+    		});
+    		this.tooltip.insert(xtop);
+    		this.tooltip.insert(new Element("div").addClassName("xboxcontent").update(this.content));
 
-		xbottom = new Element("div").addClassName("xbottom");
-		rounding.reverse(false).each(function(rounder)
-		{
-			xbottom.insert(new Element("div").addClassName(rounder));
-		});
-		this.tooltip.insert(xbottom);
+    		xbottom = new Element("div").addClassName("xbottom");
+    		rounding.reverse(false).each(function(rounder)
+    		{
+    			xbottom.insert(new Element("div").addClassName(rounder));
+    		});
+    		this.tooltip.insert(xbottom);
 		
-		return this;
+    		return this;
+		}
 	},
 	setOptions: function(options) {
 		this.options = {
@@ -70,7 +69,7 @@ Tooltip.prototype = {
 		
 		if (!this.insertedIntoDocument)
 		{
-			document.body.insertBefore(this.tooltip, document.body.childNodes[0]);
+			$('tooltip_container').insert(this.tooltip);
 		
 			this.options.width = this.tooltip.getWidth() + 2 // adding 2 seems to display tooltips on one line in FF, yay;
 			this.tooltip.style.minWidth = (this.options.width < this.options.maxWidth ? this.options.width : this.options.maxWidth) + 'px'; // IE7 needs width to be defined. Use min-width because we can sacrifice older browser compatibility.

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

@@ -1223,19 +1223,19 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
 	
 	selected = this.selected();
 	if (dialogType == WYMeditor.DIALOG_LINK && jQuery.browser.mozilla) {
-	  selection = this._iframe.contentWindow.getSelection();
-	  matches = selected.innerHTML.match(new RegExp(selection.anchorNode.textContent + "(.*)" + selection.focusNode.textContent));
-	  if (matches != null && matches.length > 0 && (possible_anchor_tag = matches.last()) != null) {
-      if ((href = possible_anchor_tag.match(/href="([^"]*)"/).last()) != null) {
-        possible_anchors = this._iframe.document().getElementsByTagName('a');
-        for (i=0;i<possible_anchors.length;i++) {
-          if ((possible_match = possible_anchors[i]).innerHTML == selection) {
-            selected = possible_match;
-          }
-        }
-      }
-	  }
-	}
+		selection = this._iframe.contentWindow.getSelection();
+		matches = selected.innerHTML.match(new RegExp(RegExp.escape(selection.anchorNode.textContent) + "(.*)" + RegExp.escape(selection.focusNode.textContent)));
+		if (matches != null && matches.length > 0 && (possible_anchor_tag = matches.last()) != null) {
+			if (((href_matches = possible_anchor_tag.match(/href="([^"]*)"/)) != null) && (href = href_matches.last()) != null) {
+				possible_anchors = this._iframe.document().getElementsByTagName('a');
+				for (i=0;i<possible_anchors.length;i++) {
+					if ((possible_match = possible_anchors[i]).innerHTML == selection) {
+						selected = possible_match;
+					}
+				}
+			}
+		}
+  	}
 
 	// set up handlers.
 	imageGroup = null;
@@ -4142,9 +4142,9 @@ WYMeditor.WymClassExplorer.prototype.initIframe = function(iframe) {
 		//init designMode
 		this._doc.designMode="on";
 		try{
-				// (bermi's note) noticed when running unit tests on IE6
-				// Is this really needed, it trigger an unexisting property on IE6
-				this._doc = iframe.contentWindow.document; 
+			// (bermi's note) noticed when running unit tests on IE6
+			// Is this really needed, it trigger an unexisting property on IE6
+			this._doc = iframe.contentWindow.document; 
 		}catch(e){}
 };
 

data/public/stylesheets/refinery/refinery.css

@@ -498,7 +498,7 @@ label {
 	display: block;
 }
 
-textarea, select { 
+textarea { 
 	padding: 5px;
 }
 

data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb

@@ -33,10 +33,6 @@
 			<% end %>
 		</ul>
 	</div>
-	<div class='form-actions'>
-		<%= f.submit 'Save', :id => "submit_button" %> 
-		or 
-		<%= link_to "Cancel", admin_users_url, :title => "Cancelling will lose all changes you've made to this news item" %>
-	</div>
+	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
 	
 <% end %>

data/vendor/plugins/images/app/controllers/admin/images_controller.rb

@@ -17,7 +17,7 @@ class Admin::ImagesController < Admin::BaseController
                                                :conditions => "parent_id IS NULL"
     end
     
-    if RefinerySetting.find_or_set(:group_images_by_date_uploaded, false)
+    if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true)
       @grouped_images = []
       @images.each do |image|
         key = image.created_at.strftime("%Y-%m-%d")

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

@@ -10,10 +10,8 @@
 		<% end %>
 		<%= f.file_field :uploaded_data %>
 	</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"}" if !from_dialog? or @thickbox %>
-	</div>
+
+	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (from_dialog? and !@thickbox)} %>
 
   <% if @thickbox %>
   	<input type='hidden' name='thickbox' value='<%= @thickbox %>' />

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

@@ -1,4 +1,4 @@
-<% if RefinerySetting.find_or_set(:group_images_by_date_uploaded, false) %>
+<% if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true) %>
   <% @grouped_images.each do |container| %>
     <h3><%= (image_group = container.last).first.created_at.strftime("%A, %d %B %Y") %></h3>
     <ul>

data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb

@@ -42,9 +42,5 @@
 			</td>
 		</tr>
 	</table>
-	<div class='form-actions'>
-		<%= f.submit 'Save', :id => "submit_button" %> 
-		or 
-		<%= link_to "Cancel", admin_inquiries_url, :title => "Cancelling will lose all changes you've made" %>
-	</div>
+	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :cancel_url => admin_inquiries_url} %>
 <% end %>

data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb

@@ -14,9 +14,5 @@
 		  E.g. me@domain.com, friend@msn.com, workmate@work.com
 		</p> 
 	</div>
-	<div class='form-actions'>
-		<%= f.submit 'Save', :id => "submit_button" %> 
-		or 
-		<%= link_to "Cancel", admin_inquiries_url, :title => "Cancelling will lose all changes you've made" %>
-	</div>
+	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :cancel_url => admin_inquiries_url} %>
 <% end %>

data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb

@@ -15,9 +15,5 @@
 		</div>
 	</div>
 
-	<div class='form-actions'>
-		<%= f.submit 'Save', :id => "submit_button", :class => "wymupdate" %> 
-		or 
-		<%= link_to "Cancel", admin_news_items_url, :title => "Cancelling will lose all changes you've made to this news item" %>
-	</div>
+	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => true} %>
 <% end %>

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

@@ -114,14 +114,7 @@
 		<%= f.check_box :draft %>
 		<%= f.label :draft, "Save as Draft", :class => "stripped" %>
 	</div>
-	<div class='form-actions'>
-		<%= f.submit 'Save', :id => "submit_button", :class => "wymupdate" %> 
-		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>
+	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => true} %>
 	<div id='new_page_part_dialog' style='display: none'>
 		<div class='field'>
 			<label for='new_page_part_title'>Title</label>
@@ -163,10 +156,6 @@
 			}
 		});
 		
-		$('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/admin/_head.html.erb

@@ -4,15 +4,19 @@
 		<%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery
 	</title>
 	<%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips' %>
-	<% unless local_request? %>
-		<script type='text/javascript' src="http://www.google.com/jsapi"></script>
-		<script type='text/javascript'>
-			google.load("prototype", "1.6.1");
-			google.load("scriptaculous", "1.8.3");
-			google.load("jquery", "1.3");
-		</script>
-	<% else %>
-		<%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery/jquery' %>
+	<% if RefinerySetting.find_or_set(:use_google_ajax_libraries, true) %>
+  	<% unless local_request? %>
+  		<script type='text/javascript' src="http://www.google.com/jsapi"></script>
+  		<script type='text/javascript'>
+  			google.load("prototype", "1.6.1");
+  			google.load("scriptaculous", "1.8.3");
+  			google.load("jquery", "1.3");
+  		</script>
+  	<% else %>
+  		<%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery/jquery' %>
+  	<% end %>
+	<% else%>
+	  <%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery/jquery' %>
 	<% end %>
 	<script type='text/javascript'>jQuery.noConflict();</script>
 	<%= javascript_include_tag 'refinery/prototype.enhancements.js', 'fastinit', 'refinery/tooltips', 'livepipe', 'tabs', 'thickbox', "wymeditor/jquery.refinery.wymeditor.js", 'refinery/boot_wym', 'refinery/admin' %>

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

@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<%= render :partial => "/admin/head" %>
 	<body>
+	  <div id='tooltip_container'></div>
 		<div id="page_container"<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and params[:action] == "index" %>>
 			<div id="page">
 				<div class="clearfix" id="header">

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

@@ -0,0 +1,51 @@
+<% unless f.object.new_record? -%>
+	<%= hidden_field_tag :continue_editing, false %>
+	<%= f.submit 'Save &amp; Continue Editing', :id => "submit_continue_button", :class => "wymupdate" %> 
+  <% content_for :head do -%>
+    <script type='text/javascript'>
+      FastInit.addOnLoad(function() {
+      	if ($('submit_continue_button') != null) {
+      		$('submit_continue_button').observe("click", function(e) {
+      		  $('continue_editing').value = true;
+
+            if ((flash=$('flash')) != null) {
+              flash.hide();
+            }
+	  
+      		  new Ajax.Request(this.form.action, {
+      		    method: this.form.method
+      		    , parameters: this.form.serialize()
+      		    , onComplete: function(e) {      		      
+      		      if ((flash_container = $('flash_container')) != null) {
+        		      
+      		        flash_container.update(e.transport.responseText);
+      		        
+      		        if ((flash = $('flash')) != null) {
+        		        flash.style.width = 'auto';
+        		        flash.appear();
+      		        }      		        
+      		        
+      		        $$('#errorExplanation').each(function(errorExplanation) {
+      		          if (errorExplanation.parentNode.id != 'flash_container') {
+          		        errorExplanation.remove();
+      		          }
+      		        });
+        		      
+        		      $$('.fieldWithErrors').each(function(field) {
+        		        field.removeClassName('fieldWithErrors').addClassName('field');
+        		      });
+      		        
+      		        flash_container.scrollTo();
+        		      $('continue_editing').value = false;
+    		        }
+      		    }
+      		    , evalScripts: true
+      		  });
+	  
+      		  e.preventDefault();
+      		});
+      	}
+      });
+    </script>
+  <% end -%>	
+<% end -%>

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

@@ -0,0 +1,7 @@
+<%= error_messages_for symbol %>
+<% fields = []; object.errors.each { |attrib, msg| fields << "#{object.class.name.underscore}_#{attrib}" } %>
+<script type='text/javascript'>
+  $$('#<%= fields.join("','#") %>').each(function(error_field) {
+    error_field.up('div.field').addClassName('fieldWithErrors').removeClassName('field');
+  });
+</script>

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

@@ -0,0 +1,15 @@
+<div class='form-actions'>
+	<%= f.submit 'Save', :id => "submit_button", :class => "wymupdate" %> 
+
+	<% if (continue_editing ||= false and !f.object.new_record?) %>
+	  or
+	  <%= render :partial => "/shared/admin/continue_editing", :locals => {:f => f}  %>
+	<% end %>
+	
+	<% unless (hide_cancel ||= false) %>
+	  or
+	  <%= link_to "Cancel", (cancel_url ||= send("admin_#{f.object.class.name.pluralize.underscore}_url")), 
+	        :title => (title ||= "Cancelling will lose all changes you've made to this #{f.object.class.name.underscore.gsub("_", " ")}"), 
+	        :id => "cancel_button", :class => "close_dialog" %>
+	<% end %>
+</div>

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

@@ -34,16 +34,27 @@ module Crud
         end
 
         def create
-          @#{singular_name} = #{class_name}.create(params[:#{singular_name}])
-          if @#{singular_name}.valid?
-            flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully created."
+          if (@#{singular_name} = #{class_name}.create(params[:#{singular_name}])).valid?
+            unless request.xhr?
+              flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully created."
+            else
+              flash.now[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully created."
+            end
             unless params[:continue_editing] =~ /true|on|1/
               redirect_to admin_#{plural_name}_url
             else
-              redirect_to :back
+              unless request.xhr?
+                redirect_to :back
+              else
+                render :partial => "/shared/message"
+              end
             end
           else 
-            render :action => 'new'
+            unless request.xhr?
+              render :action => 'new'
+            else
+              render :partial => "/shared/admin/error_messages_for", :locals => {:symbol => :#{singular_name}, :object => @#{singular_name}}
+            end
           end
         end
         
@@ -52,23 +63,32 @@ module Crud
         end
 
         def update
-          @#{singular_name}.update_attributes(params[:#{singular_name}])
-          if @#{singular_name}.valid?
-            flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully updated."
+          if @#{singular_name}.update_attributes(params[:#{singular_name}])
+            unless request.xhr?
+              flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully updated."
+            else
+              flash.now[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully updated."
+            end
             unless params[:continue_editing] =~ /true|on|1/
               redirect_to admin_#{plural_name}_url
             else
-              redirect_to :back
+              unless request.xhr?
+                redirect_to :back
+              else
+                render :partial => "/shared/message"
+              end
             end
           else
-            render :action => 'edit'
+            unless request.xhr?
+              render :action => 'edit'
+            else  
+              render :partial => "/shared/admin/error_messages_for", :locals => {:symbol => :#{singular_name}, :object => @#{singular_name}}
+            end
           end
         end
 
         def destroy
-          if @#{singular_name}.destroy
-            flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully deleted."
-          end
+          flash[:notice] = "'\#{@#{singular_name}.#{options[:title_attribute]}}' was successfully deleted." if @#{singular_name}.destroy
           redirect_to admin_#{plural_name}_url
         end
 

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb

@@ -1,7 +1,7 @@
 <%%= error_messages_for :<%= singular_name %> -%>
 <%% form_for [:admin, @<%= singular_name %>] do |f| -%>
-	<% attributes.each do |attribute| -%>
-<div class='field'>
+	<% attributes.each do |attribute| %>
+  <div class='field'>
     <%%= f.label :<%= attribute.name %> -%>
 <% if attribute.field_type.to_s == "text_area" -%>
     <%%= f.text_area :<%= attribute.name %>, :rows => 20, :cols => 140, :class => 'wymeditor' -%>
@@ -9,10 +9,6 @@
     <%%= f.<%= attribute.field_type -%> :<%= attribute.name -%> -%>
 <% end -%>
   </div>
-	<% end -%>
-<div class='form-actions'>
-    <%%= f.submit 'Save', :id => "submit_button", :class => "wymupdate" %> 
-		or 
-		<%%= link_to "Cancel", admin_<%= plural_name %>_url, :class => "close_dialog", :id => "cancel_button" %>
-	</div>
+	<% end %>
+  <%%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
 <%% end -%>

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

@@ -13,9 +13,5 @@
 		<%= f.label :value %>
 		<%= f.text_area :value, :rows => 5, :cols => 100 %>
   </div>
-	<div class='form-actions'>
-    <%= f.submit 'Save', :id => "submit_button" %> 
-		or 
-		<%= link_to "Cancel", admin_refinery_settings_url %>
-	</div>
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
 <% end -%>

data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb

@@ -39,7 +39,7 @@ class Admin::ResourcesController < Admin::BaseController
                                       :order => "created_at DESC"
     end
     
-    if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, false)
+    if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true)
       @grouped_resources = []
       @resources.each do |resource|
         key = resource.created_at.strftime("%Y-%m-%d")

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

@@ -10,11 +10,8 @@
 		<% end -%>
 		<%= f.file_field :uploaded_data -%>
 	</div>
-	<div class='form-actions'>
-		<%= f.submit 'Save', :id => "submit_button" %> 
-		or 
-		<%= link_to "Cancel", admin_resources_url, :title => "Cancelling will lose all changes you've made to this file", :class => "close_dialog" -%>
-	</div>
+
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
 
 	<% if @thickbox %>
   	<input type='hidden' name='thickbox' value='<%= @thickbox %>' />

data/vendor/plugins/resources/app/views/admin/resources/index.html.erb

@@ -19,7 +19,7 @@
 	<% else %>
     <% if @resources.size > 0 -%>
     	<%= will_paginate @resources, :previous_label => '&laquo;', :next_label => '&raquo;' %>
-    	<% if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, false) %>
+    	<% if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true) %>
     	  <% @grouped_resources.each do |container| %>
           <h3><%= (resource_group = container.last).first.created_at.strftime("%A, %d %B %Y") %></h3>
           <ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.12
+  version: 0.9.5.13
 platform: ruby
 authors: 
 - Resolve Digital
@@ -424,6 +424,9 @@ files:
 - vendor/plugins/refinery/app/views/shared/_message.html.erb
 - vendor/plugins/refinery/app/views/shared/_submenu.html.erb
 - vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb
+- 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/_image_picker.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb