RubyGems - refinerycms - Versions diffs - 0.9.6.31 → 0.9.6.32 - Mend

refinerycms 0.9.6.31 → 0.9.6.32

Files changed (67) hide show

data/vendor/plugins/pages/app/views/admin/pages/_form_advanced_options.html.erb ADDED Viewed

@@ -0,0 +1,56 @@
+<p>
+  <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, @pages_for_parents_list, :id, :indented_title, :include_blank => true %>
+  </div>
+  <div class='field'>
+    <%= label_tag :custom_title %>
+    <%= label_tag "", 'Type:', :class => "stripped" %>
+    <% ["none", "text"].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' %>'>
+      <p>
+        <%= f.text_field :custom_title, {:size => 103} %><br/>
+        <small>
+          If you want the page to have a different title than the one that shows in the menu and browser title then enter it here.<br/>
+        </small>
+      </p>
+    </div>
+  </div>
+  <div class='field'>
+    <%= label_tag :skip_to_first_child? %>
+    <%= f.check_box :skip_to_first_child %>
+    <%= f.label :skip_to_first_child, "Check this box if you want the visitor to be redirected to this page's first child page if this page is selected.", :class => "stripped" %>
+  </div>
+  <div class='field'>
+    <%= f.label :link_url, "Custom URL" %>
+    <%= f.text_field :link_url, {:size => 103} %><br/>
+    <small>
+      Enter a URL if this page links to an external site or to a pre-existing resource e.g. a contact page.
+      <br/>
+      Note: This URL must point to a location that exists; a new one will not be created.
+    </small>
+  </div>
+  <%= render :partial => "form_advanced_options_seo", :locals => {:f => f} if RefinerySetting.find_or_set(:pages_advanced_options_include_seo, true) %>
+  <div class='field'>
+    <%= f.label :show_in_menu %>
+    <%= f.check_box :show_in_menu %>
+    <small>
+      <%= f.label :show_in_menu, "Check this box if this page should appear in the site menu" %>
+    </small>
+  </div>
+</div>
+<div class='field'>
+  <label>Draft</label>
+  <%= f.check_box :draft %>
+  <%= f.label :draft, "Save as Draft", :class => "stripped" %>
+</div>

data/vendor/plugins/pages/app/views/admin/pages/_form_advanced_options_seo.html.erb ADDED Viewed

@@ -0,0 +1,22 @@
+<h2>Search Engine Optimization</h2>
+<div class='field'>
+  <%= f.label :browser_title %>
+  <%= f.text_field :browser_title, :size => 63 %><br/>
+  <small>
+    If you want to override the default browser title, do it here.
+  </small>
+</div>
+<div class='field'>
+  <%= f.label :meta_keywords %>
+  <%= f.text_field :meta_keywords, :size => 63 %><br/>
+  <small>
+    Enter 5-10 keywords that relate to this page. Separate keywords by a comma.
+  </small>
+</div>
+<div class='field'>
+  <%= f.label :meta_description %>
+  <%= f.text_area :meta_description, :cols => 95, :rows => 3 %><br/>
+  <small>
+    Enter a concise two or three sentences describing what this page is about.
+  </small>
+</div>

data/vendor/plugins/pages/app/views/admin/pages/_form_new_page_parts.html.erb ADDED Viewed

@@ -0,0 +1,13 @@
+<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>

data/vendor/plugins/refinery/app/views/admin/_head.html.erb CHANGED Viewed

@@ -2,9 +2,10 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name') %> - Refinery</title>
-  <%= stylesheet_link_tag 'refinery/refinery', 'refinery/tooltips', "wymeditor/skins/refinery/skin", :cache => (use_caching ? "cache/refinery" : false) %>
+  <%= stylesheet_link_tag 'refinery/refinery', 'refinery/ui', 'refinery/tooltips', "wymeditor/skins/refinery/skin", :cache => (use_caching ? "cache/refinery" : false) %>
   <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
   <%= jquery_include_tags(use_caching) %>
+  <%= javascript_include_tag 'jquery/jquery.corner.js', :cache => (use_caching ? "cache/jquery-plugins" : false) %>
   <%= yield :head_after_javascript_libraries %>
   <%= javascript_include_tag 'admin', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
   <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>

