diff --git a/src/Controller/Network.php b/src/Controller/Network.php index e661f62e7e..c21b44dd13 100644 --- a/src/Controller/Network.php +++ b/src/Controller/Network.php @@ -152,8 +152,8 @@ END; { return [ '_template' => 'network/groups.html.twig', - 'groups' => DB::dql('select group from App\Entity\Groups group ' . - 'order by group.created DESC'), + 'groups' => DB::dql('select g from App\Entity\Group g ' . + 'order by g.nickname ASC'), ]; } } diff --git a/src/Routes/Main.php b/src/Routes/Main.php index bfcb4105f1..95b5e7abe1 100644 --- a/src/Routes/Main.php +++ b/src/Routes/Main.php @@ -55,6 +55,7 @@ abstract class Main $r->connect('actors', '/actors', [C\Network::class, 'actors']); $r->connect('groups', '/groups', [C\Network::class, 'groups']); + $r->connect('groups_stream', '/groups/stream', [C\Network::class, 'groups']); $r->connect('panel', '/panel', [C\AdminPanel::class, 'site']); $r->connect('panel_site', '/panel/site', [C\AdminPanel::class, 'site']); diff --git a/templates/group/group.html.twig b/templates/group/group.html.twig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/templates/network/groups.html.twig b/templates/network/groups.html.twig index a1f84917e8..c1c37f6091 100644 --- a/templates/network/groups.html.twig +++ b/templates/network/groups.html.twig @@ -4,7 +4,7 @@ {{ parent() }} {% endblock %} -{% block title %}Welcome!{% endblock %} +{% block title %}Actors{% endblock %} {% block stylesheets %} {{ parent() }} @@ -25,7 +25,90 @@ {% endblock %} {% block body %} - +
+ {% if post_form is defined %} + {{ form_start(post_form) }} +
+
+
+ {{ form_label(post_form.to) }} +
+
+ {{ form_widget(post_form.to) }} +
+
+
+
+
+ {{ form_row(post_form.visibility) }} +
+
+ {% for tab in tabs %} + {{ tab['title'] }} + {% endfor %} +
+
+
+
+ {{ form_row(post_form.content) }} +
+
+
+
+ {{ form_widget(post_form.attachments) }} + +
+
+ {{ form_row(post_form.post) }} +
+
+
+
+ {{ form_end(post_form) }} + {% endif %} +
+ +
+ +
+
+ {% if groups is defined and groups is not empty %} + {% for group in groups %} + {% include '/group/group.html.twig' with {'group': group, 'have_user': have_user} only %} + {% endfor %} + {% else %} +

{% trans %}No groups here.{% endtrans %}

+ {% endif %} +
+
+
+
+
{% endblock body %} -{% block javascripts %}{% endblock %} \ No newline at end of file +{% block javascripts %}{% endblock %}