From: Rico Hoppe <rico.hoppe@ipfire.org>
Date: Thu, 21 Dec 2023 15:21:50 +0000 (+0000)
Subject: base: blog searchbar now shows query, if available
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b5866c18bd19b1b7ce591b07de21dade67cd4f0;p=ipfire.org.git

base: blog searchbar now shows query, if available
---

diff --git a/src/templates/base.html b/src/templates/base.html
index 6d275592..a36db3e5 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -63,7 +63,8 @@
 												<div class="control has-icons-left">
 													<input class="input" type="text"
 														name="q" {% if "q" in locals() and q %}value="{{ q }}"{% end %}
-														placeholder="{{ _("Search Blog...") }}">
+														{% if q %} placeholder="{{ _("Searching for") }} {{ q }}"
+														{% else %} placeholder="{{ _("Search Blog...") }}"{% end %}>
 													<span class="icon is-small is-left">
 														<i class="fas fa-search"></i>
 													</span>
@@ -150,10 +151,6 @@
 											</a>
 										</div>
 									</div>
-								{% else %}
-									<a class="navbar-item is-tab" href="/login?next={{ request.path }}">
-										<i class="fas fa-right-to-bracket" title="{{ _("Login") }}"></i>
-									</a>
 								{% end %}
 							</div>
 						{% elif hostname.startswith("fireinfo.") %}
@@ -198,47 +195,66 @@
 		{% block footer %}
 			<footer class="footer is-flex-shrink-0">
 				<div class="container">
-					<div class="level">
-						<div class="level-left">
-							<div class="level-item">
-								<div class="level is-mobile">
-									<div class="level-item">
-										{{ year }} &copy; IPFire.org
-									</div>
-
-									<div class="level-item">
-										<a href="/legal">{{ _("Legal") }}</a>
-									</div>
+					{# Encourage people to join #}
+					{% if not current_user %}
+						<div class="columns">
+							<div class="column is-one-fifth">
+								<a class="button is-primary is-medium is-fullwidth" href="/register">
+									{{ _("Join Now") }}
+								</a>
+							</div>
 
-									<div class="level-item">
-										<a href="/sitemap">{{ _("Sitemap") }}</a>
-									</div>
+							<div class="column is-one-quarter">
+								<div class="block">
+									<p class="title is-5">
+										{{ _("Join our community and sign up to our newsletter") }}
+									</p>
 								</div>
 							</div>
 						</div>
 
-						<div class="level-right">
-							<div class="level-item">
-								<div class="level is-mobile">
-									<div class="level-item">
-										<a href="https://social.ipfire.org/@news" title="{{ _("Mastodon") }}">
-											<i class="fa-brands fa-mastodon px-2"></i>
-										</a>
-									</div>
-									<div class="level-item">
-										<a href="https://twitter.com/ipfire" title="{{ _("Twitter") }}">
-											<i class="fa-brands fa-twitter px-2"></i>
-										</a>
-									</div>
-									<div class="level-item">
-										<a href="https://linkedin.com/company/ipfire" title="{{ _("LinkedIn") }}">
-											<i class="fa-brands fa-linkedin-in px-2"></i>
-										</a>
-									</div>
+						<div class="columns">
+							<div class="column is-one-fifth">
+								<a class="button is-primary is-medium is-outlined is-fullwidth" href="/login">
+									{{ _("Log In") }}
+								</a>
+							</div>
+						</div>
+					{% end %}
+
+						<div class="level">
+							<div class="level-left">
+								<div class="level-item">
+									{{ year }} &copy; IPFire.org
+								</div>
+
+								<div class="level-item">
+									<a href="/legal">{{ _("Legal") }}</a>
+								</div>
+
+								<div class="level-item">
+									<a href="/sitemap">{{ _("Sitemap") }}</a>
+								</div>
+							</div>
+
+							<div class="level-right">
+								<div class="level-item">
+									<a href="https://social.ipfire.org/@news" title="{{ _("Mastodon") }}">
+										<i class="fa-brands fa-mastodon px-2"></i>
+									</a>
+								</div>
+								<div class="level-item">
+									<a href="https://twitter.com/ipfire" title="{{ _("Twitter") }}">
+										<i class="fa-brands fa-twitter px-2"></i>
+									</a>
+								</div>
+								<div class="level-item">
+									<a href="https://linkedin.com/company/ipfire" title="{{ _("LinkedIn") }}">
+										<i class="fa-brands fa-linkedin-in px-2"></i>
+									</a>
 								</div>
 							</div>
 						</div>
-					</div>
 				</div>
 			</footer>
 		{% end block %}