refinerycms 0.9.3 → 0.9.4

data/app/helpers/application_helper.rb

@@ -0,0 +1,7 @@
+# Methods added to this helper will be available to all templates in the application.
+
+# You can extend refinery with your own functions here and they will likely not get overriden in an update.
+module ApplicationHelper
+  include Refinery::ApplicationHelper # leave this line in to include all of Refinery's core helper methods.
+  
+end

data/db/seeds.rb

@@ -1,5 +1,5 @@
 [{:name => "site_name", :value => "Company Name"},
-  {:name => "new_page_parts", :value => true}, 
+  {:name => "new_page_parts", :value => false}, 
   {:name => "activity_show_limit", :value => 10}, 
   {:name => "preferred_image_view", :value => :grid}, 
   {:name => "analytics_page_code", :value => "UA-xxxxxx-x"},

data/public/javascripts/wymeditor/boot_wym.js

@@ -1,154 +1,154 @@
 jQuery.noConflict();
 var wymeditor_inputs = [];
-jQuery(function()
-{
-	var wym_editors_loaded = 0;
-  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/"
-	  , iframeBasePath: '/'
-	  , toolsItems: [
-	      {'name': 'Bold', 'title': 'Bold', 'css': 'wym_tools_strong'} 
-	      ,{'name': 'Italic', 'title': 'Emphasis', 'css': 'wym_tools_emphasis'}
-	      ,{'name': 'InsertOrderedList', 'title': 'Ordered_List', 'css': 'wym_tools_ordered_list'}
-	      ,{'name': 'InsertUnorderedList', 'title': 'Unordered_List', 'css': 'wym_tools_unordered_list'}
-	      ,{'name': 'CreateLink', 'title': 'Link', 'css': 'wym_tools_link'}
-	      ,{'name': 'Unlink', 'title': 'Unlink', 'css': 'wym_tools_unlink'}
-	      ,{'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'}
-	  ]
- 
-		,toolsHtml: "<ul class='wym_tools wym_section'>" + WYMeditor.TOOLS_ITEMS + WYMeditor.CLASSES + "</ul>"
-
-		,toolsItemHtml: 
-			"<li class='" + WYMeditor.TOOL_CLASS + "'>"
-				+ "<a href='#' name='" + WYMeditor.TOOL_NAME + "' title='" + WYMeditor.TOOL_TITLE + "'>"	+ WYMeditor.TOOL_TITLE	+ "</a>"
+var wymeditors_loaded = 0;
+var wymeditor_boot_options = {
+  skin: 'refinery'
+  , basePath: "/javascripts/wymeditor/"
+  , wymPath: "/javascripts/wymeditor/jquery.refinery.wymeditor.js"
+	, cssSkinPath: "/stylesheets/wymeditor/skins/"
+	, jsSkinPath: "/javascripts/wymeditor/skins/"
+	,	langPath: "/javascripts/wymeditor/lang/"
+  , iframeBasePath: '/'
+  , toolsItems: [
+      {'name': 'Bold', 'title': 'Bold', 'css': 'wym_tools_strong'} 
+      ,{'name': 'Italic', 'title': 'Emphasis', 'css': 'wym_tools_emphasis'}
+      ,{'name': 'InsertOrderedList', 'title': 'Ordered_List', 'css': 'wym_tools_ordered_list'}
+      ,{'name': 'InsertUnorderedList', 'title': 'Unordered_List', 'css': 'wym_tools_unordered_list'}
+      ,{'name': 'CreateLink', 'title': 'Link', 'css': 'wym_tools_link'}
+      ,{'name': 'Unlink', 'title': 'Unlink', 'css': 'wym_tools_unlink'}
+      ,{'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'}
+  ]
+
+	,toolsHtml: "<ul class='wym_tools wym_section'>" + WYMeditor.TOOLS_ITEMS + WYMeditor.CLASSES + "</ul>"
+
+	,toolsItemHtml: 
+		"<li class='" + WYMeditor.TOOL_CLASS + "'>"
+			+ "<a href='#' name='" + WYMeditor.TOOL_NAME + "' title='" + WYMeditor.TOOL_TITLE + "'>"	+ WYMeditor.TOOL_TITLE	+ "</a>"
+		+ "</li>"
+
+  //containersItems will be appended after tools in postInit.
+	, containersItems: [
+      {'name': 'h1', 'title':'Heading_1', 'css':'wym_containers_h1'}
+      ,{'name': 'h2', 'title':'Heading_2', 'css':'wym_containers_h2'}
+      ,{'name': 'h3', 'title':'Heading_3', 'css':'wym_containers_h3'}
+      ,{'name': 'p', 'title':'Paragraph', 'css':'wym_containers_p'}
+  ]    
+
+	, classesHtml: "<li class='wym_tools_class'><a href='#' name='" + WYMeditor.APPLY_CLASS + "' title='"+ titleize(WYMeditor.APPLY_CLASS) +"'></a><ul class='wym_classes wym_classes_hidden'>" + WYMeditor.CLASSES_ITEMS + "</ul></li>"
+
+  , classesItemHtml: "<li><a href='#' name='"+ WYMeditor.CLASS_NAME + "'>"+ WYMeditor.CLASS_TITLE+ "</a></li>"
+	, classesItemHtmlMultiple: "<li class='wym_tools_class_multiple_rules'><span>" + WYMeditor.CLASS_TITLE + "</span><ul>{classesItemHtml}</ul></li>"
+	 
+  , classesItems: [{name:'text-align', rules:['left', 'center', 'right', 'justify'], join: '-'}, {name: 'image-align', rules:['left', 'right'], join: '-'}, {name: 'font-size', rules:['small','normal','large'], join: '-'}]
+
+	, containersHtml: "<ul class='wym_containers wym_section'>" + WYMeditor.CONTAINERS_ITEMS + "</ul>"
+
+	, containersItemHtml:
+			"<li class='" + WYMeditor.CONTAINER_CLASS + "'>"
+				+ "<a href='#' name='" + WYMeditor.CONTAINER_NAME + "' title='" + WYMeditor.CONTAINER_TITLE + "'></a>"
 			+ "</li>"
- 
-	  //containersItems will be appended after tools in postInit.
-		, containersItems: [
-	      {'name': 'h1', 'title':'Heading_1', 'css':'wym_containers_h1'}
-	      ,{'name': 'h2', 'title':'Heading_2', 'css':'wym_containers_h2'}
-	      ,{'name': 'h3', 'title':'Heading_3', 'css':'wym_containers_h3'}
-	      ,{'name': 'p', 'title':'Paragraph', 'css':'wym_containers_p'}
-	  ]    
-
-		, classesHtml: "<li class='wym_tools_class'><a href='#' name='" + WYMeditor.APPLY_CLASS + "' title='"+ titleize(WYMeditor.APPLY_CLASS) +"'></a><ul class='wym_classes wym_classes_hidden'>" + WYMeditor.CLASSES_ITEMS + "</ul></li>"
-
-    , classesItemHtml: "<li><a href='#' name='"+ WYMeditor.CLASS_NAME + "'>"+ WYMeditor.CLASS_TITLE+ "</a></li>"
-		, classesItemHtmlMultiple: "<li class='wym_tools_class_multiple_rules'><span>" + WYMeditor.CLASS_TITLE + "</span><ul>{classesItemHtml}</ul></li>"
-		 
-    , classesItems: [{name:'text-align', rules:['left', 'center', 'right', 'justify'], join: '-'}, {name: 'image-align', rules:['left', 'right'], join: '-'}, {name: 'font-size', rules:['small','normal','large'], join: '-'}]
-
-		, containersHtml: "<ul class='wym_containers wym_section'>" + WYMeditor.CONTAINERS_ITEMS + "</ul>"
-
-		, containersItemHtml:
-				"<li class='" + WYMeditor.CONTAINER_CLASS + "'>"
-					+ "<a href='#' name='" + WYMeditor.CONTAINER_NAME + "' title='" + WYMeditor.CONTAINER_TITLE + "'></a>"
-				+ "</li>"
- 
-	  , boxHtml: 
-		"<div class='wym_box'>"
-			+ "<div class='wym_area_top'>" 
-				+ WYMeditor.TOOLS 
-				+ WYMeditor.CONTAINERS
-			+ "</div>"
-			+ "<div class='wym_area_main'>"
-				+ WYMeditor.HTML
-				+ WYMeditor.IFRAME
-				+ WYMeditor.STATUS
-			+ "</div>"
+
+  , boxHtml: 
+	"<div class='wym_box'>"
+		+ "<div class='wym_area_top'>" 
+			+ WYMeditor.TOOLS 
+			+ WYMeditor.CONTAINERS
 		+ "</div>"
-                 
-		, 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>"
-			+"</div>"
-
-		, dialogImageHtml: ""
-
-	  , dialogLinkHtml: ""
-	
-		, dialogTableHtml: 
-			"<div class='wym_dialog wym_dialog_table'>"
-      	+ "<form>"
-        	+ "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='"+ WYMeditor.DIALOG_TABLE + "' />"
-          + "<div class='field'>"
-          	+ "<label for='wym_caption'>{Caption}</label>"
-						+ "<input type='text' id='wym_caption' class='wym_caption' value='' size='40' />"
-					+ "</div>"
-					+ "<div class='field'>"
-						+ "<label for='wym_rows'>{Number_Of_Rows}</label>"
-						+ "<input type='text' id='wym_rows' class='wym_rows' value='3' size='3' />"
-					+ "</div>"
-					+ "<div class='field'>"
-						+ "<label for='wym_cols'>{Number_Of_Cols}</label>"
-						+ "<input type='text' id='wym_cols' class='wym_cols' value='2' size='3' />"
-					+ "</div>"
-					+ "<div id='dialog-form-actions' class='form-actions'>"
-						+ "<input class='wym_submit' type='button' value='{Insert}' />"
-						+ " or "
-						+ "<a class='wym_cancel close_dialog' type='button' href=''>{Cancel}</a>"
-					+ "</div>"
-				+ "</form>"
-			+ "</div>"
-			
-		, dialogPasteHtml:  
-			"<div class='wym_dialog wym_dialog_paste'>"
-				+ "<form>"
-					+ "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='" + WYMeditor.DIALOG_PASTE + "' />"
-					+ "<div class='field'>"
-						+ "<label for='wym_text'>{Text_From_Word}</label"
-						+ "<textarea class='wym_text' rows='10' cols='50'></textarea>"
-					+ "</div>"
-					+ "<div id='dialog-form-actions' class='form-actions'>"
-						+ "<input class='wym_submit' type='button' value='{Insert}' />"
-						+ " or "
-						+ "<a class='wym_cancel close_dialog' type='button' href=''>{Cancel}</a>"
-					+ "</div>"
-				+ "</form>"
-			+ "</div>"
-
-		,	dialogPath: "/admin/dialogs/"
-	  , dialogFeatures: "?width=958&height=460&modal=true&titlebar=true&auto_size_content=true&draggable=true"
-		, dialogInlineFeatures: "?width=600&height=320&modal=true&titlebar=true&auto_size_content=true&draggable=true"
-
-		, dialogId: 'TB_window'
-
-	  , dialogHtml:
-			"<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"
-			+ "<html dir='" + WYMeditor.DIRECTION + "'>"
-				+ "<head>"
-					+ "<link rel='stylesheet' type='text/css' media='screen' href='" + WYMeditor.CSS_PATH + "' />"
-					+ "<title>" + WYMeditor.DIALOG_TITLE + "</title>"
-					+ "<script type='text/javascript' src='" + WYMeditor.JQUERY_PATH + "'></script>"
-					+ "<script type='text/javascript' src='" + WYMeditor.WYM_PATH + "'></script>"
-				+ "</head>"
-	      + "<div id='page'>" + WYMeditor.DIALOG_BODY + "</div>"
-			+ "</html>"
- 
-	  , postInit: function(wym)
-	  {
-			wym._iframe.style.height = wym._element.height() + "px";
-			wym_editors_loaded += 1;			
-			if(WYMeditor.INSTANCES.length == wym_editors_loaded){	  
-				WYMeditor.loaded();
-			}
-		}
-	});
+		+ "<div class='wym_area_main'>"
+			+ WYMeditor.HTML
+			+ WYMeditor.IFRAME
+			+ WYMeditor.STATUS
+		+ "</div>"
+	+ "</div>"
+               
+	, 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>"
+		+"</div>"
 
-});
+	, dialogImageHtml: ""
+
+  , dialogLinkHtml: ""
+
+	, dialogTableHtml: 
+		"<div class='wym_dialog wym_dialog_table'>"
+    	+ "<form>"
+      	+ "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='"+ WYMeditor.DIALOG_TABLE + "' />"
+        + "<div class='field'>"
+        	+ "<label for='wym_caption'>{Caption}</label>"
+					+ "<input type='text' id='wym_caption' class='wym_caption' value='' size='40' />"
+				+ "</div>"
+				+ "<div class='field'>"
+					+ "<label for='wym_rows'>{Number_Of_Rows}</label>"
+					+ "<input type='text' id='wym_rows' class='wym_rows' value='3' size='3' />"
+				+ "</div>"
+				+ "<div class='field'>"
+					+ "<label for='wym_cols'>{Number_Of_Cols}</label>"
+					+ "<input type='text' id='wym_cols' class='wym_cols' value='2' size='3' />"
+				+ "</div>"
+				+ "<div id='dialog-form-actions' class='form-actions'>"
+					+ "<input class='wym_submit' type='button' value='{Insert}' />"
+					+ " or "
+					+ "<a class='wym_cancel close_dialog' type='button' href=''>{Cancel}</a>"
+				+ "</div>"
+			+ "</form>"
+		+ "</div>"
+		
+	, dialogPasteHtml:  
+		"<div class='wym_dialog wym_dialog_paste'>"
+			+ "<form>"
+				+ "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='" + WYMeditor.DIALOG_PASTE + "' />"
+				+ "<div class='field'>"
+					+ "<label for='wym_text'>{Text_From_Word}</label"
+					+ "<textarea class='wym_text' rows='10' cols='50'></textarea>"
+				+ "</div>"
+				+ "<div id='dialog-form-actions' class='form-actions'>"
+					+ "<input class='wym_submit' type='button' value='{Insert}' />"
+					+ " or "
+					+ "<a class='wym_cancel close_dialog' type='button' href=''>{Cancel}</a>"
+				+ "</div>"
+			+ "</form>"
+		+ "</div>"
+
+	,	dialogPath: "/admin/dialogs/"
+  , dialogFeatures: "?width=958&height=460&modal=true&titlebar=true&auto_size_content=true&draggable=true"
+	, dialogInlineFeatures: "?width=600&height=320&modal=true&titlebar=true&auto_size_content=true&draggable=true"
+
+	, dialogId: 'TB_window'
+
+  , dialogHtml:
+		"<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"
+		+ "<html dir='" + WYMeditor.DIRECTION + "'>"
+			+ "<head>"
+				+ "<link rel='stylesheet' type='text/css' media='screen' href='" + WYMeditor.CSS_PATH + "' />"
+				+ "<title>" + WYMeditor.DIALOG_TITLE + "</title>"
+				+ "<script type='text/javascript' src='" + WYMeditor.JQUERY_PATH + "'></script>"
+				+ "<script type='text/javascript' src='" + WYMeditor.WYM_PATH + "'></script>"
+			+ "</head>"
+      + "<div id='page'>" + WYMeditor.DIALOG_BODY + "</div>"
+		+ "</html>"
+
+  , postInit: function(wym)
+  {
+		wym._iframe.style.height = wym._element.height() + "px";
+		wymeditors_loaded += 1;			
+		if(WYMeditor.INSTANCES.length == wymeditors_loaded){	  
+			WYMeditor.loaded();
+		}
+	}
+};
 
 // custom function added by us to hook into when all wymeditor instances on the page have finally loaded:
