refinerycms 0.9.5.31 → 0.9.6

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

@@ -1,7 +1,11 @@
 class Admin::PagePartsController < Admin::BaseController
 
   def new
-    render :partial => "/admin/pages/page_part_field", :locals => {:title => params[:title], :body => params[:body], :new_part => true, :part_index => params[:part_index]}
+    render :partial => "/admin/pages/page_part_field", :locals => {
+      :part => PagePart.new(:title => params[:title], :body => params[:body]),
+      :new_part => true,
+      :part_index => params[:part_index]
+    }
   end
 
   def destroy

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

@@ -5,7 +5,7 @@ class Admin::PagesController < Admin::BaseController
 
   def new
     @page = Page.new
-    RefinerySetting.find_or_set(:default_page_parts, ["body", "side_body"]).each do |page_part|
+    RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |page_part|
       @page.parts << PagePart.new(:title => page_part)
     end
   end
@@ -15,4 +15,4 @@ protected
     expire_fragment(%r{site_menu})
   end
 
-end
+end

data/vendor/plugins/pages/app/models/page.rb

@@ -3,39 +3,54 @@ class Page < ActiveRecord::Base
   validates_presence_of :title
 
   acts_as_tree :order => "position ASC", :include => [:children, :slugs]
-
+	
+	# Docs for friendly_id http://github.com/norman/friendly_id
   has_friendly_id :title, :use_slug => true, :strip_diacritics => true
 
-  belongs_to :image
-  belongs_to :custom_title_image, :class_name => "Image"
-
   has_many :parts, :class_name => "PagePart", :order => "position ASC"
   accepts_nested_attributes_for :parts, :allow_destroy => true
