refinerycms 0.9.6.5 → 0.9.6.6

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

@@ -28,11 +28,4 @@
     <label>Current Image</label>
     <%= image_fu @image, :medium, { :class => "brown_border" } %>
   </div>
-<% end %>
-<% content_for :head do %>
-  <script type='text/javascript'>
-    $(document).ready(function(){
-      image_dialog.init();
-    });
-  </script>
-<% end if from_dialog? %>
+<% end %>

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

@@ -44,7 +44,7 @@
 <% content_for :head do %>
   <script type='text/javascript'>
     $(document).ready(function(){
-      image_dialog.init();
+      image_dialog.init(<%= @callback.present? ? "self.parent.#{@callback}" : "null" %>);
     });
   </script>
 <% end %>

data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb

@@ -1,11 +1,11 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
     <span class='actions'>
-      <%= link_to refinery_icon_tag("#{inquiry.open? ? 'accept' : 'arrow_up'}.png"), {:action => "toggle_status", :id => inquiry.id}, 
+      <%= link_to refinery_icon_tag("#{inquiry.open? ? 'accept' : 'arrow_up'}.png"), {:action => "toggle_status", :id => inquiry.id},
                                                     {:title => "Move this inquiry to #{inquiry.open? ? 'closed' : 'open'}"} %>
-      <%= link_to refinery_icon_tag('email_open.png'), {:action => 'show', :id => inquiry.id}, 
+      <%= link_to refinery_icon_tag('email_open.png'), {:action => 'show', :id => inquiry.id},
                                                     {:title => "Read this inquiry"} -%>
-      <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry), :class => "cancel confirm-delete", 
+      <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry), :class => "cancel confirm-delete",
                                                     :title => "Remove this inquiry forever" -%>
     </span>
     <%=h inquiry.name %>

data/vendor/plugins/inquiries/app/views/inquiries/new.html.erb

@@ -28,4 +28,4 @@
     <% end %>
   </div>
 <% end %>
-<%= render :partial => "/shared/content_page" %>
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb

@@ -1 +1 @@
-<%= render :partial => "/shared/content_page" %>
+<%= render :partial => "/shared/content_page" %>

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

@@ -2,4 +2,4 @@ class Admin::NewsItemsController < Admin::BaseController
 
   crudify :news_item, :order => "created_at DESC"
 
-end
+end

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

@@ -17,4 +17,4 @@ protected
     @page = Page.find_by_link_url("/news", :include => [:parts, :slugs])
   end
 
-end
+end

data/vendor/plugins/news/app/views/news_items/index.html.erb

@@ -14,4 +14,4 @@
   <% end %>
 <% end %>
 
-<%= render :partial => "/shared/content_page" %>
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/news/app/views/news_items/show.html.erb

@@ -10,4 +10,4 @@
 <% end %>
 <% content_for :body_content_right, render(:partial => 'recent_posts') %>
 
-<%= render :partial => "/shared/content_page" %>
+<%= render :partial => "/shared/content_page" %>

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

@@ -15,4 +15,4 @@ protected
     expire_fragment(%r{site_menu})
   end
 
-end
+end

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

@@ -4,26 +4,26 @@ class Page < ActiveRecord::Base
 
   acts_as_tree :order => "position ASC", :include => [:children, :slugs]
 
-	# Docs for friendly_id http://github.com/norman/friendly_id
+  # Docs for friendly_id http://github.com/norman/friendly_id
   has_friendly_id :title, :use_slug => true
 
   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
+  # 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 => [Rails.root.to_s, "tmp", "index"]
+                  :index_file => [Rails.root.to_s, "tmp", "index"]
 
   before_destroy :deletable?
 
-	# when a dialog pops up to link to a page, how many pages per page should there be
-	PAGES_PER_DIALOG = 14
+  # 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 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 = " - "
+  # 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
@@ -38,13 +38,13 @@ class Page < ActiveRecord::Base
     if self.deletable?
       super
     else
-			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
+      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
@@ -76,13 +76,13 @@ class Page < ActiveRecord::Base
     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"
+  # 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
@@ -91,29 +91,29 @@ class Page < ActiveRecord::Base
     end
   end
 