-WYMeditor.loaded = function(){}
+WYMeditor.loaded = function(){}
+
+jQuery(function()
+{
+  wymeditor_inputs = jQuery('.wymeditor');
+  wymeditor_inputs.hide();
+	wymeditor_inputs.wymeditor(wymeditor_boot_options);
+});

data/public/stylesheets/refinery.css

@@ -888,8 +888,13 @@ a img {
 /* page parts */
 
 ul#page_parts {
-	margin: 20px 0 0 0;
-	padding: 0;
+    float: left;
+    width: 95%;
+}
+
+ul#page_parts, ul#page_parts_controls {
+    margin: 20px 0 0 0;
+    padding: 0;
 }
 
 ul#page_parts li {
@@ -899,30 +904,36 @@ ul#page_parts li {
 }
 
 ul#page_parts li a {
+  float: left;
 	line-height: 27px;
-	display: block;
 	background: #c2c3b3;
 	padding: 0px 8px;
 	border-bottom: none;
 	margin-top: 6px;
 }
 
-ul#page_parts li a.active {
+ul#page_parts li.active a {
 	background: #808080;
 	line-height: 33px;
 	color: white;
 	margin-top: 0px;
 }
+ul#page_parts_controls {
+    float: right;
+    width: 5%;
+}
 
