GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[UI][FAQ] Fix static pages

Browse Source
This commit is contained in:
Hugo Sales
2020-08-15 21:14:49 +00:00
committed by Hugo Sales
parent 9159fe8d05
commit 7e4138399c
3 changed files with 8 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Controller/FaqHome.php → src/Controller/TemplateController.php
View File

@@ -17,25 +17,15 @@
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
/**
* FAQ main page
*
* @package GNUsocial
* @category Controller
*
* @author Eliseu Amaro <eliseu@fc.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use App\Core\Controller;
use Symfony\Component\HttpFoundation\Request;
class FaqHome extends AbstractController
class TemplateController extends Controller
{
public function __invoke()
public function handle(Request $req)
{
return $this->render('faq/home.html.twig', []);
return ['_template' => $req->get('template')];
}
}

42
src/Routes/Faq.php
View File

@@ -1,42 +0,0 @@
<?php
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
/**
* Define FAQ's main routes
*
* @package GNUsocial
* @category Router
*
* @author Eliseu Amaro <eliseu@fc.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
namespace App\Routes;
use App\Controller\FaqHome;
use App\Core\Router\RouteLoader;
abstract class Faq
{
public static function load(RouteLoader $r): void
{
$r->connect('doc_faq', '/doc/faq', FaqHome::class);
}
}

5
src/Routes/Main.php
View File

@@ -36,7 +36,6 @@ namespace App\Routes;
use App\Controller as C;
use App\Core\Router\RouteLoader;
use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
abstract class Main
{
@@ -54,11 +53,11 @@ abstract class Main
// FAQ static pages
foreach (['faq', 'contact', 'tags', 'groups', 'openid'] as $s) {
$r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, ['defaults' => ['template' => 'doc/faq/' . $s . '.html.twig']]);
$r->connect('doc_' . $s, '/doc/' . $s, C\TemplateController::class, ['template' => 'doc/faq/' . $s . '.html.twig']);
}
foreach (['privacy', 'tos', 'version', 'source'] as $s) {
$r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, ['defaults' => ['template' => 'doc/' . $s . '.html.twig']]);
$r->connect('doc_' . $s, '/doc/' . $s, C\TemplateController::class, ['template' => 'doc/' . $s . '.html.twig']);
}
// Settings pages