Merge pull request #79 from lainchan/clean_prod_vichan_update

Merge vichan changes from upstream and changes directly applied to the site.

1 files changed, 48 insertions, 13 deletions

diff --git a/templates/thread.html b/templates/thread.html
index 62fe2c12..5ecef649 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -6,16 +6,30 @@
 
 
         <script type="text/javascript">
-          var active_page = "thread";
+          var active_page = "thread"
+	    , board_name = "{{ board.uri }}"
+	    , thread_id = "{{ thread.id }}";
 	</script>
 
 	{% include 'header.html' %}
-	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
+
+	{% set meta_subject %}{% if config.thread_subject_in_title and thread.subject %}{{ thread.subject|e }}{% else %}{{ thread.body_nomarkup[:256]|remove_modifiers|e }}{% endif %}{% endset %}
+
+	<meta name="description" content="{{ board.url }} - {{ board.title|e }} - {{ meta_subject }}" />
+	<meta name="twitter:card" value="summary">
+	<meta property="og:title" content="{{ meta_subject }}" />
+	<meta property="og:type" content="article" />
+	<meta property="og:url" content="{{ config.domain }}/{{ board.uri }}/{{ config.dir.res }}{{ thread.id }}.html" />
+	{% if thread.files.0.thumb %}<meta property="og:image" content="{{ config.domain }}/{{ board.uri }}/{{ config.dir.thumb }}{{ thread.files.0.thumb }}" />{% endif %}
+	<meta property="og:description" content="{{ thread.body_nomarkup|e }}" />
+
+	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
-<body id="thread">
+<body id="thread" class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %} active-thread" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	<div class="bar top">
 		{{ boardlist.top }}
 	</div>
+	<a name="top"></a>
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
 	<header>
@@ -34,23 +48,44 @@
 
 	{% include 'attention_bar.html' %}
 
+
 	{{ config.ad.top }}
 
 	{% include 'post_form.html' %}
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
-	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-	<a href="#bottom" style="padding-left: 10px">[{% trans %}Go to bottom{% endtrans %}]</a>
+	<div class="threadlinks-noup">
+		<span class="threadlink">[ <a href="{{ return }}">{% trans %}Return{% endtrans %}</a> /</span>
+		<span class="threadlink"><a href="#bottom" style="padding-left: 10px"> {% trans %}Go to bottom{% endtrans %}</a> ]</span>
+	</div>
 	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
-	<input type="hidden" name="board" value="{{ board.uri }}" />
-	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-	{{ body }}
-	{% include 'report_delete.html' %}
+		<input type="hidden" name="board" value="{{ board.uri }}" />
+		{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
+		
+		{{ body }}
+		
+		<div id="thread-interactions">
+			<span id="thread-links">
+				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+				<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
+                		{% if config.catalog_link %}
+					<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+		                {% endif %}
+			</span>
+			
+			<span id="thread-quick-reply">
+				<a id="link-quick-reply" href="#">[{% trans %}Post a Reply{% endtrans %}]</a>
+			</span>
+			
+			{% include 'report_delete.html' %}
+		</div>
+		
+		<div class="clearfix"></div>
 	</form>
-
-	{{ boardlist.bottom }}
+	
+    {{ boardlist.bottom }}
 
 	{{ config.ad.bottom }}
 
@@ -60,8 +95,8 @@
 			<a href='https://int.vichan.net/devel/'>vichan</a> + 
 			<a href='https://github.com/lainchan/lainchan'>lainchan</a> {{ config.version }} -
 		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
-		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel
-		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2015 lainchan Administration</p>
+		<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
+		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2016 lainchan Administration</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<div class="bar bottom">