Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/groups/groupsbase.page.php
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ protected function getSubmenuItems()
} else {
$items[] = [ 'search', 'groups/search', $words->getSilent('GroupsSearchHeading') ];
$items[] = [ 'rules', 'forums/rules', $words->getSilent('ForumRulesShort') ];
$items[] = [ 'faq', 'about/faq/6', $words->getSilent('ForumLinkToDoc') ];
$items[] = [ 'faq', 'faq/6', $words->getSilent('ForumLinkToDoc') ];
}

$items[] = [ 'subscription', 'forums/subscriptions', $this->words->getSilent('forum_YourSubscription') ];
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/AboutBaseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected function getSubMenuItems(string $locale): array
],
'about_faq' => [
'key' => 'Faq',
'url' => $this->generateUrl('about_faq'),
'url' => $this->generateUrl('faqs_overview'),
],
'about_feedback' => [
'key' => 'ContactUs',
Expand Down
5 changes: 4 additions & 1 deletion src/Controller/FaqController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ public function __construct(FaqModel $faqModel)
}

/**
* Old FAQ address, kept for external links and bookmarks. Permanent, so search engines
* move it to /faq (BeWelcome/sysadmins-infra#654).
*
* @Route("/about/faq", name="about_faq")
*
* @return Response
*/
public function showAboutFAQ()
{
return $this->redirectToRoute('faqs_overview', ['categoryId' => 1]);
return $this->redirectToRoute('faqs_overview', [], Response::HTTP_MOVED_PERMANENTLY);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion templates/footer.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</h2>
<ul class="list-unstyled stickyfooter__link-list stickyfooter__link-list--legal mb-0">
<li><a href="{{ url('about') }}">{{ 'aboutuspage' | trans }}</a></li>
<li><a href="{{ url('about_faq') }}">{{ 'faq' | trans }}</a></li>
<li><a href="{{ url('faqs_overview') }}">{{ 'faq' | trans }}</a></li>
<li><a href="{{ url('feedback') }}">{{ 'contactus' | trans }}</a></li>
<li><a href="{{ url('feedback', { IdCategory: 1, RequestURI: url('homepage')}) }}">{{ 'footer.reportbug' | trans }}</a></li>
{% if app.user %}
Expand Down
2 changes: 1 addition & 1 deletion templates/landing/landing.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
<a href="{{ url('about') }}"
class="o-button btn o-button text-truncate u-mb-8"><i
class="fa u-mr-8 fa-question mr-2"></i>{{ 'landing.beinformed.about' | trans }}</a>
<a href="{{ url('about_faq') }}"
<a href="{{ url('faqs_overview') }}"
class="o-button btn o-button text-truncate u-mb-8"><i
class="fa u-mr-8 fa-question mr-2"></i>{{ 'landing.beinformed.faq' | trans }}</a>
<a href="{{ url('safety') }}"
Expand Down
2 changes: 1 addition & 1 deletion templates/search/searchmap.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<a href="{{ url('privacy_policy') }}" target="new">{{ 'privacy' | trans }}</a> •
<a href="{{ url('data_rights') }}" target="new">{{ 'datarights' | trans }}</a> •
<a href="{{ url('imprint') }}">{{ 'impressum' | trans }}</a> •
<a href="{{ url('about_faq') }}">{{ 'faq' | trans }}</a> •
<a href="{{ url('faqs_overview') }}">{{ 'faq' | trans }}</a> •
<a href="{{ url('feedback') }}">{{ 'footer.contactus' | trans }}</a> •
<a href="{{ url('feedback', {'IdCategory': 1, 'RequestUri': url('homepage')}) }}">{{ 'footer.reportbug' | trans }}</a><br>
&copy;2007
Expand Down
Loading