Merge remote-tracking branch 'upstream/master' into vichan-merge

1 files changed, 40 insertions, 32 deletions

diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 12b3cd98..92969b00 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -50,45 +50,53 @@
 				data-bump="{{ post.bump }}"
 				data-time="{{ post.time }}"
 			>
-				<div class="thread grid-li grid-size-small">
-					<a href="{{post.link}}">
-		{% if post.youtube %}
-			<img src="http://img.youtube.com/vi/{{ post.youtube }}/0.jpg"
-		{% else %}
-			<img src="{{post.file}}"
-		{% endif %}
-							id="img-{{ post.id }}" data-subject="{% if post.subject %}{{ post.subject|e }}{% endif %}" data-name="{{ post.name|e }}" data-muhdifference="{{ post.muhdifference }}" class="{{post.board}} thread-image" title="{{post.bump|date('%b %d %H:%M')}}">
-					</a>
-					<div class="replies">
-						<strong>R: {{ post.reply_count }} / I: {{ post.image_count }}</strong>
-						{% if post.subject %}
-						<p class="intro">
-							<span class="subject">
-								{{ post.subject|e }}
-							</span>
-						</p>
-					{% else %}
-						<br />
-					{% endif %}
-
-						{{ post.body }}
-					</div>
-				</div>
-			</li>
-		{% endfor %}
-		</ul>
-	</div>
+                                <div class="thread grid-li grid-size-small">  
+                                        <a href="{{post.link}}">  
+						{% if post.youtube %}
+							<img src="//img.youtube.com/vi/{{ post.youtube }}/0.jpg" 
+						{% else %}
+							<img src="{{post.file}}" 
+						{% endif %}
+                                                 id="img-{{ post.id }}" data-subject="{% if post.subject %}{{ post.subject|e }}{% endif %}" data-name="{{ post.name|e }}" data-muhdifference="{{ post.muhdifference }}" class="{{post.board}} thread-image" title="{{post.bump|date('%b %d %H:%M')}}">
+                                        </a>
+                                                <div class="replies">
+                                                        <strong>R: {{ post.reply_count }} / I: {{ post.image_count }}</strong>
+                                                        {% if post.subject %}
+								<p class="intro">
+									<span class="subject">
+										{{ post.subject|e }}
+									</span>
+								</p>
+							{% else %}
+								<br />
+							{% endif %}
 
+								{{ post.body }}
+                                                </div>
+                                </div>
+                        </li>
+                {% endfor %}
+                </ul>
+        </div>
+	
 	<hr/>
 	<footer>
 		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> +
 			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
-		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
-		<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
+		<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</p>
 	</footer>
-	<script type="text/javascript">
+	<script type="text/javascript">{% raw %}
+		var styles = {
+			{% endraw %}
+			{% for name, uri in config.stylesheets %}{% raw %}'{% endraw %}{{ name|addslashes }}{% raw %}' : '{% endraw %}/stylesheets/{{ uri|addslashes }}{% raw %}',
+			{% endraw %}{% endfor %}{% raw %}
+		}; onready(init);
+	{% endraw %}</script>
+
+	<script type="text/javascript">{% raw %}
 		ready();
-	</script>
+	{% endraw %}</script>
 </body>
 </html>
 {% endfilter %}