radiant-taggable-extension 2.0.3 → 2.0.4

data/app/views/admin/assets/_furniture.html.haml

@@ -0,0 +1,6 @@
+- fields_for :asset, @asset do |f|
+  %tr
+    %td.label
+      = f.label :furniture
+    %td.field{:style => 'text-align: left'}
+      = f.check_box :furniture

data/app/views/admin/assets/_tags.html.haml

@@ -0,0 +1,9 @@
+/ - include_stylesheet 'admin/taggable'
+/ - include_javascript 'autocomplete'
+/ - include_javascript 'admin/taggable'
+- fields_for :asset, @asset do |f|
+  %tr
+    %th.label
+      = f.label :keywords
+    %td.field
+      = f.text_field :keywords, :class => 'textbox tagger'

data/app/views/admin/pages/_tags.html.haml

@@ -0,0 +1,9 @@
+/ - include_stylesheet 'admin/taggable'
+/ - include_javascript 'autocomplete'
+/ - include_javascript 'admin/taggable'
+- fields_for :page, @page do |f|
+  %tr
+    %th.label
+      = f.label :keywords
+    %td.field
+      = f.text_field :keywords, :class => 'textbox tagger'

data/config/locales/en.yml

@@ -1,4 +1,9 @@
 en:
+  activerecord:
+    attributes:
+      asset:
+        keywords: "Tags"
+        furniture: "Furniture?"
   tags: "Tags"
   helpers:
     label:
@@ -7,5 +12,3 @@ en:
         page_id: "Pointer to page"
         visible: "Visible?"
         description: "Description (optional)"
-  taggable_extension:
-    site_furniture: "Site furniture? (not shown in lists and galleries)"

data/db/migrate/20111011075109_keywords_field.rb

@@ -0,0 +1,15 @@
+class KeywordsField < ActiveRecord::Migration
+  def self.up
+    Page.find(:all).each do |page|
+      if keywords = page.field(:keywords).try(:content)
+        page.attached_tags = Tag.from_list(keywords)
+        page.save
+      end
+      page.field(:keywords).delete
+    end
+  end
+
+  def self.down
+
+  end
+end

data/lib/radiant-taggable-extension.rb

@@ -1,5 +1,5 @@
 module RadiantTaggableExtension
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
   SUMMARY = %q{Tagging, clouding and faceting extension for Radiant CMS}
   DESCRIPTION = %q{General purpose tagging and retrieval extension: more versatile but less focused than the tags extension. A good way to support faceted search.}
   URL = "http://spanner.org/radiant/taggable"

data/lib/taggable/admin_ui.rb

@@ -10,12 +10,6 @@ module Taggable
         def load_taggable_regions
           @tag = load_default_tag_regions
         end
-        
-        # def load_default_regions_with_tags
-        #   load_default_regions_without_tags
-        #   load_taggable_regions
-        # end
-        # alias_method_chain :load_default_regions, :tags
 
         protected
 

data/lib/taggable/model.rb

@@ -119,9 +119,6 @@ module Taggable
         self.attached_tags.empty? ? [] : self.class.from_all_tags(self.attached_tags) - [self]
       end
     
-      # in the case of pages and anything else that keywords in the same way this overrides the existing column
-      # the rest of the time it's just another way of specifying tags.
-    
       def keywords 
         self.attached_tags.map {|t| t.title}.join(', ')
       end

data/taggable_extension.rb

@@ -17,11 +17,11 @@ class TaggableExtension < Radiant::Extension
     SiteController.send :include, Taggable::SiteController                # some path and parameter handling in support of library pages
     Admin::PagesController.send :include, Taggable::AdminPagesController  # tweaks the admin interface to make page tags more prominent
     UserActionObserver.instance.send :add_observer!, Tag                  # tags get creator-stamped