-#add_page_part {
-		background: #8A8A72;
-		padding: 5px 8px 3px 8px;
-		border-bottom: none;
-		margin-top: 9px;
-		display: block;
-		float: left;
+ul#page_parts_controls li {
+    list-style: none;
+    float: right;
+    margin: 12px 3px 0px 3px;
 }
-#add_page_part img {
+
+ul#page_parts_controls li a {
+    border: 0px none;
+}
+
+ul#page_parts_controls img {
 	vertical-align: middle;
 }
 

data/vendor/plugins/images/lib/tasks/images.rake

@@ -24,5 +24,22 @@ namespace :images do
     
     puts "Image regeneration complete."
   end
-  
+
+  desc "Update thumbnails. Useful for when you have added new thumbnail sizes and you just need to regenerate those without regenerating all the thumbnails again."
+  task :update => :environment do
+		originals = Image.originals
+
+    puts "Preparing to update #{originals.size} images. This may take a few minutes. Please wait..."
+
+    originals.each do |image|
+      begin
+        image.save
+      rescue Exception => e  
+        puts "--> ERROR image #{image.id} could not be saved because #{e.message}"
+      end
+    end
+
+    puts "Thumbnail update complete."
+	end
+	
 end

data/vendor/plugins/inquiries/init.rb

