Merge remote-tracking branch 'origin/master'

Weblate
2 parents 9461b05b 117e3756
Showing 1 changed file with 10 additions and 0 deletions Show diff stats
app/views/content_viewer/_uploaded_file.html.erb
@@ -0,0 +1,10 @@
+<% if uploaded_file.image? %>
+  <%= link_to '',
+        uploaded_file.view_url,
+        :class => 'image',
+        :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb)
+  %>
+  <span><%=h uploaded_file.title %></span>
+<% else %>
+  <%= render :partial => 'article', :object => uploaded_file %>
+<% end %>
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+<% if uploaded_file.image? %>
	2	+ <%= link_to '',
	3	+ uploaded_file.view_url,
	4	+ :class => 'image',
	5	+ :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb)
	6	+ %>
	7	+ <span><%=h uploaded_file.title %></span>
	8	+<% else %>
	9	+ <%= render :partial => 'article', :object => uploaded_file %>
	10	+<% end %>