From 2b868ddd4895da538f922cdc334b893dd1100d54 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Wed, 17 Dec 2014 05:14:26 +0000 Subject: [PATCH] Change topbar display --- templates/index.html | 63 ++++++++++++++++------------- templates/themes/basic/index.html | 8 ++-- templates/themes/donate/donate.html | 2 +- templates/themes/radio/radio.html | 2 +- templates/themes/recent/recent.html | 2 +- templates/themes/rules/rules.html | 2 +- templates/thread.html | 10 ++--- 7 files changed, 49 insertions(+), 40 deletions(-) diff --git a/templates/index.html b/templates/index.html index 8c696dca..9e76b452 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,7 +2,7 @@ - + + + diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html index 115a9521..755c970e 100644 --- a/templates/themes/basic/index.html +++ b/templates/themes/basic/index.html @@ -2,18 +2,18 @@ - + {{ settings.title }} {% if config.meta_keywords %}{% endif %} {% if config.url_favicon %}{% endif %} - - {% if config.default_stylesheet.1 != '' %}{% endif %} + + {% if config.font_awesome %}{% endif %} -
+
{{ boardlist.top }}
diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html index 3b621cbe..2bca8e10 100644 --- a/templates/themes/donate/donate.html +++ b/templates/themes/donate/donate.html @@ -9,7 +9,7 @@ -
{{ boardlist.top }}
+
{{ boardlist.top }}

{{ settings.title }}

diff --git a/templates/themes/radio/radio.html b/templates/themes/radio/radio.html index b4ddd839..7f84134b 100644 --- a/templates/themes/radio/radio.html +++ b/templates/themes/radio/radio.html @@ -10,7 +10,7 @@ -
+
{{ boardlist.top }}
diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html index c3d71144..03fe9ecb 100644 --- a/templates/themes/recent/recent.html +++ b/templates/themes/recent/recent.html @@ -10,7 +10,7 @@ {% if config.url_favicon %}{% endif %} -
+
{{ boardlist.top }}
diff --git a/templates/themes/rules/rules.html b/templates/themes/rules/rules.html index d212bbe0..b2fca604 100644 --- a/templates/themes/rules/rules.html +++ b/templates/themes/rules/rules.html @@ -9,7 +9,7 @@ -
+
{{ boardlist.top }}
diff --git a/templates/thread.html b/templates/thread.html index 2916d31e..aa7852a9 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -11,11 +11,11 @@ {{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %} -
+
{{ boardlist.top }}
- {% if pm %}
You have an unread PM{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.

{% endif %} - {% if config.url_banner %}{% endif %} + {% if pm %}
You have an unread PM{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.

{% endif %} + {% if config.url_banner %}{% endif %}

{{ board.url }} - {{ board.title|e }}

@@ -51,9 +51,9 @@