Permalink
Browse files

tidying up relations with clipped

  • Loading branch information...
1 parent 4c1356f commit e82c1a7cc0fcb1115ddb069ba421b0929c2ba6e1 @will-r will-r committed Oct 11, 2011
@@ -1,20 +1,7 @@
-- fields_for :asset, @asset do |fields|
- #extended-metadata{ :class => "row", :style => "display: none" }
- %table.fieldset{ :cellpadding => "0", :cellspacing => "0", :border => "0" }
- %tr
- %td.label
- = fields.label :caption
- %td.field
- = fields.text_field :caption, :class => 'textbox', :maxlength => 255
- -if @asset.new_record? || @asset.image?
- %tr
- %td.label
- Display
- %td.field{:style => 'text-align: left;'}
- = fields.check_box :furniture
- = fields.label :furniture, "Site furniture? (not shown in lists and galleries)"
- = render_region :extended_metadata
- %p
- %small
- %a{ :id => "more-extended-metadata", :href => "#", :onclick => "#{toggle_javascript_for('extended-metadata')}; return false;" } More
- %a{ :id => "less-extended-metadata", :href => "#", :onclick => "#{toggle_javascript_for('extended-metadata')}; return false;", :style => "display: none" } Less
+%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')
View
@@ -6,4 +6,6 @@ en:
structural: "Structural?"
page_id: "Pointer to page"
visible: "Visible?"
- description: "Description (optional)"
+ description: "Description (optional)"
+ taggable_extension:
+ site_furniture: "Site furniture? (not shown in lists and galleries)"
@@ -1,5 +1,5 @@
module RadiantTaggableExtension
- VERSION = '2.0.1'
+ VERSION = '2.0.2'
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"
View
@@ -25,7 +25,7 @@ def keywords
end
def keywords=(somewords="")
- self.attached_tags = Tag.from_list(somewords)
+ self.attached_tags = Tag.from_list(somewords) || []
end
def keywords_before_type_cast # called by form_helper
@@ -73,7 +73,7 @@
it "should redirect to a normalised form of the requested address" do
get :show_page, :url => '/library/green/furiously'
response.should be_redirect
- response.should redirect_to 'http://test.host/library/furiously/green'
+ response.should redirect_to 'http://test.host/library/furiously/green/'
end
it "should add a default Cache-Control header with public and max-age of 5 minutes" do

0 comments on commit e82c1a7

Please sign in to comment.