@@ -8,4 +8,7 @@ Refinery::Plugin.register do |plugin|
 	  {: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"}
 	]
-end
+end
+
+# Set the actionmailer root so that it'll work for delivering emails from this plugin.
+ActionMailer::Base.template_root = "#{REFINERY_ROOT}/vendor/plugins/inquiries/app/views"

data/vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb

@@ -1,34 +1,15 @@
 class Admin::PagePartsController < Admin::BaseController
-
-  layout 'admin_dialog'
-
-  crudify :page_part, :order => "position ASC"
   
   def new
-    @page = Page.find(params[:page_id], :include => [:parts, :slugs])
-    @page_part = @page.parts.new
+    render :partial => "/admin/pages/page_part_field", :locals => {:title => params[:title], :body => params[:body], :new_part => true, :part_index => params[:part_index]}
   end
   
-  def create
-    @page = Page.find(params[:page_id], :include => [:parts, :slugs])
-    @page_part = @page.parts.new(params[:page_part])
-    @page_part.title = @page_part.title.downcase.gsub(" ", "_")
-    
-    saved = @page_part.save
-    flash[:error] = "You must enter a title for the part to be added to this page" unless saved
-    
-    unless request.xhr?
-      redirect_to edit_admin_page_url(@page)
+  def destroy
+    part = PagePart.find(params[:id])
+    if part.destroy
+      render :text => "'#{part.title}' deleted."
     else
