diff --git a/src/Controller/UserPanel.php b/src/Controller/UserPanel.php index a07a6ea2b2..a756adda26 100644 --- a/src/Controller/UserPanel.php +++ b/src/Controller/UserPanel.php @@ -120,15 +120,15 @@ class UserPanel extends AbstractController return ['_template' => 'settings/avatar.html.twig', 'avatar' => $avatar->createView()]; } - public function misc(Request $request) + public function notifications(Request $request) { - $misc = Form::create([ + $notifications = Form::create([ [_m('transport'), TextType::class, ['help' => 'Address used to send and receive notices through IM.', 'label_format' => 'XMPP/Jabber']], [_m('post_on_status_change'), CheckboxType::class, ['help' => 'Post a notice when my status changes.', 'label_format' => 'Status change']], [_m('mention'), CheckboxType::class, ['help' => 'Send me replies from people I\'m not subscribed to.', 'label_format' => 'Mentions']], [_m('posts_by_followed'), CheckboxType::class, ['help' => 'Send me notices.', 'label_format' => 'Notices']], ['save', SubmitType::class, ['label' => _m('Save')]], ]); - return ['_template' => 'settings/misc.html.twig', 'misc' => $misc->createView()]; + return ['_template' => 'settings/notifications.html.twig', 'notifications' => $notifications->createView()]; } } diff --git a/src/Routes/Main.php b/src/Routes/Main.php index b3f2be7e10..edbe3edc20 100644 --- a/src/Routes/Main.php +++ b/src/Routes/Main.php @@ -62,7 +62,7 @@ abstract class Main // Settings pages $r->connect('settings', '/settings', RedirectController::class, [], ['defaults' => ['route' => 'settings_personal_info']]); - foreach (['personal_info', 'avatar', 'misc', 'account'] as $s) { + foreach (['personal_info', 'avatar', 'notifications', 'account'] as $s) { $r->connect('settings_' . $s, '/settings/' . $s, [C\UserPanel::class, $s]); } } diff --git a/templates/network/public.html.twig b/templates/network/public.html.twig index 8c7cf27bea..2a5ac38a98 100644 --- a/templates/network/public.html.twig +++ b/templates/network/public.html.twig @@ -1,26 +1,34 @@ - - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} +{% extends 'left/left.html.twig' %} +{% block meta %} + {{ parent() }} +{% endblock %} + +{% block title %}Welcome!{% endblock %} + +{% block stylesheets %} + {{ parent() }} + +{% endblock %} + +{% block header %} + {{ parent() }} +{% endblock %} + +{% block left %} + {{ parent() }} +{% endblock %} + +{% block body %} +
{% if notices is defined %} - {% for notice in notices %} -
{{notice}}
- {% endfor %} + {% for notice in notices %} +
{{notice}}
+ {% endfor %} {% else %} - No notices here. + No notices here. {% endif %} - - +
+{% endblock %} + +{% block javascripts %}{% endblock %} diff --git a/templates/settings/account.html.twig b/templates/settings/account.html.twig index 031f83a475..17d8dc2ff6 100644 --- a/templates/settings/account.html.twig +++ b/templates/settings/account.html.twig @@ -1,39 +1,19 @@ -{% extends 'base.html.twig' %} -{% block stylesheets %} - {{ parent() }} - - - -{% endblock %} +{% extends 'settings/base.html.twig' %} -{% block title %}Account Settings{% endblock %} - -{% block header %}{{ parent() }}{% endblock %} +{% block title %}Notification Settings{% endblock %} {% block body %} -
- +
+ {% block primary_nav %} + {{ parent() }} + {% endblock primary_nav %} -{% block form %} + {% block form %} +
+ {{ form(acc) }} +
+ {% endblock form %} +
-
- {{ form(acc) }} -
- -{% endblock %} -
- -{% endblock %} +{% endblock body %} diff --git a/templates/settings/avatar.html.twig b/templates/settings/avatar.html.twig index 9fa2ae2919..1f6d34676c 100644 --- a/templates/settings/avatar.html.twig +++ b/templates/settings/avatar.html.twig @@ -1,45 +1,13 @@ -{% extends 'base.html.twig' %} -{% block stylesheets %} - {{ parent() }} - - - -{% endblock %} +{% extends 'settings/profile.html.twig' %} {% block title %}Avatar Settings{% endblock %} -{% block header %}{{ parent() }}{% endblock %} - {% block body %} + {{ parent() }} +{% endblock body %} -
- - - {% block form %} -
- {{ form(avatar) }} -
- {% endblock %} +{% block form %} +
+ {{ form(avatar) }}
-{% endblock %} +{% endblock form %} \ No newline at end of file diff --git a/templates/settings/base.html.twig b/templates/settings/base.html.twig new file mode 100644 index 0000000000..f016a9aaf5 --- /dev/null +++ b/templates/settings/base.html.twig @@ -0,0 +1,51 @@ +{% extends 'left/left.html.twig' %} + +{% block meta %} + {{ parent() }} +{% endblock %} + +{% block title %}{% endblock %} + +{% block stylesheets %} + {{ parent() }} + + + +{% endblock %} + +{% block header %} + {{ parent() }} +{% endblock %} + +{% block body %} + {% block left %} + {{ parent() }} + {% endblock %} + +
+ {% block primary_nav %} + + {% endblock primary_nav %} + + {% block secundary_nav %} + {% endblock secundary_nav %} + + {% block form %} + {% endblock form %} +
+{% endblock body %} + + +{% block javascripts %}{% endblock %} \ No newline at end of file diff --git a/templates/settings/misc.html.twig b/templates/settings/misc.html.twig deleted file mode 100644 index 83870513f3..0000000000 --- a/templates/settings/misc.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -{% extends 'base.html.twig' %} -{% block stylesheets %} - {{ parent() }} - - - -{% endblock %} - -{% block title %}Misc Settings{% endblock %} - -{% block header %}{{ parent() }}{% endblock %} - -{% block body %} - -
- - - {% block form %} - -
- {{ form(misc) }} -
- - {% endblock %} -
- -{% endblock %} diff --git a/templates/settings/notifications.html.twig b/templates/settings/notifications.html.twig new file mode 100644 index 0000000000..5489043f34 --- /dev/null +++ b/templates/settings/notifications.html.twig @@ -0,0 +1,19 @@ +{% extends 'settings/base.html.twig' %} + +{% block title %}Notification Settings{% endblock %} + +{% block body %} + +
+ {% block primary_nav %} + {{ parent() }} + {% endblock primary_nav %} + + {% block form %} +
+ {{ form(notifications) }} +
+ {% endblock form %} +
+ +{% endblock body %} diff --git a/templates/settings/profile.html.twig b/templates/settings/profile.html.twig index d9de08b1dd..82ae63cdc5 100644 --- a/templates/settings/profile.html.twig +++ b/templates/settings/profile.html.twig @@ -1,51 +1,36 @@ -{% extends 'base.html.twig' %} -{% block stylesheets %} - {{ parent() }} - - - -{% endblock %} +{% extends 'settings/base.html.twig' %} {% block title %}Profile Settings{% endblock %} -{% block header %}{{ parent() }}{% endblock %} - {% block body %} -
- - -
+
+ {% block primary_nav %} + {{ parent() }} + {% endblock primary_nav %} -{% block form %} + {% block secundary_nav %} +
-{% endblock %} +
  • + Personal Info +
    • +
  • + Avatar +
    • + + + {% endblock secundary_nav %} + + {% block form %} +
    + {{ form(prof) }} +
    + {% endblock form %} + +
    +{% endblock body %}