-	# Returns true if this page is "published"
+  # 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.
-	# If any of the page's ancestors aren't to be shown in the menu then this page is not either.
+  # 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.
+  # If any of the page's ancestors aren't to be shown in the menu then this page is not either.
   def in_menu?
     self.live? && self.show_in_menu? && !self.ancestors.any? { |a| !a.in_menu? }
   end
 
-	# Returns true if this page is the home page or links to it.
+  # 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
+  # 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.
+  # 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"
@@ -121,12 +121,12 @@ class Page < ActiveRecord::Base
     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.
+  # 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.
@@ -140,13 +140,13 @@ class Page < ActiveRecord::Base
     super_value
   end
 
-	# In the admin area we use a slightly different title to inform the which pages are draft or hidden pages
+  # In the admin area we use a slightly different title to inform the which pages are draft or hidden pages
   def title_with_meta
-		title = self.title
-		title << " <em>(hidden)</em>" unless self.show_in_menu?
-		title << " <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
+    title.strip
   end
 
   # Used to index all the content on this page so it can be easily searched.
@@ -154,7 +154,7 @@ class Page < ActiveRecord::Base
     self.parts.collect {|p| p.body}.join(" ")
   end
 
-	# Returns how many pages per page should there be when paginating pages
+  # Returns how many pages per page should there be when paginating pages
   def self.per_page(dialog = false)
     dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   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
 
-end
+end

data/vendor/plugins/pages/app/presenters/page_presenter.rb

@@ -1,3 +1,3 @@
 class PagePresenter < Refinery::BasePresenter
   #delegate DEFAULT_FIELDS.keys :to => :model
-end
+end

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

@@ -2,4 +2,4 @@
 <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/pages/_form.html.erb

@@ -137,4 +137,4 @@
     page_options.init(page_parts, new_part_url, del_part_url);
   });
 </script>
-<% end %>
+<% end %>

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

@@ -26,4 +26,4 @@
       <% end %>
     </ul>
   <% end %>
-</li>
+</li>

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

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

data/vendor/plugins/pages/app/views/pages/home.html.erb

@@ -1 +1 @@
-<%= render :partial => "/shared/content_page", :locals => {:show_submenu => false} %>
+<%= render :partial => "/shared/content_page", :locals => {:show_submenu => false} %>

data/vendor/plugins/pages/app/views/pages/show.html.erb

@@ -1 +1 @@
-<%= render :partial => "/shared/content_page" %>
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/pages/rails/init.rb

@@ -4,10 +4,10 @@ Refinery::Plugin.register do |plugin|
   plugin.version = 1.0
   plugin.menu_match = /admin\/((pages)|(page_dialogs)|(page_parts))$/
   plugin.activity = {
-    :class => Page, 
-    :url_prefix => "edit", 
-    :title => "title", 
-    :created_image => "page_add.png", 
+    :class => Page,
+    :url_prefix => "edit",
+    :title => "title",
+    :created_image => "page_add.png",
     :updated_image => "page_edit.png"
   }
-end
+end

data/vendor/plugins/rails_indexes/lib/indexer.rb

@@ -113,49 +113,8 @@ module Indexer
           @indexes_required[table_name] += [primary_key] unless @indexes_required[table_name].include?(primary_key)
         end
 