-      if saved
-        flash.now[:notice] = "The new content section was added. Please close this dialog and reload the page to use it. Make sure you save any changes you have made."
-      end
-
-      render :update do |page|
-        page.replace_html 'flash_container', :partial => "/shared/message"
-        page[:flash].appear
-      end
-      flash.discard # Get rid of the flash message, we don't need it anymore.. otherwise it'll show up on next page load.
+      render :text => "'#{part.title}' not deleted."
     end
   end
   

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

@@ -9,22 +9,29 @@
 	  <div class='clearfix'>
   	  <ul id='page_parts'>
 			<% @page.parts.each do |p| %>
-				<li class='tab'>
-					<%= link_to p.title.titleize, "#part_#{p.title}", :class => ((@page.parts.index(p) == 0) ? "active" : nil) %>
+				<li class='tab<%= " active" if @page.parts.index(p) == 0 %>'>
+					<%= link_to p.title.titleize, "#part_#{p.title}" %>
 				</li>
 			<% end %>
   		</ul>
   		<% if RefinerySetting.find_or_set(:new_page_parts, false) and not @page.new_record? %>
-  		  <%= link_to image_tag("/images/refinery/add.png"), new_admin_page_page_part_url(@page, {:dialog => true, :width => 600, :height => 300}), :id => "add_page_part", :title => "Create Content Section", :name => "Create Content Section" %>
+				<ul id='page_parts_controls'>
+					<li>
+						<%= link_to refinery_icon_tag("add.png"), "#", :id => "add_page_part", :title => "Create Content Section" %>
+					</li>
+					<li>
+						<%= link_to(refinery_icon_tag("delete.png"), "#", :title => 'Delete content section', :class => 'delete_page_part', :name => "Delete Content Section", :id => "delete_page_part") %>
+					</li>
+				</ul>
   		<% end %>
     </div>
 		
