@@ -1,10 +1,5 @@ class ClippingImage < Asset - has_attachment :content_type => :image, - :storage => :s3, - :max_size => 3.megabytes, - :resize_to => "465>", - :path_prefix => "assets", - :thumbnails => { :thumb => "100x100!", :medium_square => '200x200!', :medium => "200>" } - + has_attachment prepare_options_for_attachment_fu(AppConfig.clipping['attachment_fu_options']) + validates_as_attachment end \ No newline at end of file app/models/clipping_image.rb @@ -1,9 +1,5 @@ class HomepageFeature < ActiveRecord::Base - has_attachment :storage => :s3, - :min_size => 1, - :max_size => 1.megabytes, - :content_type => ['image/jpg', 'image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png'], - :thumbnails => AppConfig.feature['thumbs'] + has_attachment prepare_options_for_attachment_fu(AppConfig.feature['attachment_fu_options']) validates_presence_of validates_presence_of :content_type app/models/homepage_feature.rb @@ -1,10 +1,7 @@ class Photo < ActiveRecord::Base acts_as_commentable - - attachment_fu_options = AppConfig.photo['attachment_fu_options'] - attachment_fu_options = attachment_fu_options.symbolize_keys.merge({:storage => attachment_fu_options['storage'].to_sym, :max_size => attachment_fu_options['max_size'].to_i.megabytes }) - has_attachment attachment_fu_options + has_attachment prepare_options_for_attachment_fu(AppConfig.photo['attachment_fu_options']) acts_as_taggable app/models/photo.rb @@ -70,9 +70,11 @@ Object.extend(Object.extend(Glider.prototype, Abstract.prototype), { var nextIndex = (this.sections.length - 1 == currentIndex) ? 0 : currentIndex + 1; } else var nextIndex = 1; - this.moveTo(this.sections[nextIndex], this.scroller, { - duration: this.options.duration - }); + if(this.sections.length > 1){ + this.moveTo(this.sections[nextIndex], this.scroller, { + duration: this.options.duration + }); + } }, previous: function(){ assets/javascripts/glider.js @@ -4,6 +4,9 @@ community_description: "The Best Place for People Who Love Communities" support_email: "support@community.com" meta_description: 'A description of your community for use in META tags.' meta_keywords: 'keywords for use in META tags' +sections_enabled: ['photos', 'posts', 'clippings', 'contests', 'categories', 'events'] +show_advertising: false +closed_beta_mode: false # The label you use for 'staff' writers (featured writer, staff, pro, etc.) featured_writer_label: 'Featured Writer' @@ -22,10 +25,21 @@ photo: content_type: ['image/jpg', 'image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png'] feature: - thumbs: {thumb: [45,45], large: [635,150]} use_thumbs: false dimensions: [150, 635] -sections_enabled: ['photos', 'posts', 'clippings', 'contests', 'categories', 'events'] -show_advertising: false -closed_beta_mode: false - + attachment_fu_options: + resize_to: "465>" + min_size: 1 + max_size: 1 + thumbnails: {thumb: '45x45!', large: '635x150!'} + storage: 'file_system' + content_type: ['image/jpg', 'image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png'] + +clipping: + attachment_fu_options: + resize_to: "465>" + min_size: 1 + max_size: 3 + thumbnails: {thumb: "100x100!", medium_square: "200x200!", medium: "200>"} + storage: 'file_system' + content_type: ['image/jpg', 'image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png'] \ No newline at end of file engine_config/application.yml @@ -1,3 +1,4 @@ +require 'community_engine' require 's3_cache_control' Module.class_eval do init.rb @@ -1 +1,13 @@ -# CommunityEngine \ No newline at end of file +# CommunityEngine +module CommunityEngine + module ActiveRecordExtensions + + def prepare_options_for_attachment_fu(options) + attachment_fu_options = options.symbolize_keys.merge({:storage => options['storage'].to_sym, + :max_size => options['max_size'].to_i.megabytes}) + end + + end +end + +ActiveRecord::Base.send(:extend, CommunityEngine::ActiveRecordExtensions) lib/community_engine.rb 1353701f35da7de5e4474123c95c2c5819c7b9ff Bruno Bornsztein bruno@otis.local http://github.com/bborn/communityengine/commit/f0993287c4839052d89ae74eaa0ad504ab460aa6 f0993287c4839052d89ae74eaa0ad504ab460aa6 2008-03-30T19:12:27-07:00 2008-03-30T19:12:27-07:00 updating clipping image and hompage_feature to use filesystem backend as default 6d5e47fc4825753c7c81299d48eb83b656d73e0f Bruno Bornsztein bruno@otis.local