@@ -4,11 +4,6 @@ TODO Flexitypes ---------- - -- Video Type - - Model - - Forms - - Security for uploading assets - Ensure the proper transmission of styles for assets - Sane behavior in case of error TODOS @@ -1,19 +1,3 @@ class Video < Asset belongs_to :collection - - has_attached_file :file, - :path => ":rails_root/public/system/assets/:class/:id/:filename", - :url => "/system/assets/:class/:id/:filename" - - has_attached_file :posterframe, - :path => ":rails_root/public/system/assets/:class/:id/:style.:extension", - :url => "/system/assets/:class/:id/:style.:extension", - :styles => lambda { |attachment| - if attachment.instance.vrame_styles.is_a? Hash - Image::DEFAULT_STYLES.merge(attachment.instance.vrame_styles) - else - Image::DEFAULT_STYLES - end - }, - :convert_options => { :all => "-quality 80 -colorspace RGB -strip" } end app/models/video.rb @@ -1,6 +1,6 @@ <% field = nil unless defined?(field) %> <% visible_type = field ? /([a-zA-z]+)$/.match(field.class.name)[1] : '' %> -<% class_name = (field and %w(Asset Video Collection Select MultiSelect).include?(visible_type) ? ' has-field-options' : '') %> +<% class_name = (field and %w(Asset Collection Select MultiSelect).include?(visible_type) ? ' has-field-options' : '') %> <tr class="schema-field<%= class_name %>"> @@ -42,7 +42,7 @@ </tr> <%# Field options %> -<% if field.is_a?(JsonObject::Types::Asset) || field.is_a?(JsonObject::Types::Collection) || field.is_a?(JsonObject::Types::Video) %> +<% if field.is_a?(JsonObject::Types::Asset) || field.is_a?(JsonObject::Types::Collection) %> <%= render :partial => 'vrame/categories/schema_builder/asset_styles', :locals => { :field => field } %> <% elsif field.is_a?(JsonObject::Types::Select) || field.is_a?(JsonObject::Types::MultiSelect) %> <%= render :partial => 'vrame/categories/schema_builder/select_options', :locals => { :field => field } %> app/views/vrame/categories/schema_builder/_schema_field.html.erb @@ -12,4 +12,3 @@ require 'jsonobject/types/bool' require 'jsonobject/types/asset' require 'jsonobject/types/collection' require 'jsonobject/types/placemark' -require 'jsonobject/types/video' lib/jsonobject/types.rb @@ -90,12 +90,6 @@ jQuery(function ($) { optionPrototype : 'li:first', optionTarget : 'ul:first' }, - 'JsonObject::Types::Video' : { - rowPrototype : '#asset-styles-prototype tr', - optionButton : 'a.add-asset-style', - optionPrototype : 'li:first', - optionTarget : 'ul:first' - }, 'JsonObject::Types::Collection' : { rowPrototype : '#asset-styles-prototype tr', optionButton : 'a.add-asset-style', public/vrame/javascripts/schema-builder.js db/migrate/20091105150340_posterframe.rb lib/jsonobject/types/video.rb 386edbb9c13443183f3f7531226fc8ebed697e0f Jan Varwig jan@varwig.org http://github.com/sebastiandeutsch/vrame/commit/bbd2cede68cd3e30f925f0530928259fa2d76dcd bbd2cede68cd3e30f925f0530928259fa2d76dcd 2009-11-06T02:43:51-08:00 2009-11-06T02:43:51-08:00 Reverted Videos 78ef44f0cdbd3eb5f47f2e0ea307b5c0e646c3ad Jan Varwig jan@varwig.org