Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration

5 files changed, 39 insertions, 16 deletions

diff --git a/templates/header.html b/templates/header.html
index c4861d98..dd15eeb8 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -4,7 +4,8 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
 		{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
 		{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-		{% if config.font_awesome %}<link rel="stylesheet" media="screen" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
+		{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
+		{% if config.country_flags_condensed %}<link rel="stylesheet" href="{{ config.root }}{{ config.country_flags_condensed_css }}">{% endif %}
 		<script type="text/javascript">
 			var configRoot="{{ config.root }}";
 			var inMod = {% if mod %}true{% else %}false{% endif %};
diff --git a/templates/installer/check-requirements.html b/templates/installer/check-requirements.html
index b6003f3a..3ae46dd5 100644
--- a/templates/installer/check-requirements.html
+++ b/templates/installer/check-requirements.html
@@ -14,14 +14,14 @@
 				<td>{{ test.name }}</td>
 				<td class="minimal" style="text-align:center">
 					{% if test.result %}
-						<i style="font-size:11pt;color:#090" class="icon-check-sign"></i>
+						<i style="font-size:11pt;color:#090" class="fa fa-check"></i>
 					{% else %}
 						{% if test.required %}
 							{%  set errors = errors + 1 %}
-							<i style="font-size:11pt;color:#d00" class="icon-exclamation-sign"></i>
+							<i style="font-size:11pt;color:#d00" class="fa fa-exclamation"></i>
 						{% else %}
 							{%  set warnings = warnings + 1 %}
-							<i style="font-size:11pt;color:#f80" class="icon-warning-sign"></i>
+							<i style="font-size:11pt;color:#f80" class="fa fa-warning"></i>
 						{% endif %}
 					{% endif %}
 				</td>
@@ -34,18 +34,18 @@
 			{% for test in tests if not test.result%}
 				<li style="margin-bottom:5px">
 					{% if test.required %}
-						<i style="font-size:11pt;color:#d00" class="icon-exclamation-sign"></i> <strong>Error:</strong> 
+						<i style="font-size:11pt;color:#d00" class="fa fa-exclamation"></i> <strong>Error:</strong> 
 					{% else %}
-						<i style="font-size:11pt;color:#f80" class="icon-warning-sign"></i> <strong>Warning:</strong> 
+						<i style="font-size:11pt;color:#f80" class="fa fa-warning"></i> <strong>Warning:</strong> 
 					{% endif %}
 					{{ test.message }}
 				</li>
 			{% endfor %}
 		</ul>
 		{% if errors %}
-			<p style="text-align:center"><a href="?step=2">Clik here to ignore errors and attempt installing anyway (not recommended).</a></p>
+			<p style="text-align:center"><a href="?step=2">Click here to ignore errors and attempt installing anyway (not recommended).</a></p>
 		{% else %}
-			<p style="text-align:center"><a href="?step=2">Clik here to proceed with installation.</a></p>
+			<p style="text-align:center"><a href="?step=2">Click here to proceed with installation.</a></p>
 		{% endif %}
 	{% else %}
 		<p>There were no errors or warnings. Good!</p>
diff --git a/templates/main.js b/templates/main.js
index 54018e37..7796565c 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -288,10 +288,12 @@ function ready() {
 	}
 }
 
-onready(init);
-
 {% endraw %}
 
+var post_date = "{{ config.post_date }}";
+
+onready(init);
+
 {% if config.google_analytics %}{% raw %}
 
 var _gaq = _gaq || [];_gaq.push(['_setAccount', '{% endraw %}{{ config.google_analytics }}{% raw %}']);{% endraw %}{% if config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', '{% endraw %}{{ config.google_analytics_domain }}{% raw %}']){% endraw %}{% endif %}{% if not config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', 'none']){% endraw %}{% endif %}{% raw %};_gaq.push(['_trackPageview']);(function() {var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);})();{% endraw %}{% endif %}
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 4fe98ded..713ddac9 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -29,9 +29,19 @@
 			 [<a class="ip-link" style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
 		{% if config.display_flags and post.modifiers.flag %}
-			 <img class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
-			 	style="{% if post.modifiers['flag style'] %}{{ post.modifiers['flag style'] }}{% else %}{{ config.flag_style }}{% endif %}"
-			 {% if post.modifiers['flag alt'] %}alt="{{ post.modifiers['flag alt'] | e('html_attr') }}" title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
+			 <img 
+				{% if config.country_flags_condensed %}
+					 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
+				{% else %}
+					 class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
+				{% endif %}
+			 	 style="{% if post.modifiers['flag style'] %}
+					{{ post.modifiers['flag style'] }}
+				{% else %}
+					{{ config.flag_style }}
+				{% endif %}"
+			{% if post.modifiers['flag alt'] %} alt="{{ post.modifiers['flag alt'] | e('html_attr') }}"
+				 title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
 		{% endif %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>
diff --git a/templates/post_thread.html b/templates/post_thread.html
index d922dabd..113444be 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -83,9 +83,19 @@
 			 [<a class="ip-link" style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
 		{% if config.display_flags and post.modifiers.flag %}
-			 <img class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
-			 	style="{% if post.modifiers['flag style'] %}{{ post.modifiers['flag style'] }}{% else %}{{ config.flag_style }}{% endif %}"
-			 {% if post.modifiers['flag alt'] %}alt="{{ post.modifiers['flag alt'] | e('html_attr') }}" title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
+			 <img
+				{% if config.country_flags_condensed %}
+					 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
+				{% else %}
+					 class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
+				{% endif %}
+					 style="{% if post.modifiers['flag style'] %}
+					{{ post.modifiers['flag style'] }}
+				{% else %}
+					{{ config.flag_style }}
+				{% endif %}"
+				{% if post.modifiers['flag alt'] %} alt="{{ post.modifiers['flag alt'] | e('html_attr') }}"
+				 title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
 		{% endif %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>