- 	<% f.fields_for :parts do |p| %>
-   	<div class='field' id='part_<%= p.object.title.downcase.gsub(" ", "_") %>'>
-			<%= p.hidden_field :title if @page.new_record? %>
-   		<%= p.text_area :body, :rows => 20, :cols => 140, :class => 'wymeditor' %>
-   	</div>
-   <% end %>
+		<div id='page_part_editors'>
+			<% part_index = -1 %>
+			<% f.fields_for :parts do |p| %>
+				<%= render :partial => "page_part_field", :locals => {:title => p.object.title, :body => p.object.body, :part_index => (part_index += 1), :new_part => false} %>
+			<% end %>
+		</div>
 	</div>
 	<p>
 		<%= link_to "&raquo; Hide/Show Advanced Options", "", :id => "toggle_advanced_options", 
@@ -34,10 +41,10 @@
 		<div class='field'>
 			<%= label_tag :custom_title %>
 			<%= label_tag "", 'Type:', :class => "stripped" %>
-		<% ["none", "text", "image"].each do |type| %>
-			<%= f.radio_button :custom_title_type, "#{type}" %>
-			<%= label_tag "page_custom_title_type_#{type}", "#{type.titleize}", :class => "stripped" %>
-		<% end %>
+			<% ["none", "text", "image"].each do |type| %>
+				<%= f.radio_button :custom_title_type, "#{type}" %>
+				<%= label_tag "page_custom_title_type_#{type}", "#{type.titleize}", :class => "stripped" %>
+			<% end %>
 			<br/>
 			<div id='custom_title_none'></div>
 			<div id='custom_title_text' style='display: <%= @page.custom_title_type == 'text' ? 'block' : 'none' %>'>
@@ -52,19 +59,17 @@
 				<%= f.hidden_field :custom_title_image_id %>
 				<div>
 					<a id='current_image_link' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=page_custom_title_image_id&amp;update_image=current_custom_title_image&amp;callback=custom_title_image_changed&amp;thumbnail=&amp;KeepThis=true&amp;TB_iframe=true&amp;width=950&amp;height=510" style='border: 0px' title='Change Image' name='Change Image' class='thickbox'>
-					<% unless @page.custom_title_image.nil? %>
-						<%= image_fu @page.custom_title_image, nil, {:class => "brown_border", :id => "current_custom_title_image"} %>
-					<% else %>
-            <img id="current_custom_title_image" class="" src="" alt="" />
-					<% end %>
-					<span id='no_custom_title_image_selected' style='display: <%= @page.custom_title_image.nil? ? '' : 'none' %>'>
-						There is currently no image selected. Click here to add one
-					</span>
+						<% unless @page.custom_title_image.nil? %>
+							<%= image_fu @page.custom_title_image, nil, {:class => "brown_border", :id => "current_custom_title_image"} %>
+						<% else %>
+	            <img id="current_custom_title_image" class="" src="" alt="" />
+						<% end %>
+						<span id='no_custom_title_image_selected' <%= "style='display: none;'" unless @page.custom_title_image.nil? %>>
+							There is currently no image selected. Click here to add one
+						</span>
 					</a>
 					<br/>
