From: Rico Hoppe <rico.hoppe@ipfire.org>
Date: Sun, 16 Apr 2023 13:36:12 +0000 (+0000)
Subject: changed support links to help
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d20009184658f7e01c08b5b12fb554af8c96cd84;p=ipfire.org.git

changed support links to help
---

diff --git a/Makefile.am b/Makefile.am
index 18949f11..77c7ce49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -299,7 +299,7 @@ templates_people_modulesdir = $(templates_peopledir)/modules
 templates_static_DATA = \
 	src/templates/static/features.html \
 	src/templates/static/legal.html \
-	src/templates/static/support.html
+	src/templates/static/help.html
 
 templates_staticdir = $(templatesdir)/static
 
diff --git a/src/templates/base.html b/src/templates/base.html
index 5cb2778c..215a2b63 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -58,7 +58,7 @@
 									</div>
 
 									<div class="navbar-item">
-										<a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Support") }}</a>
+										<a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Help") }}</a>
 									</div>
 
 									<div class="navbar-item">
diff --git a/src/templates/static/support.html b/src/templates/static/support.html
deleted file mode 100644
index 8bd29748..00000000
--- a/src/templates/static/support.html
+++ /dev/null
@@ -1,132 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Help") }}{% end block %}
-
-{% block container %}
-	<section class="hero has-background-primary-light">
-		<div class="hero-body">
-			<div class="container">
-				<nav class="breadcrumb is-medium" aria-label="breadcrumbs">
-					<ul>
-						<li>
-							<a href="/">Home</a>
-						</li>
-						<li class="is-active">
-							<a href="#" aria-current="page">Help</a>
-						</li>
-					</ul>
-				</nav>
-				<h1 class="title is-1">{{ _("Help") }}</h1>
-				<p class="subtitle">
-					{{ _("Need Help?")}}
-					{{ _("We are here for you") }}
-				</p>
-			</div>
-		</div>
-	</section>
-	<!--<div class="header">
-		<div class="container">
-			<h1>{{ _("Need Help?") }}</h1>
-
-			<p class="text-muted">
-				{{ _("We are here for you") }}
-			</p>
-		</div>
-	</div>-->
-
-	<section class="section is-medium">
-		<div class="container">
-			<section class="is-large">
-				<div class="has-background-lwl has-text-white">
-					<div class="columns is-centered is-vcentered">
-						<div class="column is-7">
-							<section class="section">
-								<div class="block">
-									<h3 class="title is-3 has-text-white">{{ _("Get Professional Support") }}</h4>
-								</div>
-								<div class="block">
-									<p>
-										Lightning Wire Labs provides professional support services
-										for companies that use IPFire.
-									</p>
-
-									<p>
-										The team of developers implements custom solutions based on IPFire and
-										carries out development of new features.
-										They will help you with designing a secure network that is tailored to
-										the specific needs of your business and support you with the integration
-										of IPFire.
-									</p>
-								</div>
-								<div class="block">
-									<button class="button is-white has-text-lwl has-text-weight-bold" href="https://www.lightningwirelabs.com/">
-										{{ _("Go to Website") }}
-									</button>
-								</div>
-							</section>
-						</div>
-						<div class="column is-2">
-							<figure class="image is-128x128">
-								<img src="{{ static_url("img/lightningwirelabs-logo.svg") }}" alt="{{ _("Lightning Wire Labs") }}">
-							</figure>
-						</div>
-					</div>
-				</div>
-			</section>
-		</div>
-	</section>
-
-		<div class="container">
-			<div class="columns">
-				<div class="column is-half">
-							<div class="block">
-								<h3 class="title is-3">
-									IPFire<span class="has-text-primary">_</span>Wiki
-								</h3>
-							</div>
-							<div class="block">
-								<div class="column is-2 is-narrow is-centered">
-									<i class="fas fa-solid fa-pen-alt fa-5x"></i>
-								</div>
-							</div>
-							<div class="block">
-								<button class="button is-primary is-centered is-narrow is-large has-text-weight-bold is-fullwidth" href="https://wiki.ipfire.org/">
-									{{ _("Go to Wiki") }}
-								</button>
-							</div>
-							<div class="block">
-								<p>
-									Our wiki has everything there is to know about IPFire
-									It is written by the community and everyone can join and improve it
-								</p>
-							</div>
-				</div>
-				<div class="column">
-							<div class="block">
-								<h3 class="title is-3">
-									IPFire<span class="has-text-primary">_</span>Community
-								</h3>
-							</div>
-							<div class="block">
-								<div class="column is-2 is-narrow is-centered">
-									<i class="fas fa-solid fa-hands-helping fa-5x"></i>
-								</div>
-							</div>
-							<div class="block">
-								<button class="button is-primary is-centered is-narrow is-large has-text-weight-bold is-fullwidth" href="https://community.ipfire.org/">
-									{{ _("Go to Community") }}
-								</button>
-							</div>
-							<div class="block">
-								<p>
-									Talk to the IPFire Community on our community portal.
-									Ask about how to get started with IPFire, how you can
-									contribute to the project, and what else you always
-									wanted to know about IPFire...
-								</p>
-							</div>
-				</div>
-			</div>
-		</div>
-	</div>
-{% end block %}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 8254593c..f06be78f 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -151,11 +151,12 @@ class Application(tornado.web.Application):
 			# Static Pages
 			(r"/features", StaticHandler, { "template" : "features.html" }),
 			(r"/legal", StaticHandler, { "template" : "legal.html" }),
-			(r"/support", StaticHandler, { "template" : "support.html" }),
+			(r"/help", StaticHandler, { "template" : "help.html" }),
 
 			# Handle old pages that have moved elsewhere
 			(r"/imprint", tornado.web.RedirectHandler, { "url" : "/legal" }),
 			(r"/(de|en)/(.*)", LangCompatHandler),
+			(r"/support", tornado.web.RedirectHandler, { "url" : "/help"}),
 
 			# Export arbitrary error pages
 			(r"/error/([45][0-9]{2})", base.ErrorHandler),