-        find_regexp = Regexp.new(/([A-Z]{1}[A-Za-z]+|self).(find){1}((_all){0,1}(_by_){0,1}([A-Za-z_]+))?\(([0-9A-Za-z"\':=>. \[\]{},]*)\)/)
-        if matches = find_regexp.match(line)
+        check_line_for_find_indexes(file_name, line)
 
-          model_name, column_names, options = matches[1], matches[6], matches[7]
-
-          if model_name == "self"
-            model_name = File.basename(file_name).sub(/\.rb$/,'').camelize
-            table_name = model_name.constantize.table_name
-          else
-            if model_name.respond_to?(:constantize)
-              if model_name.constantize.respond_to?(:table_name)
-                table_name = model_name.constantize.table_name
-              else
-                #puts "Unable to get the table_name for #{model_name.to_s}. it could be an ActiveResource"
-                next
-              end
-            else
-              #puts "Unable to constantize #{model_name.to_s}, if you are sure that #{model_name.to_s} is a valid class name, please file an issue on\nhttp://github.com/eladmeidar/rails_indexes\nPlease supply the relevant code as well, thanks. =)"
-              next
-            end
-          end
-
-          primary_key = model_name.constantize.primary_key
-          @indexes_required[table_name] += [primary_key] unless @indexes_required[table_name].include?(primary_key)
-
-          if column_names.present?
-            column_names = column_names.split('_and_')
-
-            # remove find_by_sql references.
-            column_names.delete("sql")
-
-            column_names = model_name.constantize.column_names & column_names
-
-            # Check if there were more than 1 column
-            if column_names.size == 1
-              column_name = column_names.first
-              @indexes_required[table_name] += [column_name] unless @indexes_required[table_name].include?(column_name)
-            else
-              @indexes_required[table_name] += [column_names] unless @indexes_required[table_name].include?(column_names)
-              @indexes_required[table_name] += [column_names.reverse] unless @indexes_required[table_name].include?(column_names.reverse)
-            end
-          end
-        end
       end
     end
 
@@ -180,6 +139,53 @@ module Indexer
     @indexes_required
   end
 
+
+  def self.check_line_for_find_indexes(file_name, line)
+    find_regexp = Regexp.new(/([A-Z]{1}[A-Za-z]+|self).(find){1}((_all){0,1}(_by_){0,1}([A-Za-z_]+))?\(([0-9A-Za-z"\':=>. \[\]{},]*)\)/)
+    if matches = find_regexp.match(line)
+
+      model_name, column_names, options = matches[1], matches[6], matches[7]
+
+      if model_name == "self"
+        model_name = File.basename(file_name).sub(/\.rb$/,'').camelize
+        table_name = model_name.constantize.table_name
+      else
+        if model_name.respond_to?(:constantize)
+          if model_name.constantize.respond_to?(:table_name)
+            table_name = model_name.constantize.table_name
+          else
+            #puts "Unable to get the table_name for #{model_name.to_s}. it could be an ActiveResource"
+            next
+          end
+        else
+          #puts "Unable to constantize #{model_name.to_s}, if you are sure that #{model_name.to_s} is a valid class name, please file an issue on\nhttp://github.com/eladmeidar/rails_indexes\nPlease supply the relevant code as well, thanks. =)"
+          next
+        end
+      end
+
+      primary_key = model_name.constantize.primary_key
+      @indexes_required[table_name] += [primary_key] unless @indexes_required[table_name].include?(primary_key)
+
+      if column_names.present?
+        column_names = column_names.split('_and_')
+
+        # remove find_by_sql references.
+        column_names.delete("sql")
+
+        column_names = model_name.constantize.column_names & column_names
+
+        # Check if there were more than 1 column
+        if column_names.size == 1
+          column_name = column_names.first
+          @indexes_required[table_name] += [column_name] unless @indexes_required[table_name].include?(column_name)
+        else
+          @indexes_required[table_name] += [column_names] unless @indexes_required[table_name].include?(column_names)
+          @indexes_required[table_name] += [column_names.reverse] unless @indexes_required[table_name].include?(column_names.reverse)
+        end
+      end
+    end
+  end
+
   def self.key_exists?(table,key_columns)
     result = (key_columns.to_a - ActiveRecord::Base.connection.indexes(table).map { |i| i.columns }.flatten)
     result.empty?
@@ -234,8 +240,6 @@ EOM
 
       puts "## Drop this into a file in db/migrate ##"
       puts migration
-    else
-      puts "Didn't find any models requiring indexing in your app/models directory."
     end
   end
 
@@ -293,11 +297,9 @@ EOM
 
         puts "## Drop this into a file in db/migrate ##"
         puts migration
-      else
-        puts "Didn't find any models requiring indexing in your app/models directory."
       end
     end
   else
     find_indexes
   end
-end
+end

data/vendor/plugins/rails_indexes/tasks/indexer.rake

@@ -1,16 +1,18 @@
+require File.join(File.dirname(__FILE__), "../lib/indexer.rb")
+
 namespace :db do
   desc "collect indexes based on AR::Base.find calls."
   task :show_me_ar_find_indexes => :environment do
     Indexer.ar_find_indexes
   end
-
+  
   desc "scan for possible required indexes"
   task :show_me_some_indexes => :environment do
     # Indexer.indexes_list
     puts "Sorry, simple report is deprecated.\nuse rake db:show_me_a_migration or db:show_me_ar_find_indexes instead"
   end
-
+  
   task :show_me_a_migration => :environment do
     Indexer.simple_migration
   end
-end
+end