-
-    unless defined? admin.tag
-      Radiant::AdminUI.send :include, Taggable::AdminUI
-      Radiant::AdminUI.load_taggable_regions
-    end
+    Radiant::AdminUI.send :include, Taggable::AdminUI unless defined? admin.tag
+    admin.tag ||= Radiant::AdminUI.load_taggable_regions
+    admin.asset.edit.add :extended_metadata, 'furniture'
+    admin.asset.edit.add :extended_metadata, 'tags'
+    admin.page.edit.add :extended_metadata, 'tags'
 
     tab("Content") do
       add_item("Tags", "/admin/tags")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-taggable-extension
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - William Ross
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 +01:00
-default_executable: 
+date: 2011-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sanitize
@@ -50,9 +49,9 @@ files:
 - app/models/library_page.rb
 - app/models/tag.rb
 - app/models/tagging.rb
-- app/views/admin/assets/_edit_metadata.html.haml
-- app/views/admin/assets/_edit_title.html.haml
-- app/views/admin/pages/_edit_title.html.haml
+- app/views/admin/assets/_furniture.html.haml
+- app/views/admin/assets/_tags.html.haml
+- app/views/admin/pages/_tags.html.haml
 - app/views/admin/tags/_form.html.haml
 - app/views/admin/tags/_search_results.html.haml
 - app/views/admin/tags/_show_assets.html.haml
@@ -67,6 +66,7 @@ files:
 - db/migrate/002_import_keywords.rb
 - db/migrate/20110316210834_structural_tags.rb
 - db/migrate/20110411075109_metaphones.rb
+- db/migrate/20111011075109_keywords_field.rb
 - lib/link_renderer.rb
 - lib/natcmp.rb
 - lib/radiant-taggable-extension.rb
@@ -89,7 +89,6 @@ files:
 - public/javascripts/autocomplete.js
 - public/stylesheets/sass/admin/taggable.sass
 - public/stylesheets/sass/tagcloud.sass
-- radiant-taggable-extension-2.0.2.gem
 - radiant-taggable-extension.gemspec
 - Rakefile
 - README.md
@@ -102,11 +101,10 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - taggable_extension.rb
-has_rdoc: true
 homepage: http://spanner.org/radiant/taggable
 licenses: []
 
-post_install_message: "\n  Add this to your Gemfile with:\n\n    gem 'radiant-taggable-extension', '~> 2.0.3'\n\n  "
+post_install_message: "\n  Add this to your Gemfile with:\n\n    gem 'radiant-taggable-extension', '~> 2.0.4'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -132,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Tagging, clouding and faceting extension for Radiant CMS

data/app/views/admin/assets/_edit_metadata.html.haml

@@ -1,7 +0,0 @@
-%tr
-  %td.label
-    Display
-  %td.field{:style => 'text-align: left;'}
-    - fields_for :asset, @asset do |fields|
-      = fields.check_box :furniture
-      = fields.label :furniture, t('taggable_extension.site_furniture')

data/app/views/admin/assets/_edit_title.html.haml

@@ -1,14 +0,0 @@
-- include_stylesheet 'admin/taggable'
-- include_javascript 'autocomplete'
-- include_javascript 'admin/taggable'
-
-- fields_for :asset, @asset do |fields|
-  %p.keywords
-    %label{:for=>"asset_keywords"}
-      Tags
-    = fields.text_field :keywords, :class => 'textbox tagger'
-
-  %p.title
-    %label{:for=>"asset_title"}
-      Title
-    = fields.text_field :title, :class => 'textbox', :maxlength => 100

data/app/views/admin/pages/_edit_title.html.haml

@@ -1,12 +0,0 @@
-- include_stylesheet 'admin/taggable'
-- include_javascript 'autocomplete'
-- include_javascript 'admin/taggable'
-
-- fields_for :page, @page do |fields|
-  %p.keywords
-    %label{:for=>"page_keywords"}
-      =t('tags')
-    = fields.text_field :keywords, :class => 'textbox tagger'
-  %p.title
-    %label{:for=>"page_title"}= t('page_title')
-    = fields.text_field :title, :class => 'textbox', :maxlength => 255