-					<a id='remove_custom_title_image' href="" style='margin-top: 8px;display:inline-block;width: auto<%= ";display:none;" if @page.custom_title_image.nil? %>'>
-						Remove Current Image
-					</a>
+					<%= link_to "Remove Current Image", "", :id => "remove_custom_title_image", :style => "margin-top:8px;display:inline-block;width:auto;#{"display:none;" if @page.custom_title_image.nil?}" %>
 				</div>
 			</div>
 		</div>
@@ -122,6 +127,18 @@
 		or 
 		<%= link_to "Cancel", admin_pages_url, :title => "Cancelling will lose all changes you've made to this page"%>
 	</div>
+	<div id='new_page_part_dialog' style='display: none'>
+		<div class='field'>
+			<label for='new_page_part_title'>Title</label>
+			<input id='new_page_part_title' value='' class='larger' size='40' />
+			<input id='new_page_part_index' type='hidden' value='<%= @page.parts.size %>' />
+		</div>
+		<div id='dialog-form-actions' class='form-actions'>
+			<%= f.submit 'Save', :id => "new_page_part_save" %> 
+			or 
+			<%= link_to "Cancel", "#", :id => "new_page_part_cancel" %>
+		</div>
+	</div>
 <% end %>
 <% content_for :head do %>
 <script type='text/javascript'>
@@ -160,6 +177,80 @@
 			this.hide();
 			e.stop();
 		});
+	
+		$('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');
+			
+			e.stop();
+		});
+		
+		$('new_page_part_save').observe('click', function(e) {
+			if ((part_title = $('new_page_part_title').value).length > 0) {
+				tab_title = part_title.toLowerCase().gsub(" ", "_");
+				if ($$('#part_' + tab_title).size() == 0) {
+					// first get the response from the server
+					new Ajax.Request("<%= new_admin_page_part_url %>", {
+							asynchronous: true
+						,	method: 'get'
+						,	parameters: {
+							title: tab_title
+							, part_index: $('new_page_part_index').value
+							, body: ''
+						}
+						, onComplete: function(e){
+							$('page_part_editors').insert(e.transport.responseText , {position: 'bottom'});
+							// Add a new tab for the new content section.
+							$$('#page_parts').first().insert((new Element("li").addClassName("tab").insert(new Element("a", {href: "#part_" + tab_title}).update(part_title))));
+							
+							// turn the new textarea into a wymeditor.
+							jQuery('#page_parts_attributes_' + $('new_page_part_index').value + "_body").wymeditor(wymeditor_boot_options);
+							
+							// Wipe the title and increment the index counter by one.
+							$('new_page_part_index').value = (parseInt($('new_page_part_index').value) + 1);
+							$('new_page_part_title').value = "";
+						}
+					});
+					
+					tb_remove();
+				}	else {
+					alert("A content section with that title already exists, please choose another.");
+				}
+			} else {
+				alert("You have not entered a title for the content section, please enter one.");
+			}
+		});
+		
+		$('new_page_part_cancel').observe('click', function(e) {
+			$('new_page_part_title').value = "";
+			tb_remove();
+			e.stop();
+		});
+		
+		$('delete_page_part').observe('click', function(e) {
+			selected_part_link = $$('#page_parts li.active a').first();
+			part_container = $(selected_part_link.getAttribute('href').gsub("#", ""));
+			result = confirm("This will remove the content section '" + selected_part_link.innerHTML + "' when the page is saved and erase all content that has been entered into it, Are you sure?");
+			if (result) {
+				if ((part_id = $(part_container.down('textarea').id.gsub('_body', '_id'))) != null) {
+					new Ajax.Request("<%= admin_page_parts_url %>/" + part_id.value, {
+						asynchronous: true
+						,	method: "DELETE"
+						, parameters: 
+						{ 
+							authenticity_token: $$('input[name=authenticity_token]').first().value 
+						}
+					});
+				}
+				
+				// remove actual elements from DOM.
+				part_container.remove();
+				selected_part_link.up('li').remove();
+				
+				WYMeditor.loaded();
+			}
+			
+			e.stop();
+		});
 	});
 
 	custom_title_image_changed = function()
@@ -172,8 +263,8 @@
 	// Hook into the loaded function. This will be called when WYMeditor has done its thing.
 	WYMeditor.loaded = function()
 	{
-		new Control.Tabs('page_parts').first();
+		new Control.Tabs('page_parts', {setClassOnContainer: true}).first();
 	}
 	
 </script>
