Commit 8c1e4fab64bd9ce3231ccfa1506533392a53de56
1 parent
561a7924
Exists in
master
and in
22 other branches
FilePresenter: fix URLs on subdirectory URL
app/views/content_viewer/_uploaded_file.html.erb is dead code, so it was deleted.
Showing
3 changed files
with
2 additions
and
12 deletions
Show diff stats
app/views/content_viewer/_uploaded_file.html.erb
| @@ -1,10 +0,0 @@ | @@ -1,10 +0,0 @@ | ||
| 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 %> |
app/views/file_presenter/_generic.html.erb
| 1 | <span class="download-link"> | 1 | <span class="download-link"> |
| 2 | <span>Download</span> | 2 | <span>Download</span> |
| 3 | - <strong><%= link_to generic.filename, generic.public_filename %></strong> | 3 | + <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong> |
| 4 | </span> | 4 | </span> |
| 5 | 5 | ||
| 6 | <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>"> | 6 | <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>"> |
app/views/file_presenter/_image.html.erb
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | 28 | ||
| 29 | <%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %> | 29 | <%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %> |
| 30 | 30 | ||
| 31 | -<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>"> | 31 | +<img src="<%= [Noosfero.root, image.public_filename(:display)].join %>" class="<%=image.css_class_name%>"> |
| 32 | 32 | ||
| 33 | <div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>"> | 33 | <div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>"> |
| 34 | <%= image.abstract %> | 34 | <%= image.abstract %> |