Changeset 1239

Timestamp:

07/24/08 17:31:32 (6 months ago)

Author:

alban

Message:

Merge des liquid_methods

Files:

• trunk/app/models/image.rb (modified) (1 diff)
• trunk/app/models/show.rb (modified) (1 diff)

trunk/app/models/image.rb

@@ -1 +1 @@
-class Image < ActiveRecord::Base
+
+  liquid_methods :width, :height
+
-  belongs_to :show
-  has_attachment :storage => :file_system, :max_size => 300.kilobytes, :content_type => :image, :thumbnails => { :normal => '200>', :thumb => '75' }
-  validates_as_attachment
-end
+
+class Image::LiquidDropClass
+
+  def url_for
+    view.image_path @object.public_filename(:normal)
+  end
+
+  def url_for_thumb
+    view.image_path @object.public_filename(:thumb)
+  end
+
+  def tag
+    view.image_tag @object.public_filename(:normal)
+  end
+
+  def tag_for_thumb
+    view.image_tag @object.public_filename(:thumb)
+  end
+
+end

trunk/app/models/show.rb

@@ -4 +4 @@
-  belongs_to :template
-
-
+, :logo
-
-  def after_initialize