app/models/gallery_keyword.rb
db/migrate/20090131152801_add_keywords.rb
@@ -124,10 +124,12 @@ If you want to generate that thumbnail just after the upload of the image, add t
admin_thumb: 300x300 # do not remove
admin_preview: 500x500 # do not remove
small: 200x100 # this is the signature you use in the page.
+ square: c90x90 # specific sized images with a center crop
== Contributors
* Version: 0.3.0 - Adam Salter - http://10outta10.com
+* Version: 0.7.* - Tom Cowell - http://eightsquarestudio.com
== Credits
README.rdoc
@@ -2,6 +2,8 @@ require 'action_controller/test_process.rb'
class GalleryImportingsController < ApplicationController
+ protect_from_forgery :except => [ :import ]
+
helper 'galleries'
layout 'gallery_popup'
app/controllers/gallery_importings_controller.rb
@@ -18,7 +18,9 @@ class Gallery < ActiveRecord::Base
belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by'
belongs_to :update_by, :class_name => 'User', :foreign_key => 'update_by'
-
+ has_and_belongs_to_many :gallery_keywords, :join_table => "galleries_keywords", :foreign_key => "gallery_id", :uniq => true,
+ :class_name => "GalleryKeyword", :association_foreign_key => "keyword_id"
+
attr_protected :slug, :path
validates_presence_of :name
@@ -49,6 +51,23 @@ class Gallery < ActiveRecord::Base
File.join(self.absolute_path, 'thumbs')
end
+ def keywords
+ str =''
+ self.gallery_keywords.each do |key|
+ str += key.keyword
+ str += ','
+ end
+ str.slice(0..-2)
+ end
+
+ def keywords=(keywords)
+ self.gallery_keywords = []
+ keys = keywords.split(',')
+ keys.each do |word|
+ self.gallery_keywords << GalleryKeyword.find_or_create_by_keyword(word.strip)
+ end
+ end
+
def url(root_id = nil)
File.join((self.ancestors_from(root_id).reverse << self).collect{|a| a.slug})
end
app/models/gallery.rb
@@ -10,14 +10,14 @@ class GalleryItem < ActiveRecord::Base
@@extensions[extension.downcase] || 'Unknown'
end
end
- end
+ end
attr_accessible :name, :description, :uploaded_data
has_attachment :storage => :file_system,
:path_prefix => Radiant::Config["gallery.path_prefix"],
:processor => Radiant::Config["gallery.processor"],
- :max_size => 3.megabytes
+ :max_size => Radiant::Config["gallery.max_size"].to_i.kilobytes
belongs_to :gallery
@@ -27,6 +27,9 @@ class GalleryItem < ActiveRecord::Base
belongs_to :parent, :class_name => 'GalleryItem', :foreign_key => 'parent_id'
has_many :infos, :class_name => "GalleryItemInfo", :dependent => :delete_all
+
+ has_and_belongs_to_many :gallery_keywords, :join_table => "gallery_items_keywords", :foreign_key => "gallery_item_id", :uniq => true,
+ :class_name => "GalleryKeyword", :association_foreign_key => "keyword_id"
before_create :set_filename_as_name
before_create :set_position
@@ -37,7 +40,7 @@ class GalleryItem < ActiveRecord::Base
after_attachment_saved do |item|
item.generate_default_thumbnails if item.parent.nil?
end
-
+
before_thumbnail_saved do |thumbnail|
thumbnail.gallery_id = thumbnail.parent.gallery_id
end
@@ -68,6 +71,28 @@ class GalleryItem < ActiveRecord::Base
end
end
+ def keywords
+ str = ''
+ if self.gallery_keywords.length > 0
+ self.gallery_keywords.uniq.each do |key|
+ str += key.keyword
+ str += ','
+ end
+ str = str.slice(0..-2)
+ else
+ str += self.gallery.keywords
+ end
+ return str
+ end
+
+ def keywords=(keywords)
+ self.gallery_keywords = []
+ keys = keywords.split(',')
+ keys.each do |word|
+ self.gallery_keywords << GalleryKeyword.find_or_create_by_keyword(word.strip)
+ end
+ end
+
def jpeg?
not (self.content_type =~ /jpeg/).nil?
end
app/models/gallery_item.rb
@@ -15,10 +15,14 @@
</p>
<div>
<%= f.text_area "description", :class => 'textbox', :maxlength => 255 %>
+ </div>
+ <div>
+ <label for="gallery_keywords"> Keywords for gallery. </label>
+ <%= f.text_field "keywords", :class => 'textbox', :maxlength => 255 %>
</div>
<p id="advanced_options" style="display: none;">
<%= f.check_box :hidden, {:id => 'hide_gallery'} %>
- <label for="hide_gallery"> Hide this gallery in galleries list. </label>
+ <label for="hide_gallery"> Hide this gallery in galleries list. </label>
</p>
<p>
<small id="close_advanced_options" style="display: none;"><a href="#" onclick="toggle_advanced(); return false;">Close advanced options</a></small>
app/views/galleries/_form.html.erb
@@ -19,10 +19,13 @@ spinner = image('spinner.gif', :class => 'busy', :id => "gallery-busy-#{gallery.
<a title="<%= gallery.name %>" href="<%= admin_gallery_path(gallery) %>">
<%= icon %>
<span class="name"><%= gallery.name %></span>
- </a>
+ </a>
<small class="info">(<%= gallery.items.size %> files)</small>
<%= spinner %>
</span>
+ </td>
+ <td class='keywords'>
+ <span style='color:#666; font-size:0.75em;padding-left:0.5em;'><%= gallery.keywords if gallery.items.size > 0 && gallery.gallery_keywords.length > 0 %></span>
</td>
<td class="status"><%= gallery.id %></td>
<td class="status published-status"><%= gallery.hidden ? 'hidden' : 'visible' %></td>
app/views/galleries/_gallery.html.erb
@@ -6,7 +6,8 @@
<table id="gallery_tree" class="index" cellpadding="0" cellspacing="0" border="0">
<thead>
<tr>
- <th class="gallery">Name</th>
+ <th class="gallery">Name</th>
+ <th>Keywords <!-- link_to "(Manage Keywords)", --></th>
<th>ID</th>
<th class="status">Status</th>
<th class="modify" colspan="3">Actions</th>
app/views/galleries/index.html.erb
@@ -49,6 +49,10 @@
<div>
<label for="edit-item-description">Description</label>
<textarea id="edit-item-description" cols="40" rows="12"></textarea>
+ </div>
+ <div>
+ <label for="edit-item-keywords">Keywords</label>
+ <input type="text" id="edit-item-keywords" size="30">
</div>
<p>
<img id="edit-spinner" src="/images/admin/spinner.gif" style="display: none;"/>
app/views/galleries/show.html.erb
@@ -3,4 +3,5 @@
<%= item_preview(item) %>
<%= item_buttons(item) %>
<div class="description" id="item_<%= item.id %>_description" style="display:none;"><%= "#{item.description}" %></div>
+ <div class="keywords" id="item_<%= item.id %>_keywords" style="display:none;"><%= "#{item.keywords}" %></div>
</div>
\ No newline at end of file
app/views/gallery_items/_item.html.erb
@@ -9,7 +9,9 @@
<label for="update-item-popup-name-field">Name:</label> <br />
<%= f.text_field :name, :maxlength => 255 %> <br />
<label for="update-item-popup-description-field">Description:</label> <br />
- <%= f.text_area :description %><br />
+ <%= f.text_area :description %><br />
+ <label for='update-item-popup-keywords-field'>Keywords:</label><br/>
+ <%= f.text_field :keywords, :maxlength => 255 %><br/>
<%= submit_tag "Save", :id => 'popup_save_button' %>
</div>
<% end %>
app/views/gallery_items/edit.html.erb
@@ -1,3 +1,4 @@
page["item_#{@item.id}"].down('.label a').update(item_label_text(@item))
-page["item_#{@item.id}"].down('.description').update(@item.description)
+page["item_#{@item.id}"].down('.description').update(@item.description)
+page["item_#{@item.id}"].down('.keywords').update(@item.keywords)
page.call 'Gallery.EditForm.close'
\ No newline at end of file
app/views/gallery_items/update.js.rjs
@@ -1,6 +1,6 @@
path_prefix: public/galleries
processor: rmagick
-# max_size: 3.megabytes
+max_size: 3000 #file max size in kilobytes
gallery_based: no
default_thumbnails:
admin_thumb: 300x300 # do not remove
config/gallery.yml.default
@@ -1,5 +1,5 @@
require 'tempfile'
-require_dependency 'application'
+require_dependency 'application_controller'
require_dependency 'open-uri'
require_dependency 'exifr/jpeg'
require_dependency 'exifr/tiff'
@@ -36,8 +36,10 @@ class GalleryExtension < Radiant::Extension
def activate
init
- tab_options = {:visibility => [:all]}
- Radiant::Config["gallery.gallery_based"] == 'true' ? tab_options[:before] = "Pages" : tab_options[:after] = "Layouts"
+ tab_options = {:visibility => [:all]}
+ if Radiant::Config.table_exists?
+ Radiant::Config["gallery.gallery_based"] == 'true' ? tab_options[:before] = "Pages" : tab_options[:after] = "Layouts"
+ end
admin.tabs.add("Galleries", "/admin/galleries", tab_options)
admin.page.edit.add :layout_row, 'base_gallery' if admin.respond_to?(:page)
end
gallery_extension.rb
@@ -11,12 +11,10 @@ module GalleryItemTags
desc %{
Usage:
- <pre><code><r:gallery:items:each [order='order' by='by' limit='limit' offset='offset'
-scope='all|gallery']>
-...
-</r:gallery:items:each></code></pre>
- Iterates over all items in current gallery.
- Valid scopes are 'all' (find all Gallery Items) and 'gallery' (find Items that belong to the current Gallery) }
+ <pre><code><r:gallery:items:each [order='order' by='by' limit='limit' offset='offset' scope='all|gallery'
+ keywords='key1,key2,key3' current_keywords='is|is_not']></r:gallery:items:each></code></pre>
+ Valid scopes are 'all' (find all Gallery Items) and 'gallery' (find Items that belong to the current Gallery)
+ Iterates through gallery items keywords=(manual entered keywords) and/or current_keywords=(is|is_not) }
tag "gallery:items:each" do |tag|
content = ""
gallery = find_gallery(tag)
@@ -38,6 +36,18 @@ scope='all|gallery']>
options[:offset] = tag.attr['offset'] ? tag.attr['offset'].to_i : 0
options[:conditions] = {:parent_id => nil}
+ if !tag.attr['keywords'].nil? || !tag.attr['current_keywords'].nil?
+ keywords = !tag.attr['keywords'].nil? ? tag.attr['keywords'].split(',') : []
+ if (tag.attr['current_keywords'] == 'is' || tag.attr['current_keywords'] == 'is_not') && !tag.globals.page.request.parameters['keywords'].nil?
+ @current_keywords = tag.globals.page.request.parameters['keywords'].split(',') if !tag.globals.page.request.parameters['keywords'].nil?
+ if !@current_keywords.nil? && @current_keywords.length > 0
+ keywords.concat(@current_keywords)
+ end
+ end
+ options[:joins] = :gallery_keywords
+ options[:conditions].merge!({"gallery_keywords.keyword" => keywords}) if keywords.length > 0
+ end
+
@page_number = tag.globals.page.request.params["page"] && tag.globals.page.request.params["page"].first.to_i > 1 ? tag.globals.page.request.params["page"].first.to_i : 1
if !tag.attr['limit'].nil? && tag.attr['offset'].nil?
options[:offset] = tag.attr['limit'].to_i * (@page_number - 1)
@@ -45,7 +55,7 @@ scope='all|gallery']>
end
scope = tag.attr['scope'] ? tag.attr['scope'] : 'gallery'
- raise GalleryTagError.new('Invalid value for attribute scope. Valid values are: gallery, all') unless %[gallery all].include?(scope)
+ raise GalleryTagError.new('Invalid value for attribute scope. Valid values are: gallery, all') unless %[gallery all].include?(scope)
items = case scope
when 'gallery'
gallery ? gallery.items.find(:all, options) : []
@@ -86,12 +96,34 @@ scope='all|gallery']>
desc %{
Usage:
- <pre><code><r:gallery:item:name /></code></pre>
- Provides name for current gallery item }
+ <pre><code><r:gallery:item:name [safe='true']/></code></pre>
+ Provides name for current gallery item, safe is to make safe for web }
tag "gallery:item:name" do |tag|
- item = find_item(tag)
- item.name
- end
+ item = find_item(tag)
+ if tag.attr['safe'] == 'true'
+ @safe = item.name.gsub(/[\s]+/, '_').downcase
+ else
+ @normal = item.name
+ end
+ name = tag.attr['safe'] ? @safe : @normal
+ end
+
+ desc %{
+ Usage:
+ <pre><code><r:gallery:item:keywords [separator=',' safe='true']/></code></pre>
+ Provides keywords for current gallery item, use
+ separator="separator_string" to specify the character between keywords}
+ tag "gallery:item:keywords" do |tag|
+ item = find_item(tag)
+ joiner = tag.attr['separator'] ? tag.attr['separator'] : ' '
+ if tag.attr['safe'] == 'true'
+ @safe = item.keywords.gsub(/[\s]+/, '_').downcase
+ else
+ @normal = item.keywords
+ end
+ keys = tag.attr['safe'] ? @safe : @normal
+ keys.gsub(/\,/, joiner);
+ end
desc %{
Usage:
@@ -131,7 +163,7 @@ scope='all|gallery']>
desc %{
Usage:
- <pre><code><r:gallery:item:page_url /></code></pre>
+ <pre><code><r:gallery:item:page_url/></code></pre>
Provides page url for current gallery item }
tag "gallery:item:page_url" do |tag|
item = find_item(tag)
lib/gallery_item_tags.rb
@@ -25,7 +25,8 @@ module GalleryPageExtensions
desc %{
Usage:
<pre><code><r:gallery:link /></code></pre>
- Provides link for current gallery }
+ Provides link for current gallery options are rendered
+ inline as key:value pairs i.e. class='value' id='value', etc.}
tag "gallery:link" do |tag|
gallery = find_gallery(tag)
options = tag.attr.dup
@@ -46,6 +47,34 @@ module GalleryPageExtensions
File.join(tag.render('url'), gallery.url(self.base_gallery_id))
end
+ desc %{
+ Usage:
+ <pre><code><r:gallery:if_current_keywords>....</r:gallery:if_current_keywords></code></pre>
+ Check to see if keywords are available in the parameters of the request URI
+ }
+ tag 'gallery:if_current_keywords' do |tag|
+ tag.expand if tag.globals.page.request.parameters['keywords']
+ end
+
+ desc %{
+ Usage:
+ <pre><code><r:gallery:unless_current_keywords>....</r:gallery:unless_current_keywords></code></pre>
+ Check to for no keywords being available in the parameters of the request URI
+ }
+ tag 'gallery:unless_current_keywords' do |tag|
+ tag.expand unless tag.globals.page.request.parameters['keywords']
+ end
+
+ desc %{
+ Usage:
+ <pre><code><r:gallery:current_keywords [separator=',']/></code></pre>
+ Outputs the current keywords in the parameters of the request URI
+ }
+ tag "gallery:current_keywords" do |tag|
+ joiner = tag.attr['separator'] ? tag.attr['separator'] : ','
+ tag.globals.page.request.parameters['keywords'].gsub(/\,/, joiner)
+ end
+
def current_gallery
@current_gallery
end
@@ -56,7 +85,7 @@ module GalleryPageExtensions
path, item, action = $1, nil, nil
if path =~ /^(.*)\/(\d+\.\w+)\/(show|download)\/?$/
path, item, action = $1, $2, $3
- end
+ end
@current_gallery = find_gallery_by_path(path)
if @current_gallery
if !item.nil? && !action.nil?
lib/gallery_page_extensions.rb
@@ -10,8 +10,9 @@ module GalleryTags
desc %{
Usage:
- <pre><code><r:galleries:each>...</r:galleries:each></code></pre>
- Iterates through all galleries }
+ <pre><code><r:galleries:each [order='order' by='by' limit='limit' offset='offset' level='top|current|bottom|all'
+ keywords='key1,key2,key3' current_keywords='is|is_not']>...</r:galleries:each></code></pre>
+ Iterates through all gallery items keywords=(manual entered keywords) and/or current_keywords=(is|is_not) }
tag "galleries:each" do |tag|
content = ''
options = {}
@@ -32,27 +33,44 @@ module GalleryTags
options[:conditions][:parent_id] = nil
when 'bottom'
options[:conditions][:children_count] = 0
- end
+ end
by = tag.attr['by'] ? tag.attr['by'] : "position"
unless Gallery.columns.find{|c| c.name == by }
raise GalleryTagError.new("`by' attribute of `each' tag must be set to a valid field name")
+ end
+
+ if !tag.attr['keywords'].nil? || !tag.attr['current_keywords'].nil?
+ keywords = !tag.attr['keywords'].nil? ? tag.attr['keywords'].split(',') : []
+ if (tag.attr['current_keywords'] == 'is' || tag.attr['current_keywords'] == 'is_not') && !tag.globals.page.request.parameters['keywords'].nil?
+ @current_keywords = tag.globals.page.request.parameters['keywords'].split(',') if !tag.globals.page.request.parameters['keywords'].nil?
+ if !@current_keywords.nil? && @current_keywords.length > 0
+ keywords.concat(@current_keywords)
+ end
+ end
+ options[:joins] = :gallery_keywords
+ options[:conditions].merge!({"gallery_keywords.keyword" => keywords}) if keywords.length > 0
end
+
options[:limit] = tag.attr['limit'] ? tag.attr['limit'].to_i : 9999
options[:offset] = tag.attr['offset'] ? tag.attr['offset'].to_i : 0
order = (%w[ASC DESC].include?(tag.attr['order'].to_s.upcase)) ? tag.attr['order'] : "ASC"
- options[:order] = "#{by} #{order}"
- galleries = Gallery.find(:all, options)
+ options[:order] = "#{by} #{order}"
+ galleries = Gallery.find(:all, options).uniq unless @current_keywords.nil? && tag.attr['current_keywords'] == 'is'
+ if !@current_keywords.nil? && tag.attr['current_keywords'] == 'is_not' && galleries.length > 0
+ options.merge!(:conditions => ['galleries.id NOT IN (?) AND hidden =? AND external =?', galleries, false, false])
+ galleries = Gallery.find(:all, options).uniq
+ end
galleries.each do |gallery|
tag.locals.gallery = gallery
content << tag.expand
- end
+ end unless @current_keywords.nil? && tag.attr['current_keywords'] == 'is'
content
end
desc %{
Usage:
- <pre><code><r:gallery [id='id'] [name='name']>...</r:gallery></code></pre>
+ <pre><code><r:gallery [id='id'] [name='name'] [keywords='key1, key2, key3']>...</r:gallery></code></pre>
Selects current gallery }
tag "gallery" do |tag|
tag.locals.gallery = find_gallery(tag)
@@ -61,7 +79,7 @@ module GalleryTags
tag 'gallery:if_current' do |tag|
tag.expand if @current_gallery
- end
+ end
tag 'gallery:unless_current' do |tag|
tag.expand unless @current_gallery
@@ -70,15 +88,82 @@ module GalleryTags
tag 'gallery:current' do |tag|
tag.locals.item = @current_gallery
tag.expand
- end
+ end
desc %{
Usage:
- <pre><code><r:gallery:name /></code></pre>
- Provides name for current gallery }
+ <pre><code><r:gallery:name [safe='true']/></code></pre>
+ Provides name for current gallery, safe is to make safe for web }
tag "gallery:name" do |tag|
+ gallery = tag.locals.gallery
+ if tag.attr['safe'] == 'true'
+ @safe = gallery.name.gsub(/[\s]+/, '_').downcase
+ else
+ @normal = gallery.name
+ end
+ name = tag.attr['safe'] ? @safe : @normal
+ end
+
+ desc %{
+ Usage:
+ <pre><code><r:gallery:keywords [separator=',' safe='true']/></code></pre>
+ Provides keywords for current and children galleries, use
+ separator="separator_string" to specify the character between keywords }
+ tag "gallery:keywords" do |tag|
gallery = tag.locals.gallery
- gallery.name
+ joiner = tag.attr['separator'] ? tag.attr['separator'] : ' '
+ if tag.attr['safe'] == 'true'
+ @safe = gallery.keywords.gsub(/[\s]+/, '_').downcase
+ else
+ @normal = gallery.keywords
+ end
+ keys = tag.attr['safe'] ? @safe : @normal
+ keys.gsub(/\,/, joiner);
+ tag.expand
+ end
+
+ desc %{
+ Usage:
+ <pre><code><r:gallery:keywords:each /></code></pre>
+ Loops over each keywords for current and children galleries }
+ tag "gallery:keywords:each" do |tag|
+ content =''
+ gallery = tag.locals.gallery
+ gallery.gallery_keywords.uniq.each do |key|
+ tag.locals.uniq_keywords = key
+ content << tag.expand
+ end
+ content
+ end
+
+ desc %{
+ Usage:
+ <pre><code><r:gallery:keywords:keyword [safe='true']/></code></pre>
+ Get the keyword of the current gallery:keywords loop }
+ tag 'gallery:keywords:keyword' do |tag|
+ gallery_keyword = tag.locals.uniq_keywords
+ if tag.attr['safe'] == 'true'
+ @safe = gallery_keyword.keywords.gsub(/[\s]+/, '_').downcase
+ else
+ @normal = gallery_keyword.keywords
+ end
+ keys = tag.attr['safe'] ? @safe : @normal
+ keys
+ end
+
+ desc %{
+ Usage:
+ <pre><code><r:gallery:keywords:link [*options]/></code></pre>
+ Get the keyword and creates a link for the current gallery:keywords loop
+ options are rendered inline as key:value pairs i.e. class='' id='', etc.}
+ tag 'gallery:keywords:link' do |tag|
+ keyword = tag.locals.uniq_keywords ? tag.locals.uniq_keywords.keyword : tag.locals.gallery.keywords
+ options = tag.attr.dup
+ attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+ attributes = " #{attributes}" unless attributes.empty?
+ text = tag.double? ? tag.expand : tag.render('name')
+ gallery_url = File.join(tag.render('url'))
+ %{<a href="#{gallery_url[0..-2]}?keywords=#{keyword.gsub(/[\s]+/, '_')}"#{attributes}>#{keyword}</a>}
end
tag 'gallery:breadcrumbs' do |tag|
@@ -107,8 +192,9 @@ module GalleryTags
desc %{
Usage:
- <pre><code><r:gallery:children:each>...</r:gallery:children:each></code></pre>
- Iterates over all children in current gallery }
+ <pre><code><r:gallery:children:each [order='order' by='by' limit='limit' offset='offset'
+ keywords='key1,key2,key3' current_keywords='is|is_not']>...</r:gallery:children:each></code></pre>
+ Iterates through all gallery items keywords=(manual entered keywords) and/or current_keywords=(is|is_not) }
tag "gallery:children:each" do |tag|
content = ""
gallery = find_gallery(tag)
@@ -117,15 +203,33 @@ module GalleryTags
by = tag.attr['by'] ? tag.attr['by'] : "position"
unless Gallery.columns.find{|c| c.name == by }
raise GalleryTagError.new("`by' attribute of `each' tag must be set to a valid field name")
+ end
+
+ if !tag.attr['keywords'].nil? || !tag.attr['current_keywords'].nil?
+ keywords = !tag.attr['keywords'].nil? ? tag.attr['keywords'].split(',') : []
+ if (tag.attr['current_keywords'] == 'is' || tag.attr['current_keywords'] == 'is_not') && !tag.globals.page.request.parameters['keywords'].nil?
+ @current_keywords = tag.globals.page.request.parameters['keywords'].split(',') if !tag.globals.page.request.parameters['keywords'].nil?
+ if !@current_keywords.nil? && @current_keywords.length > 0
+ keywords.concat(@current_keywords)
+ end
+ end
+ options[:joins] = :gallery_keywords
+ options[:conditions].merge!({"gallery_keywords.keyword" => keywords}) if keywords.length > 0
end
+
options[:limit] = tag.attr['limit'] ? tag.attr['limit'].to_i : 9999
options[:offset] = tag.attr['offset'] ? tag.attr['offset'].to_i : 0
order = (%w[ASC DESC].include?(tag.attr['order'].to_s.upcase)) ? tag.attr['order'] : "ASC"
- options[:order] = "#{by} #{order}"
- gallery.children.find(:all, options).each do |sub_gallery|
+ options[:order] = "#{by} #{order}"
+ galleries = gallery.children.find(:all, options).uniq unless @current_keywords.nil? && tag.attr['current_keywords'] == 'is'
+ if !@current_keywords.nil? && tag.attr['current_keywords'] == 'is_not' && galleries.length > 0
+ options.merge!(:conditions => ['galleries.id NOT IN (?) AND hidden =? AND external =?', galleries, false, false])
+ galleries = gallery.children.find(:all, options).uniq
+ end
+ galleries.each do |sub_gallery|
tag.locals.gallery = sub_gallery
content << tag.expand
- end
+ end unless @current_keywords.nil? && tag.attr['current_keywords'] == 'is'
content
end
@@ -210,11 +314,13 @@ module GalleryTags
protected
- def find_gallery(tag)
+ def find_gallery(tag)
if tag.locals.gallery
- tag.locals.gallery
- elsif tag.attr["id"]
- Gallery.find_by_id tag.attr["id"]
+ tag.locals.gallery
+ elsif tag.attr["name"]
+ Gallery.find_by_name tag.attr["name"]
+ elsif tag.attr["id"]
+ Gallery.find_by_id tag.attr["id"]
elsif @current_gallery
@current_gallery
elsif tag.locals.page.base_gallery
lib/gallery_tags.rb
@@ -1,61 +1,68 @@
if (!Gallery) var Gallery = {};
-Gallery.EditForm = {
-
- init: function(popup, link) {
- if (!this.submitHandler) this.initializeHandler();
- var item = link.up('.item');
- popup.down('form').setAttribute('action', link.getAttribute('href'));
- var name = item.down('.label a').innerHTML;
- if (name == ' ') name = '';
- $('edit-item-name').value = name;
- $('edit-item-description').value = item.down('.description').innerHTML;
- },
-
- initializeHandler: function() {
- this.submitHandler = $('edit-gallery-item-popup').down('form').observe('submit', this.handleFormSubmit);
- },
-
- open: function(link) {
- var popup = $('edit-gallery-item-popup');
- this.init(popup, link);
- this.show(popup);
- },
-
- show: function(popup) {
- center(popup.show());
- popup.setStyle({top: '100px'});
- },
-
- close: function() {
- var popup = $('edit-gallery-item-popup');
- popup.hide();
- this.reset(popup);
- },
-
- reset: function(popup) {
- popup.down('form').setAttribute('action', '');
- $('edit-item-name').value = '';
- $('edit-item-description').value = '';
- $('edit-spinner').hide();
- $('edit-submit').show();
- },
-
- handleFormSubmit: function(event) {
- event.stop();
- var url = event.target.getAttribute('action');
- var name = $('edit-item-name').value;
- var description = $('edit-item-description').value;
- $('edit-spinner').show();
- $('edit-submit').hide();
- new Ajax.Request(url, {
- method: 'put',
- parameters: {
- 'gallery_item[name]': name, 'gallery_item[description]': description,
- authenticity_token: encodeURIComponent($('authenticity_token').value)
- }
- });
-
- }
-
+Gallery.EditForm = {
+
+ init: function(popup, link) {
+ if (!this.submitHandler) this.initializeHandler();
+ var item = link.up('.item');
+ popup.down('form').setAttribute('action', link.getAttribute('href'));
+ var name = item.down('.label a').innerHTML;
+ if (name == ' ') name = '';
+ $('edit-item-name').value = name;
+ $('edit-item-description').value = item.down('.description').innerHTML;
+ $('edit-item-keywords').value = item.down('.keywords').innerHTML;
+ },
+
+ initializeHandler: function() {
+ this.submitHandler = $('edit-gallery-item-popup').down('form').observe('submit', this.handleFormSubmit);
+ },
+
+ open: function(link) {
+ var popup = $('edit-gallery-item-popup');
+ this.init(popup, link);
+ this.show(popup);
+ },
+
+ show: function(popup) {
+ center(popup.show());
+ popup.setStyle({
+ top: '100px'
+ });
+ },
+
+ close: function() {
+ var popup = $('edit-gallery-item-popup');
+ popup.hide();
+ this.reset(popup);
+ },
+
+ reset: function(popup) {
+ popup.down('form').setAttribute('action', '');
+ $('edit-item-name').value = '';
+ $('edit-item-description').value = '';
+ $('edit-item-keywords').value = '';
+ $('edit-spinner').hide();
+ $('edit-submit').show();
+ },
+
+ handleFormSubmit: function(event) {
+ event.stop();
+ var url = event.target.getAttribute('action');
+ var name = $('edit-item-name').value;
+ var description = $('edit-item-description').value;
+ var keywords = $('edit-item-keywords').value;
+ $('edit-spinner').show();
+ $('edit-submit').hide();
+ new Ajax.Request(url, {
+ method: 'put',
+ parameters: {
+ 'gallery_item[name]': name,
+ 'gallery_item[description]': description,
+ 'gallery_item[keywords]': keywords,
+ authenticity_token: encodeURIComponent($('authenticity_token').value)
+ }
+ });
+
+ }
+
}
\ No newline at end of file
public/javascripts/extensions/gallery/gallery/edit_form.js
ce5dedcfdf4a59c95b8d34777bd4f1cb3fad3eb5
Tom Cowell
tc@eightsquarestudio.com
http://github.com/pilu/radiant-gallery/commit/4a15698bd45ab9c29faf9983b607ed5da090d397
4a15698bd45ab9c29faf9983b607ed5da090d397
2009-06-20T09:07:25-07:00
2009-06-20T09:07:25-07:00
merging with hairballopolis/radiant-gallery
2dd6f4392812af336bf47a45986ffed52f4664c1
Tom Cowell
tc@eightsquarestudio.com