From 758d80e817758784c6c54eac5dcd228f0bffdc5a Mon Sep 17 00:00:00 2001 From: flashwave Date: Sun, 18 Dec 2016 23:22:41 +0100 Subject: [PATCH] more stuff --- app/Controllers/NewsController.php | 10 ++++++++++ resources/views/yuuno/_layout/metadata.twig | 20 +++++++++++++++++++ resources/views/yuuno/master.twig | 10 +++------- .../views/yuuno/settings/friends/master.twig | 8 -------- resources/views/yuuno/user/profile.twig | 4 +++- 5 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 resources/views/yuuno/_layout/metadata.twig diff --git a/app/Controllers/NewsController.php b/app/Controllers/NewsController.php index 249120b..8ffc23f 100644 --- a/app/Controllers/NewsController.php +++ b/app/Controllers/NewsController.php @@ -19,6 +19,16 @@ use Sakura\News\Post; */ class NewsController extends Controller { + public function __construct() + { + parent::__construct(); + + // pretend these pages don't exist on testii for now + if (!config('dev.show_errors')) { + throw new HttpRouteNotFoundException; + } + } + /** * Shows all news posts in any category. * @return string diff --git a/resources/views/yuuno/_layout/metadata.twig b/resources/views/yuuno/_layout/metadata.twig new file mode 100644 index 0000000..1e67def --- /dev/null +++ b/resources/views/yuuno/_layout/metadata.twig @@ -0,0 +1,20 @@ + {% set title = title|default(config('general.name')) %} + {% set description = description|default(config('general.description')) %} + + {{ title }} + + + + + + + + + + + + +{% if icon is defined %} + + +{% endif %} diff --git a/resources/views/yuuno/master.twig b/resources/views/yuuno/master.twig index ba409a8..1276b79 100644 --- a/resources/views/yuuno/master.twig +++ b/resources/views/yuuno/master.twig @@ -2,18 +2,14 @@ - {{ title|default(config('general.name')) }} - -{% if redirect is defined %} - -{% endif %} -{{ block('meta') }} + {% include '_layout/metadata.twig' %} + -{{ block('css') }} + diff --git a/resources/views/yuuno/settings/friends/master.twig b/resources/views/yuuno/settings/friends/master.twig index 7007d0e..4aae8c9 100644 --- a/resources/views/yuuno/settings/friends/master.twig +++ b/resources/views/yuuno/settings/friends/master.twig @@ -1,11 +1,3 @@ {% extends 'settings/master.twig' %} {% set category = 'Friends' %} - -{% block css %} - -{% endblock %} diff --git a/resources/views/yuuno/user/profile.twig b/resources/views/yuuno/user/profile.twig index 7a559bd..a13acb4 100644 --- a/resources/views/yuuno/user/profile.twig +++ b/resources/views/yuuno/user/profile.twig @@ -3,8 +3,10 @@ {% from 'user/profile_macros.twig' import profile_image_changer %} {% set title = 'Profile of ' ~ profile.username %} +{% set description = 'Everything you ever wanted to know about ' ~ profile.username ~ '!' %} +{% set icon = route('user.avatar', profile.id, true) %} {% set youtubeIsChannelId = profile.youtube|slice(0, 2) == 'UC' and profile.youtube|length == 24 %} -{% set possessiveUsername = profile.username ~ "'" ~ (profile.username[:-1] == 's' ? '' : 's') %} +{% set possessiveUsername = profile.username ~ "'" ~ (profile.username[-1:] == 's' ? '' : 's') %} {% if user.perms.viewUserLinks or user.perms.viewUserDetails %} {% set fields = {