-<% end %>
+<% end %>

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

@@ -0,0 +1,4 @@
+<div class='page_part field' id='part_<%= title.downcase.gsub(" ", "_") %>'>
+	<%= hidden_field_tag "page[parts_attributes][#{part_index}][title]", title if new_part %>
+	<%= text_area_tag "page[parts_attributes][#{part_index}][body]", body, :rows => 20, :cols => 140, :class => 'wymeditor' %>
+</div>

data/vendor/plugins/pages/config/routes.rb

@@ -2,9 +2,8 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :pages
 
   map.namespace(:admin) do |admin| 
-  	admin.resources :pages do |page|
-    	page.resources :page_parts
-    end
+  	admin.resources :pages
+  	admin.resources :page_parts
     
     admin.resources :pages_dialogs, :as => "pages/dialogs", :controller => :page_dialogs,
                     :collection => {:link_to => :get, :test_url => :get, :test_email => :get}

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

@@ -79,7 +79,10 @@ module Crud
         module_eval %(
           def index
             if searching?
-              @#{plural_name} = #{class_name}.paginate_search params[:search], :page => params[:page]
+              @#{plural_name} = #{class_name}.paginate_search params[:search],
+                                                       :page => params[:page],
+                                                       :order => "#{options[:order]}",
+                                                       :conditions => "#{options[:conditions]}"
             else
               @#{plural_name} = #{class_name}.paginate :page => params[:page],
                                                        :order => "#{options[:order]}",

data/vendor/plugins/refinery/{app/controllers/admin/base_controller.rb → lib/refinery/admin_base_controller.rb}

@@ -1,4 +1,4 @@
-class Admin::BaseController < ApplicationController
+class Refinery::AdminBaseController < ApplicationController
   
   layout proc { |controller| "admin#{"_dialog" if controller.from_dialog?}" }
   

data/vendor/plugins/refinery/{app/helpers → lib/refinery}/application_helper.rb

@@ -1,5 +1,5 @@
 # Methods added to this helper will be available to all templates in the application.
-module ApplicationHelper
+module Refinery::ApplicationHelper
 
   def add_meta_tags
 		content_for :head, "<meta name=\"keywords\" content=\"#{@page.meta_keywords}\" />" unless @page.meta_keywords.blank?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +13:00
+date: 2009-10-16 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -446,9 +446,9 @@ files:
 - vendor/plugins/pages/app/models/page_part.rb
 - vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb
 - vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb
-- vendor/plugins/pages/app/views/admin/page_parts/new.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_form.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_list.html.erb
+- vendor/plugins/pages/app/views/admin/pages/_page_part_field.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_sortable_list.html.erb
 - vendor/plugins/pages/app/views/admin/pages/edit.html.erb
 - vendor/plugins/pages/app/views/admin/pages/index.html.erb
@@ -457,9 +457,10 @@ files:
 - vendor/plugins/pages/app/views/pages/show.html.erb
 - vendor/plugins/pages/config/routes.rb
 - vendor/plugins/pages/init.rb
-- vendor/plugins/refinery/app/controllers/admin/base_controller.rb
 - vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb
-- vendor/plugins/refinery/app/helpers/application_helper.rb
+- app/helpers/application_helper.rb
+- vendor/plugins/refinery/lib/refinery/application_helper.rb
+- vendor/plugins/refinery/lib/refinery/admin_base_controller.rb
 - vendor/plugins/refinery/app/views/admin/_head.html.erb
 - vendor/plugins/refinery/app/views/admin/_menu.html.erb
 - vendor/plugins/refinery/app/views/layouts/admin.html.erb

data/vendor/plugins/pages/app/views/admin/page_parts/new.html.erb

@@ -1,11 +0,0 @@
-<% send :"form_#{'remote_' if from_dialog?}for", [:admin, @page, @page_part] do |f| %>
-  <div class='field'>
-  	<%= f.label :title %>
-  	<%= f.text_field :title %>
-  </div>
-	<div class='form-actions'>
-		<%= f.submit 'Save', :id => "submit_button" %> 
-		or 
-		<%= link_to "Cancel", edit_admin_page_url(@page), :class => "close_dialog" %>
-	</div>
-<% end %>