@@ -99,13 +99,8 @@ module GalleryItemTags <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) - if tag.attr['safe'] == 'true' - @safe = item.name.gsub(/[\s]+/, '_').downcase - else - @normal = item.name - end - name = tag.attr['safe'] ? @safe : @normal + item = find_item(tag) + name = tag.attr['safe'] ? item.name.downcase.gsub(/[\s~\.:;+=]+/, '_') : item.name end desc %{ @@ -116,12 +111,7 @@ module GalleryItemTags 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 = tag.attr['safe'] ? item.keywords.downcase.gsub(/[\s~\.:;+=]+/, '_') : item.keywords keys.gsub(/\,/, joiner); end lib/gallery_item_tags.rb @@ -36,7 +36,7 @@ module GalleryLightboxTags image_path = item.thumb(:width => width, :height => height, :geometry => geometry).public_filename li_start_tag = tag.attr["thumbnail"] == 'none' ? "<li#{klass}>" : %{<li style="background-image: url('#{thumb_path}')"#{klass}>} content << %{ #{li_start_tag} - <a href="#{image_path}" rel="lightbox[#{gallery.name.downcase.gsub(/[^-a-z0-9~\s\.:;+=_]/,'')}]" title="#{item.name}"> + <a href="#{image_path}" rel="lightbox[#{gallery.name.downcase.gsub(/[\s~\.:;+=]+/, '_')}]" title="#{item.name}"> #{item.name} </a></li>} end unless gallery.items.empty? lib/gallery_lightbox_tags.rb @@ -96,12 +96,7 @@ module GalleryTags 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 + name = tag.attr['safe'] ? gallery.name.gsub(/[\s~\.:;+=]+/, '_').downcase : gallery.name end desc %{ @@ -112,12 +107,7 @@ module GalleryTags tag "gallery:keywords" do |tag| gallery = tag.locals.gallery 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 = tag.attr['safe'] ? gallery.keywords.gsub(/[\s~\.:;+=]+/, '_').downcase : gallery.keywords keys.gsub(/\,/, joiner); tag.expand end @@ -142,13 +132,7 @@ module GalleryTags 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 + keys = tag.attr['safe'] ? gallery_keyword.keyword.gsub(/[\s~\.:;+=]+/, '_').downcase : gallery_keyword.keyword end desc %{ @@ -163,7 +147,7 @@ module GalleryTags 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>} + %{<a href="#{gallery_url[0..-2]}?keywords=#{keyword.gsub(/[\s~\.:;+=]+/, '_')}"#{attributes}>#{keyword}</a>} end tag 'gallery:breadcrumbs' do |tag| lib/gallery_tags.rb 4a15698bd45ab9c29faf9983b607ed5da090d397 Tom Cowell tc@eightsquarestudio.com http://github.com/pilu/radiant-gallery/commit/eb995b135c4b4e9514540e7aeb8dd86f7abb14c7 eb995b135c4b4e9514540e7aeb8dd86f7abb14c7 2009-06-25T06:52:58-07:00 2009-06-25T06:52:58-07:00 merging fixes for hairballopolis/gallery back in f65b4ee87f9d9a8e389c1b3ceece532657c0d919 Tom Cowell tc@eightsquarestudio.com