data/vendor/plugins/refinery/app/views/shared/_menu.html.erb CHANGED Viewed

@@ -1,8 +1,8 @@
 <% cache(:action_suffix => RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")) do %>
   <ul id='<%= dom_id ||= "menu" %>' class='menu clearfix'>
-    <%= render :partial => "/shared/menu_branch", :collection => @menu_pages, :locals => {
+    <%= render :partial => "/shared/menu_branch", :collection => (collection ||= @menu_pages), :locals => {
       :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
-      :sibling_count => @menu_pages.size-1
+      :sibling_count => (collection ||= @menu_pages).size-1
     } -%>
   </ul>
 <% end %>

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

@@ -83,6 +83,7 @@ protected
   def take_down_for_maintenance?
     if RefinerySetting.find_or_set(:down_for_maintenance, false)
       if (@page = Page.find_by_menu_match("^/maintenance$", :include => [:parts, :slugs])).present?
+        find_pages_for_menu
         render :template => "/pages/show", :status => 503
       else
         render :text => "Our website is currently down for maintenance. Please try back soon."

data/vendor/plugins/refinery/lib/refinery/application_helper.rb CHANGED Viewed

@@ -1,8 +1,10 @@
 # Methods added to this helper will be available to all templates in the application.
 module Refinery::ApplicationHelper
-  include Refinery::HtmlTruncationHelper
+  include Refinery::HtmlTruncationHelper rescue puts "#{__FILE__}:#{__LINE__} Could not load hpricot"
+  # This is used to display the title of the current object (normally a page) in the browser's titlebar.
+  #
   def browser_title(yield_title=nil)
     [
       yield_title.present? ? yield_title : nil,
@@ -12,6 +14,7 @@ module Refinery::ApplicationHelper
   end
   # replace all system images with a thumbnail version of them (handy for all images inside a page part)
+  # for example, <%= content_fu(@page[:body], :preview) %> converts all /system/images to their 'preview' thumbnail
   def content_fu(content, thumbnail)
     content.scan(/\/system\/images([^\"\ ]*)/).flatten.each do |match|
       parts = match.split(".")
@@ -22,29 +25,48 @@ module Refinery::ApplicationHelper
     return content
   end
+  # 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.
   def descendant_page_selected?(page)
     page.descendants.any? {|descendant| selected_page?(descendant) }
   end
+  # image_fu is a helper for inserting an image that has been uploaded into a template.
+  # Say for example that we had a @model.image (@model having a belongs_to :image relationship)
+  # and we wanted to display the 'preview' thumbnail then we can use image_fu like this:
+  # <%= image_fu @model.image, :preview %> or with no thumbnail: <%= image_fu @model.image %>
   def image_fu(image, thumbnail = nil , options={})
     if image.present?
-      image_thumbnail = image.thumbnails.detect {|t| t.thumbnail == thumbnail.to_s}
+      # if a thumbnail name was specified then find the thumbnail belonging to this image with that name, if existant.
+      image_thumbnail = image.thumbnails.detect {|t| t.thumbnail == thumbnail.to_s} unless thumbnail.nil?
+      # default back to using the image specified as the "thumbnail" if we didn't find one.
       image_thumbnail = image unless image_thumbnail.present?
-      image_tag image_thumbnail.public_filename, {:alt => image.title, :width => image_thumbnail.width, :height => image_thumbnail.height}.merge!(options)
+      # call rails' image tag function with default alt, width and height options.
+      # if any other options were supplied these are merged in and can replace the defaults.
+      image_tag(image_thumbnail.public_filename, {:alt => image.title,
+                                                  :width => image_thumbnail.width,
+                                                  :height => image_thumbnail.height
+                                                 }.merge!(options))
     end
   end
-  def jquery_include_tags(use_caching=RefinerySetting.find_or_set(:use_resource_caching, false))
-    if !local_request? and RefinerySetting.find_or_set(:use_google_ajax_libraries, true)
+  # This function helps when including both the jquery and jqueryui libraries.
+  # If you use this function then whenever we update or relocate the version of jquery or jquery ui in use
+  # we will update the reference here and your existing application starts to use it.
+  # Use <%= jquery_include_tags %> to include it in your <head> section.
+  def jquery_include_tags(use_caching = RefinerySetting.find_or_set(:use_resource_caching, false),
+                          use_google = RefinerySetting.find_or_set(:use_google_ajax_libraries, true))
+    # render the tags normally unless
+    unless use_google and !local_request?
+      javascript_include_tag 'jquery', 'jquery-ui-1.8.min.js', :cache => (use_caching ? "cache/libraries" : nil)
+    else
       "#{javascript_include_tag("http://www.google.com/jsapi").gsub(".js", "")}
       <script type='text/javascript'>
         google.load('jquery', '1.4');
-        //google.load('jqueryui', '1.8');
-        // google isn't using jqueryui 1.8 yet although it was before.
-      </script>
-      #{javascript_include_tag 'jquery-ui-1.8.min.js'}"
-    else
-      javascript_include_tag 'jquery', 'jquery-ui-1.8.min.js', :cache => (use_caching ? "cache/libraries" : nil)
+        google.load('jqueryui', '1.8');
+      </script>"
     end
   end
@@ -76,7 +98,7 @@ module Refinery::ApplicationHelper
           when "text"
             obj.custom_title
           when "image"
-            image_fu obj.custom_title_image, nil, {:alt => obj.title} rescue obj.title
+            image_fu(obj.custom_title_image, nil, {:alt => obj.title}) rescue obj.title
           else
             obj.title
           end
@@ -86,25 +108,32 @@ module Refinery::ApplicationHelper
     end
     final_title = title.pop
-    if (options[:page_title][:wrap_if_not_chained] and title.empty?) and !options[:page_title][:tag].blank?
+    if (options[:page_title][:wrap_if_not_chained] and title.empty?) and options[:page_title][:tag].present?
       css = options[:page_title][:class].present? ? " class='#{options[:page_title][:class]}'" : nil
       final_title = "<#{options[:page_title][:tag]}#{css}>#{final_title}</#{options[:page_title][:tag]}>"
     end
-    if (title.empty?)
+    if title.empty?
       return final_title
     else
       return "<#{options[:ancestors][:tag]} class='#{options[:ancestors][:class]}'>#{title.join options[:ancestors][:separator]}#{options[:ancestors][:separator]}</#{options[:ancestors][:tag]}>#{final_title}"
     end
   end
+  # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
+  # They are all 16x16 so this is the default but is able to be overriden with supplied options.
   def refinery_icon_tag(filename, options = {})
     image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge!(options)
   end
+  # Determine whether the supplied page is the currently open page according to Rails.
   def selected_page?(page)
-    selected = current_page?(page) or (request.path =~ Regexp.new(page.menu_match) unless page.menu_match.blank?) or (request.path == page.link_url)
+    current_page?(page) or
+      (request.path =~ Regexp.new(page.menu_match) if page.menu_match.present?) or
+      (request.path == page.link_url)
   end
+  # Old deprecated function. TODO: Remove
   def setup
     logger.warn("*** Refinery::ApplicationHelper::setup has now been deprecated from the Refinery API. ***")
   end

data/vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb CHANGED Viewed

@@ -1,24 +1,26 @@
-# By Henrik Nyh <http://henrik.nyh.se> 2008-01-30.
-# Free to modify and redistribute with credit.
+=begin
+By Henrik Nyh <http://henrik.nyh.se> 2008-01-30.
+Free to modify and redistribute with credit.
-# modified by Dave Nolan <http://textgoeshere.org.uk> 2008-02-06
-# Ellipsis appended to text of last HTML node
-# Ellipsis inserted after final word break
+modified by Dave Nolan <http://textgoeshere.org.uk> 2008-02-06
+Ellipsis appended to text of last HTML node
+Ellipsis inserted after final word break
-# modified by Mark Dickson <mark@sitesteaders.com> 2008-12-18
-# Option to truncate to last full word
-# Option to include a 'more' link
-# Check for nil last child
+modified by Mark Dickson <mark@sitesteaders.com> 2008-12-18
+Option to truncate to last full word
+Option to include a 'more' link
+Check for nil last child
-# modified by Ken-ichi Ueda <http://kueda.net> 2009-09-02
-# Rails 2.3 compatability (chars -> mb_chars), via Henrik
-# Hpricot 0.8 compatability (avoid dup on Hpricot::Elem)
+modified by Ken-ichi Ueda <http://kueda.net> 2009-09-02
+Rails 2.3 compatability (chars -> mb_chars), via Henrik
+Hpricot 0.8 compatability (avoid dup on Hpricot::Elem)
-# modified by Philip Arndt <http://www.resolvedigital.co.nz> 2009-11-18
-# renamed function to truncate and activated html truncation when :preserve_html_tags is supplied and true.
-# modified namespace to Refinery namespace and renamed module.
+modified by Philip Arndt <http://www.resolvedigital.co.nz> 2009-11-18
+renamed function to truncate and activated html truncation when :preserve_html_tags is supplied and true.
+modified namespace to Refinery namespace and renamed module.
+removed rubygems requirement
+=end
-require "rubygems"
 require "hpricot"
 module Refinery::HtmlTruncationHelper
@@ -26,7 +28,7 @@ module Refinery::HtmlTruncationHelper
   # Like the Rails _truncate_ helper but doesn't break HTML tags, entities, and optionally. words.
   def truncate(text, *args)
     return super unless ((arguments = args.dup).extract_options![:preserve_html_tags] == true) # don't ruin the current args object
-    return if text.nil?
+    return unless text.present?
     options = args.extract_options!
     max_length = options[:length] || 30

metadata CHANGED Viewed

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 31
-  version: 0.9.6.31
+  - 32
+  version: 0.9.6.32
 platform: ruby
 authors:
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-04-20 00:00:00 +12:00
+date: 2010-05-06 00:00:00 +12:00
 default_executable:
 dependencies: []
@@ -31,7 +31,6 @@ extensions: []
 extra_rdoc_files:
 - VERSION
-- contributors.md
 - license.md
 - readme.md
 files:
@@ -61,7 +60,6 @@ files:
 - config/rackspace_cloudfiles.yml.example
 - config/routes.rb
 - config/settings.rb
-- contributors.md
 - db/migrate/20091109012126_add_missing_indexes.rb
 - db/migrate/20091130040711_add_down_for_maintenance_page.rb
 - db/migrate/20091207033335_add_superuser_to_users.rb
@@ -128,6 +126,7 @@ files:
 - public/images/refinery/icons/user_add.png
 - public/images/refinery/icons/user_comment.png
 - public/images/refinery/icons/user_edit.png
+- public/images/refinery/icons/zoom.png
 - public/images/refinery/logo-large.png
 - public/images/refinery/logo-medium.png
 - public/images/refinery/logo-small-medium.png
@@ -139,16 +138,9 @@ files:
 - public/images/thickbox/cross.png
 - public/images/thickbox/loadingAnimation.gif
 - public/images/thickbox/macFFBgHack.png
-- public/images/wymeditor/skins/refinery/blockquote.png
-- public/images/wymeditor/skins/refinery/center.png
-- public/images/wymeditor/skins/refinery/css.png
-- public/images/wymeditor/skins/refinery/h1.png
-- public/images/wymeditor/skins/refinery/h2.png
-- public/images/wymeditor/skins/refinery/h3.png
-- public/images/wymeditor/skins/refinery/h4.png
-- public/images/wymeditor/skins/refinery/h5.png
-- public/images/wymeditor/skins/refinery/h6.png
-- public/images/wymeditor/skins/refinery/icons.png
+- public/images/wymeditor/skins/refinery/arrow_redo.png
+- public/images/wymeditor/skins/refinery/arrow_undo.png
+- public/images/wymeditor/skins/refinery/eye.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-blockquote.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-h1.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-h2.png
@@ -158,10 +150,33 @@ files:
 - public/images/wymeditor/skins/refinery/iframe/lbl-h6.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-p.png
 - public/images/wymeditor/skins/refinery/iframe/lbl-pre.png
-- public/images/wymeditor/skins/refinery/justify.png
-- public/images/wymeditor/skins/refinery/left.png
-- public/images/wymeditor/skins/refinery/paragraph.png
+- public/images/wymeditor/skins/refinery/link_add.png
+- public/images/wymeditor/skins/refinery/link_break.png
+- public/images/wymeditor/skins/refinery/page_code.png
+- public/images/wymeditor/skins/refinery/page_paste.png
+- public/images/wymeditor/skins/refinery/photo_add.png
 - public/images/wymeditor/skins/refinery/right.png
+- public/images/wymeditor/skins/refinery/style.png
+- public/images/wymeditor/skins/refinery/table_add.png
+- public/images/wymeditor/skins/refinery/text_align_center.png
+- public/images/wymeditor/skins/refinery/text_align_justify.png
+- public/images/wymeditor/skins/refinery/text_align_left.png
+- public/images/wymeditor/skins/refinery/text_align_right.png
+- public/images/wymeditor/skins/refinery/text_bold.png
+- public/images/wymeditor/skins/refinery/text_heading_1.png
+- public/images/wymeditor/skins/refinery/text_heading_2.png
+- public/images/wymeditor/skins/refinery/text_heading_3.png
+- public/images/wymeditor/skins/refinery/text_heading_4.png
+- public/images/wymeditor/skins/refinery/text_heading_5.png
+- public/images/wymeditor/skins/refinery/text_heading_6.png
+- public/images/wymeditor/skins/refinery/text_italic.png
+- public/images/wymeditor/skins/refinery/text_list_bullets.png
+- public/images/wymeditor/skins/refinery/text_list_numbers.png
+- public/images/wymeditor/skins/refinery/text_paragraph.png
+- public/images/wymeditor/skins/refinery/text_strikethrough.png
+- public/images/wymeditor/skins/refinery/text_subscript.png
+- public/images/wymeditor/skins/refinery/text_superscript.png
+- public/images/wymeditor/skins/refinery/text_underline.png
 - public/images/wymeditor/skins/wymeditor_icon.png
 - public/javascripts/admin.js
 - public/javascripts/application.js
@@ -169,6 +184,7 @@ files:
 - public/javascripts/jquery.js
 - public/javascripts/jquery/GPL-LICENSE.txt
 - public/javascripts/jquery/MIT-LICENSE.txt
+- public/javascripts/jquery/jquery.corner.js
 - public/javascripts/refinery/admin.js
 - public/javascripts/refinery/boot_wym.js
 - public/javascripts/wymeditor/jquery.refinery.wymeditor.js
@@ -205,6 +221,7 @@ files:
 - public/stylesheets/refinery/refinery.css
 - public/stylesheets/refinery/theme.css
 - public/stylesheets/refinery/tooltips.css
+- public/stylesheets/refinery/ui.css
 - public/stylesheets/theme.css
 - public/stylesheets/wymeditor/skins/refinery/skin.css
 - public/stylesheets/wymeditor/skins/refinery/wymiframe.css
@@ -660,6 +677,9 @@ files:
 - 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/pages/_form.html.erb
+- vendor/plugins/pages/app/views/admin/pages/_form_advanced_options.html.erb
+- vendor/plugins/pages/app/views/admin/pages/_form_advanced_options_seo.html.erb
+- vendor/plugins/pages/app/views/admin/pages/_form_new_page_parts.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_page.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

data/contributors.md DELETED Viewed

@@ -1,20 +0,0 @@
-# Contributors
-## Major
-* parndt - Philip Arndt, [Resolve Digital](http://www.resolvedigital.co.nz)
-* djones - [David Jones](http://www.d-jones.com), [Resolve Digital](http://www.resolvedigital.co.nz)
-## Minor
-* ryanwood - [Ryan Wood](http://www.ryanwood.com)
-* hernan - Hernan Fernandez
-* btucker - [Ben Tucker](http://btucker.net)
-* avit - [Andrew Vit](http://avit.ca)
-* stevenheidel - [Steven Heidel](http://www.livingskywebdesign.com)
-* moretea - Maarten Hoogendoorn
-* csessions - [Chris Sessions](http://www.flying-saucer.net)
-* rubylibre
-* tsdbrown - [Luke Brown](http://www.tsdbrown.com)
-Want your name here? Help us out in anyway you can. And don't be so scared, we don't expect your code to be perfect the first time round.