diff --git a/app/assets/javascripts/imageable.js.coffee b/app/assets/javascripts/imageable.js.coffee index 863bd5e5972..c3de68e9216 100644 --- a/app/assets/javascripts/imageable.js.coffee +++ b/app/assets/javascripts/imageable.js.coffee @@ -121,12 +121,12 @@ App.Imageable = $(data.errorContainer).append(errors) setPreview: (data) -> - # video_preview = "
" - video_preview = "" + + video_preview = "" image_preview = "
" if $(data.preview).length > 0 if "mp4".indexOf(data.result.filename) - $(data.preview).replaceWith(video_preview) + $(data.preview).replaceWith(data.result.filename) else $(data.preview).replaceWith(image_preview) else diff --git a/app/views/admin/banners/_form.html.erb b/app/views/admin/banners/_form.html.erb index 8e8d423e814..9e144363db4 100644 --- a/app/views/admin/banners/_form.html.erb +++ b/app/views/admin/banners/_form.html.erb @@ -1,3 +1,4 @@ +<%= javascript_include_tag 'swfobject' %> <%= render "admin/shared/globalize_locales", resource: @banner %> <%= translatable_form_for [:admin, @banner] do |f| %> diff --git a/app/views/images/_image.html.erb b/app/views/images/_image.html.erb index 65ef9324e49..5b260505460 100644 --- a/app/views/images/_image.html.erb +++ b/app/views/images/_image.html.erb @@ -1,9 +1,16 @@ +<%= javascript_include_tag 'swfobject' %>
- <%= image_tag image.attachment.url(version), - class: image_class(image), - alt: image.title.unicode_normalize, - title: image.title.unicode_normalize %> + <% if image.attachment.url(version).include? "mp4" %> + + + + <%else%> + <%= image_tag image.attachment.url(version), + class: image_class(image), + alt: image.title.unicode_normalize, + title: image.title.unicode_normalize %> + <%end%> <% if show_caption %>
<%= image.title.unicode_normalize %> diff --git a/app/views/images/_image_fields.html.erb b/app/views/images/_image_fields.html.erb index 7fbfb0f01de..679209cc226 100644 --- a/app/views/images/_image_fields.html.erb +++ b/app/views/images/_image_fields.html.erb @@ -1,3 +1,4 @@ +<%= javascript_include_tag 'swfobject' %>
<%= f.hidden_field :id %> <%= f.hidden_field :user_id, value: current_user.id %> diff --git a/app/views/welcome/_header.html.erb b/app/views/welcome/_header.html.erb index a1bff8b922f..d9d53198173 100644 --- a/app/views/welcome/_header.html.erb +++ b/app/views/welcome/_header.html.erb @@ -14,9 +14,14 @@ <% if header.image.present? %>
- <%= image_tag(header.image_url(:large), - class: "margin", - alt: header.image.title) %> + <% if header.image.title.include? "mp4" %> + + <%else%> + <%= image_tag(header.image_url(:large), + class: "margin", + alt: header.image.title) %> + <%end%> +
<% end %>