-
+	
+	# Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title, :meta_keywords, :meta_description, :custom_title, :browser_title, :all_page_part_content],
-          :index_file => %W(#{RAILS_ROOT} tmp index)
+          			  :index_file => %W(#{RAILS_ROOT} tmp index)
 
   before_destroy :deletable?
 
-  # deletable needs to check a couple other fields too
+	# when a dialog pops up to link to a page, how many pages per page should there be
+	PAGES_PER_DIALOG = 14
+	
+	# when listing pages out in the admin area, how many pages should show per page
+	PAGES_PER_ADMIN_INDEX = 20
+	
+	# when collecting the pages path how is each of the pages seperated?
+	PATH_SEPERATOR = " - "
+
+  # Am I allowed to delete this page?
+  # If a link_url is set we don't want to break the link so we don't allow them to delete
+  # If deletable is set to false then we don't allow this page to be deleted. These are often Refinery system pages
   def deletable?
     self.deletable && self.link_url.blank? and self.menu_match.blank?
   end
 
-  # provide helpful feedback
+  # Before destroying a page we check to see if it's a deletable page or not
+  # Refinery system pages are not deletable.
   def destroy
     if self.deletable?
       super
     else
-      puts "This page is not deletable. Please use .destroy! if you really want it gone or first:"
-      puts "unset .link_url" if self.link_url.present?
-      puts "unset .menu_match" if self.menu_match.present?
-      puts "set .deletable to true" unless self.deletable
+			unless RAILS_ENV == "test"
+				# give useful feedback when trying to delete from console
+	      puts "This page is not deletable. Please use .destroy! if you really want it deleted "
+	      puts "unset .link_url," if self.link_url.present?
+	      puts "unset .menu_match," if self.menu_match.present?
+	      puts "set .deletable to true" unless self.deletable
+			end
+		
       return false
     end
   end
 
-  # provide a method to definitely get rid of the page.
+  # If you want to destroy a page that is set to be not deletable this is the way to do it.
   def destroy!
     self.update_attributes({
       :menu_match => nil,
@@ -45,17 +60,29 @@ class Page < ActiveRecord::Base
     self.destroy
   end
 
-  # used for the browser title to get the full path to this page
+  def indented_title
+    "#{"--" * self.ancestors.size} #{self.title}".chomp
+  end
+
+  # Used for the browser title to get the full path to this page
+  # It automatically prints out this page title and all of it's parent page titles joined by a PATH_SEPERATOR
   def path(reverse = true)
     unless self.parent.nil?
       parts = [self.title, self.parent.path(reverse)]
       parts.reverse! if reverse
-      parts.join(" - ")
+      parts.join(PATH_SEPERATOR)
     else
       self.title
     end
   end
-
+	
+	# When this page is rendered in the navigation, where should it link?
+	# If a custom "link_url" is set, it uses that otherwise it defaults to a normal page URL.
+	# The "link_url" is often used to link to a plugin rather than a page.
+	# 
+	# For example if I had a "Contact Us" page I don't want it to just render a contact us page
+	# I want it to show the Inquiries form so I can collect inquiries. So I would set the "link_url"
+	# to "/inquiries/new"
   def url
     if self.link_url.present?
       self.link_url
@@ -63,54 +90,73 @@ class Page < ActiveRecord::Base
       "/pages/#{self.to_param}"
     end
   end
-
+	
+	# Returns true if this page is "published"
   def live?
     not self.draft?
   end
-
+	
+	# Return true if this page can be shown in the navigation. If it's a draft or is set to not show in the menu it will return false.
   def in_menu?
-    self.live? and self.show_in_menu?
+    is_in_menu = self.live? && self.show_in_menu?
+    self.ancestors.each {|a| is_in_menu = false unless a.in_menu? }
+    is_in_menu
   end
-
+	
+	# Returns true if this page is the home page or links to it.
   def home?
     self.link_url == "/"
   end
-
+	
+	# Returns all visible sibling pages that can be rendered for the menu
   def shown_siblings
     self.siblings.reject { |sibling| not sibling.in_menu? }
   end
-
+	
+	# Returns all the top level pages, usually to render the top level navigation.
   def self.top_level(include_children = false)
     include_associations = [:parts]
     include_associations.push(:slugs) if self.class.methods.include? "find_one_with_friendly"
     include_associations.push(:children) if include_children
     find_all_by_parent_id(nil,:conditions => {:show_in_menu => true, :draft => false}, :order => "position ASC", :include => include_associations)
   end
-
+	
+	# Accessor method to get a page part from a page.
+	# Example:
+	#     
+	#    Page.first[:body]
+	#
+	# Will return the body page part of the first page.
   def [](part_title)
     # don't want to override a super method when trying to call a page part.
     # the way that we call page parts seems flawed, will probably revert to page.parts[:title] in a future release.
     if (super_value = super).blank?
       # self.parts is already eager loaded so we can now just grab the first element matching the title we specified.
-      part = self.parts.reject {|part| part.title != part_title.to_s}.first
+      part = self.parts.detect {|part| (part.title == part_title.to_s) || (part.title.downcase.gsub(" ", "_") == part_title.to_s.downcase.gsub(" ", "_")) }
 
       return part.body unless part.nil?
     end
 
     super_value
   end
-
+	
+	# In the admin area we use a slightly different title to inform the which pages are draft or hidden pages
   def title_with_meta
-    "#{self.title} #{"<em>(hidden)</em>" unless self.show_in_menu?} #{"<em>(draft)</em>" if self.draft?}"
+		title = self.title
+		title << " <em>(hidden)</em>" unless self.show_in_menu?
+		title << " <em>(draft)</em>" if self.draft?
+		
+		title.strip
   end
 
-  # used for search only
+  # Used to index all the content on this page so it can be easily searched.
   def all_page_part_content
     self.parts.collect {|p| p.body}.join(" ")
   end
-
+	
+	# Returns how many pages per page should there be when paginating pages
   def self.per_page(dialog = false)
-    size = (dialog ? 14 : 20)
+    dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   end
 
 end

data/vendor/plugins/pages/app/models/page_part.rb

@@ -7,4 +7,4 @@ class PagePart < ActiveRecord::Base
 
   has_friendly_id :title, :use_slug => true, :strip_diacritics => true
 
-end
+end

data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb

@@ -1,5 +1,5 @@
-<% linked = (page_link.url == params[:current_link]) unless params[:current_link].blank? %>
+<% linked = (page_link.url == params[:current_link]) if params[:current_link].present? %>
 <li class='clearfix<%= " child#{child}" if child %><%= " linked" if linked%>' id="<%= dom_id(page_link) -%>">
   <%= link_to page_link.title_with_meta, page_link.url, :title => 'Link to this Page', :rel => page_link.title, :class => 'page_link' %>
 </li>
-<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} unless page_link.children.empty? %>
+<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} unless page_link.children.empty? %>

data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb

@@ -68,7 +68,7 @@
       <div id='web_address_content'>
         <label for='web_address_text'>Location</label>
         <%= text_field :web_address, :text, :value => web_address_text, :style => "width: 70%" %>
-        <img id='web_address_test_loader' src='/images/refinery/ajax-loader.gif' alt='Testing...' style='display: none;'>
+        <img id='web_address_test_loader' src='/images/refinery/ajax-loader.gif' alt='Testing...' style='display: none;'/>
         <span id='web_address_test_result'></span>
 
         <label>New Window</label>
@@ -88,7 +88,7 @@
         <div class='field'>
           <label for='email_address_text'>Email Address</label>
           <%= text_field :email_address, :text, :value => email_address_text, :style => "width: 70%"%>
-          <img id='web_address_test_loader' src='/images/refinery/ajax-loader.gif' alt='Testing...' style='display: none;'>
+          <img id='email_address_test_loader' src='/images/refinery/ajax-loader.gif' alt='Testing...' style='display: none;'/>
           <span id='email_address_test_result'></span>
         </div>
 
@@ -140,114 +140,10 @@
 </div>
 
 <% content_for :head do %>
-  <script type='text/javascript'>
-
-    FastInit.addOnLoad(function()
-    {
-      $$('.link_list li').each(function(li)
-      {
-        li.observe('click', function(ev)
-        {
-          ev.preventDefault();
-
-          $$('.link_list li.linked').each(function(linked)
-          {
-            linked.removeClassName('linked');
-          });
-
-          this.addClassName('linked');
-          var link = this.down('a.page_link');
-          var port = (window.location.port.length > 0 ? (":" + window.location.port) : "")
-          var url = link.href.gsub(window.location.protocol + "//" + window.location.hostname + port, "");
-
-          parent.document.getElementById('wym_href').value = url;
-          parent.document.getElementById('wym_title').value = link.rel;
-          parent.document.getElementById('wym_target').value = '';
-        });
-      });
-
-      $('web_address_text').observe('change', function(e)
-      {
-        var prefix = 'web_address_';
-        $(prefix + 'test_loader').show();
-
-        $(prefix + 'test_result').hide();
-
-        var req = new Ajax.Request("<%= test_url_admin_pages_dialogs_url %>",
-        {
-          asynchronous: true
-          , method: 'get'
-          , parameters: {url: this.value}
-          , onComplete: function(e)
-          {
-            $(prefix + 'test_result').update(e.transport.responseText).show();
-            $(prefix + 'test_loader').hide();
-          }
-        });
-
-        parent.document.getElementById('wym_href').value = $(prefix + 'text').value;
-        parent.document.getElementById('wym_title').value = $(prefix + 'text').value;
-        parent.document.getElementById('wym_target').value = ($(prefix + 'target_blank').checked ? "_blank" : "");
-      });
-
-      $('web_address_target_blank').observe('click', function(e)
-      {
-        parent.document.getElementById('wym_target').value = this.checked ? "_blank" : "";
-      })
-
-      $$('#email_address_text', '#email_default_subject_text', '#email_default_body_text').each(function(input)
-      {
-        input.observe('change', function(e)
-        {
-          var default_subject = $('email_default_subject_text').value;
-          var default_body = $('email_default_body_text').value;
-          var mailto = "mailto:" + $('email_address_text').value.replace('mailto:', '');
-          $('email_address_test_result').hide();
-
-          var req = new Ajax.Request("<%= test_email_admin_pages_dialogs_url %>",
-          {
-            asynchronous: true
-            , method: 'get'
-            , parameters: {email: mailto}
-            , onComplete: function(e)
-            {
-              $('email_address_test_result').update(e.transport.responseText).show();
-              $('email_address_test_loader').hide();
-            }
-          });
-
-          var modifier = "?";
-          if (default_subject.length > 0)
-          {
-            mailto += modifier + "subject=" + default_subject;
-            modifier = "&";
-          }
-          if (default_body.length > 0)
-          {
-            mailto += modifier + "body=" + default_body;
-            modifier = "&";
-          }
-
-          parent.document.getElementById('wym_href').value = mailto;
-          parent.document.getElementById('wym_title').value = $('email_address_text').value.replace('mailto:', '');
-          parent.document.getElementById('wym_target').value = '';
-        });
-      });
-
-      $('link_to_your_page').observe('click', function(e)
-      {
-        $$('li.linked').each(function(li)
-        {
-          parent.document.getElementById('wym_href').value = li.down('a.page_link').href;
-          parent.document.getElementById('wym_title').value = li.down('span').innerHTML.gsub(/<em>\((\w)*\)<\/em>/, "").trim();
-        });
-      });
-      $('link_to_web_address').observe('click', function(e)
-      {
-        parent.document.getElementById('wym_href').value = $('web_address_text').value;
-        parent.document.getElementById('wym_title').value = $('web_address_text').value;
-        parent.document.getElementById('wym_target').value = ($('web_address_target_blank').checked ? "_blank" : "");
-      });
-    });
-  </script>
+<script type='text/javascript'>
+  $(document).ready(function(){
+    link_dialog.init('<%= test_url_admin_pages_dialogs_url %>',
+                     '<%= test_email_admin_pages_dialogs_url %>');
+  });
+</script>
 <% end %>

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

@@ -1,47 +1,52 @@
 <%= error_messages_for :page %>
 
 <% form_for [:admin, @page] do |f| %>
-  <div class='field'>
+  <div class="field">
     <%= f.label :title %>
     <%= f.text_field :title, :class => "larger", :style => 'width: 954px' %>
   </div>
-  <div class='clearfix'>
-    <div class='clearfix'>
-      <ul id='page_parts'>
-      <% @page.parts.each do |p| %>
-        <li class='tab<%= " active" if @page.parts.index(p) == 0 %>'>
-          <%= link_to p.title.titleize, "#part_#{p.title}" %>
+  <div id="page-tabs" class="clearfix">
+    <ul id="page_parts">
+    <% @page.parts.each_with_index do |part, part_index| %>
+      <li>
+        <%= link_to part.title, "##{@page.new_record? ? "page_part_new_#{part_index}" : dom_id(part)}" %>
+      </li>
+    <% end %>
+    </ul>
+    <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
+      <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>
-      <% end %>
       </ul>
-      <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
-        <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>
+    <% end %>
 
-    <div id='page_part_editors'>
+    <div id='page_part_editors' style="clear:left">
       <% 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 => @page.new_record?} %>
+        <%= render :partial => "page_part_field", :locals => {
+          :part => p.object,
+          :part_index => (part_index += 1),
+          :new_part => @page.new_record?
+        } %>
       <% end %>
     </div>
   </div>
   <p>
-    <%= link_to "&raquo; Hide/Show Advanced Options", "", :id => "toggle_advanced_options",
-          :rel => "Click to access meta tag settings and menu options" %>
+    <a href="#" id="toggle_advanced_options" rel="Click to access meta tag settings and menu options">&raquo; Hide/Show Advanced Options</a>
   </p>
   <div id='more_options' style="display:none;">
+    <div class='field'>
+      <%= f.label :parent_id %>
+      <%= f.collection_select :parent_id, Page.find(:all, :order => "parent_id, position ASC"), :id, :indented_title, :include_blank => true %>
+    </div>
     <div class='field'>
       <%= label_tag :custom_title %>
       <%= label_tag "", 'Type:', :class => "stripped" %>
-      <% ["none", "text", "image"].each do |type| %>
+      <% ["none", "text"].each do |type| %>
         <%= f.radio_button :custom_title_type, "#{type}" %>
         <%= label_tag "page_custom_title_type_#{type}", "#{type.titleize}", :class => "stripped" %>
       <% end %>
@@ -55,16 +60,6 @@
           </small>
         </p>
       </div>
-      <div id='custom_title_image' style='display: <%= @page.custom_title_type == 'image' ? 'block' : 'none' %>' class='clearfix'>
-        <%= render :partial => "/shared/admin/image_picker", :locals =>
-          {
-            :f => f,
-            :field => :custom_title_image_id,
-            :image => @page.custom_title_image,
-            :toggle_image_display => false
-          }
-        %>
-      </div>
     </div>
     <div class='field'>
       <%= label_tag :skip_to_first_child? %>
@@ -116,129 +111,30 @@
     <%= f.label :draft, "Save as Draft", :class => "stripped" %>
   </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>
-      <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", :class => "close_dialog" %>
+  <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
+    <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>
+      <%= render :partial => "/shared/admin/form_actions", :locals => {
+        :f => f, 
+        :continue_editing => false,
+        :submit_button_id => "new_page_part_save",
+        :cancel_button_id => "new_page_part_cancel"
+      } %>
     </div>
-  </div>
+  <% end %>
 <% end %>
+
 <% content_for :head do %>
 <script type='text/javascript'>
-  switch_custom_title_type = function(type)
-  {
-    $('custom_title_text').hide();
-    $('custom_title_image').hide();
-
-    $('custom_title_' + type).show();
-  }
-
-  FastInit.addOnLoad(function(){
-    $('toggle_advanced_options').observe('click', function(e)
-    {
-      $('more_options').toggle();
-      e.preventDefault();
-    });
-
-    $$('input[type=radio]').each(function(radio)
-    {
-      if (radio.name == 'page[custom_title_type]')
-      {
-        radio.observe('change', function(e)
-        {
-          switch_custom_title_type(this.value);
-        });
-      }
-    });
-
-<% 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');
-
-      e.preventDefault();
-    });
-
-    $('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.preventDefault();
-    });
-
-    $('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.preventDefault();
-    });
-<% end %>
+  $(document).ready(function(){
+    var page_parts = <%= RefinerySetting.find_or_set(:new_page_parts, false) == true ? 'true' : 'false' %>;
+    var new_part_url = "<%= new_admin_page_part_url %>";
+    var del_part_url = "<%= admin_page_parts_url %>";
+    page_options.init(page_parts, new_part_url, del_part_url);
   });
-
-  // Hook into the loaded function. This will be called when WYMeditor has done its thing.
-  WYMeditor.loaded = function()
-  {
-    new Control.Tabs('page_parts', {setClassOnContainer: true}).first();
-  }
-
 </script>
-<% end %>
+<% end %>