Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	templates/page.html

3 files changed, 12 insertions, 12 deletions

diff --git a/templates/main.js b/templates/main.js
index b0a96393..9ec0025f 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -105,7 +105,7 @@ function generatePassword() {
 

 function dopost(form) {

 	if (form.elements['name']) {

-		localStorage.name = form.elements['name'].value.replace(/ ##.+$/, '');

+		localStorage.name = form.elements['name'].value.replace(/( |^)## .+$/, '');

 	}

 	if (form.elements['email'] && form.elements['email'].value != 'sage') {

 		localStorage.email = form.elements['email'].value;

diff --git a/templates/post_reply.html b/templates/post_reply.html
index 73ff2c15..450f8246 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -7,14 +7,14 @@
 	<label for="delete_{{ post.id }}">

 		{% if post.subject|length > 0 %}

 			{# show subject #}

-			<span class="subject">{{ post.subject }}</span> 

+			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 

 		{% endif %}

 		{% if post.email|length > 0 %}

 			{# start email #}

 			<a class="email" href="mailto:{{ post.email }}">

 		{% endif %}

 		{% set capcode = post.capcode|capcode %}

-		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name }}</span>

+		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name|bidi_cleanup }}</span>

 		{% if post.trip|length > 0 %}

 			<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>

 		{% endif %}

@@ -66,9 +66,9 @@
 			{% if config.show_filename and post.filename %}

 				, 

 				{% if post.filename|length > config.max_filename_display %}

-					<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>

+					<span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>

 				{% else %}

-					{{ post.filename }}

+					<span class="postfilename">{{ post.filename|bidi_cleanup }}</span>

 				{% endif %}

 			{% endif %}

 			{% if post.thumb != 'file' and config.image_identification %}

diff --git a/templates/post_thread.html b/templates/post_thread.html
index 04ce1b0d..33ef950d 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -22,11 +22,11 @@
 		{% endif %}

 		{% if config.show_filename and post.filename %}

 			, 

-			{% if post.filename|length > config.max_filename_display %}

-				<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>

-			{% else %}

-				{{ post.filename }}

-			{% endif %}

+			{% if post.filename|length > config.max_filename_display %}


+				<span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>


+			{% else %}


+				<span class="postfilename">{{ post.filename|bidi_cleanup }}</span>


+			{% endif %}


 		{% endif %}

 		{% if post.thumb != 'file' and config.image_identification %}

 			, 

@@ -61,14 +61,14 @@
 	<label for="delete_{{ post.id }}">

 		{% if post.subject|length > 0 %}

 			{# show subject #}

-			<span class="subject">{{ post.subject }}</span> 

+			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 

 		{% endif %}

 		{% if post.email|length > 0 %}

 			{# start email #}

 			<a class="email" href="mailto:{{ post.email }}">

 		{% endif %}

 		{% set capcode = post.capcode|capcode %}

-		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name }}</span>

+		<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name|bidi_cleanup }}</span>

 		{% if post.trip|length > 0 %}

 			<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>

 		{% endif %}