From a9f3f44c5ffc355df7831eed29b08e0dd2b398fc Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Sun, 6 Jan 2013 09:41:00 +0100
Subject: refactored head away from templates

Conflicts:
	templates/generic_page.html
	templates/index.html
	templates/page.html
---
 templates/header.html | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 templates/header.html

(limited to 'templates/header.html')

diff --git a/templates/header.html b/templates/header.html
new file mode 100644
index 00000000..95e0bc09
--- /dev/null
+++ b/templates/header.html
@@ -0,0 +1,28 @@
+		<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
+		{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-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 %}
+		<script type="text/javascript">var configRoot="{{ config.root }}";</script>
+		{% if not nojavascript %}
+			<script type="text/javascript" src="{{ config.url_javascript }}"></script>
+			{% if not config.additional_javascript_compile %}
+			{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
+			{% endif %}
+		{% endif %}
+		{% if config.recaptcha %}<style type="text/css">{% raw %}
+			.recaptcha_image_cell {
+				background: none !important;
+			}
+			table.recaptchatable {
+				border: none !important;
+			}
+			#recaptcha_logo, #recaptcha_tagline {
+				display: none;
+				float: right;
+			}
+			.recaptchatable a {
+				display: block;
+			}
+		{% endraw %}</style>{% endif %}
-- 
cgit v1.3


From 1ffabe2b930a72995be9c4b1699ebd0dab22827d Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 31 Jul 2013 03:55:55 -0400
Subject: fix header.html merge

---
 templates/header.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'templates/header.html')

diff --git a/templates/header.html b/templates/header.html
index 95e0bc09..3791296f 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -4,6 +4,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-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 %}
 		<script type="text/javascript">var configRoot="{{ config.root }}";</script>
 		{% if not nojavascript %}
 			<script type="text/javascript" src="{{ config.url_javascript }}"></script>
@@ -25,4 +26,4 @@
 			.recaptchatable a {
 				display: block;
 			}
-		{% endraw %}</style>{% endif %}
+		{% endraw %}</style>{% endif %}
\ No newline at end of file
-- 
cgit v1.3


From 5bf0e7f7e76cd3610e0aa692e0c433aca594ee51 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 1 Aug 2013 00:27:54 -0400
Subject: Better/fixed jQuery styling and slightly improved
 js/inline-expanding.js accuracy (when jQuery is enabled)

---
 js/inline-expanding.js |  3 +++
 templates/header.html  | 30 ++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'templates/header.html')

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index e529a395..61085b0d 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -17,6 +17,9 @@ onready(function(){
 
 		for (var i = 0; i < link.length; i++) {
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
+				if (window.jQuery && !$(link).prev().hasClass('fileinfo')) {
+					continue;	
+				}
 				link[i].childNodes[0].style.maxWidth = '95%';
 				link[i].onclick = function(e) {
 					if (this.childNodes[0].className == 'hidden')
diff --git a/templates/header.html b/templates/header.html
index 3791296f..c1230f0e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -13,17 +13,31 @@
 			{% endif %}
 		{% endif %}
 		{% if config.recaptcha %}<style type="text/css">{% raw %}
-			.recaptcha_image_cell {
-				background: none !important;
+			#recaptcha_area {
+				float: none !important;
+				padding: 0 !important;
 			}
-			table.recaptchatable {
+			#recaptcha_logo, #recaptcha_privacy {
+				display: none;
+			}
+			#recaptcha_table {
 				border: none !important;
 			}
-			#recaptcha_logo, #recaptcha_tagline {
-				display: none;
-				float: right;
+			#recaptcha_table tr:first-child {
+				height: auto;
+			}
+			.recaptchatable img {
+				float: none !important;
+			}
+			#recaptcha_response_field {
+				font-size: 10pt !important;
+				border: 1px solid #a9a9a9 !important;
+				padding: 1px !important;
+			}
+			td.recaptcha_image_cell {
+				background: transparent !important;
 			}
-			.recaptchatable a {
-				display: block;
+			.recaptchatable, #recaptcha_area tr, #recaptcha_area td, #recaptcha_area th {
+				padding: 0 !important;
 			}
 		{% endraw %}</style>{% endif %}
\ No newline at end of file
-- 
cgit v1.3