From b8381b31db9360c2e66d93e78b5b48d78a2a9002 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 8 Aug 2014 22:18:06 +0200
Subject: Revert "Use a different way to show the original filename"

This reverts commit d81a6c49e28133c65d237fc648be7fe323bfd54d.

Conflicts:
	js/download-original.js
	templates/post/fileinfo.html
---
 templates/post/fileinfo.html | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'templates')

diff --git a/templates/post/fileinfo.html b/templates/post/fileinfo.html
index ad398d60..73bdf2d2 100644
--- a/templates/post/fileinfo.html
+++ b/templates/post/fileinfo.html
@@ -7,21 +7,7 @@
 	{% if file.file == 'deleted' %}
 		<img class="post-image deleted" src="{{ config.image_deleted }}" alt="" />
 	{% else %}
-		<p class="fileinfo">{% trans %}File:{% endtrans %} <a href="{{ config.uri_img }}{{ file.file }}" 
-		{% if config.show_filename and file.filename %}
-			{% if config.download_filename %}
-				download="{{ file.filename|e|bidi_cleanup }}"
-			{% endif %}
-			{% if file.filename|length > config.max_filename_display %}
-				title="{{ file.filename|e|bidi_cleanup }}"
-				>{{ file.filename|truncate_filename(config.max_filename_display)|e|bidi_cleanup }}
-			{% else %}
-				>{{ file.filename|e|bidi_cleanup }}
-			{% endif %}
-		{% else %}
-			>{{ file.file }}
-		{% endif %}
-			</a><br><span class="unimportant"><em>
+		<p class="fileinfo">File: <a href="{{ config.uri_img }}{{ file.file }}">{{ file.file }}</a> <span class="unimportant">
 		(
 			{% if file.thumb == 'spoiler' %}
 				{% trans %}Spoiler Image{% endtrans %}, 
@@ -33,6 +19,14 @@
 					, {{ ratio(file.width, file.height) }}
 				{% endif %}
 			{% endif %}
+			{% if config.show_filename and file.filename %}
+				, 
+				{% if file.filename|length > config.max_filename_display %}
+					<span class="postfilename" title="{{ file.filename|e|bidi_cleanup }}">{{ file.filename|truncate_filename(config.max_filename_display)|e|bidi_cleanup }}</span>
+				{% else %}
+					<span class="postfilename">{{ file.filename|e|bidi_cleanup }}</span>
+				{% endif %}
+			{% endif %}
 		)
 			{% include "post/image_identification.html" %}
 			</em></span> {% include "post/file_controls.html" %}</p>
-- 
cgit v1.3