Admin global announcements

assets/less/common.less

@@ -85,3 +85,11 @@
 .forum-group-heading a {
   color: @page-color;
 }
+
+.text-center {
+  text-align: center;
+}
+
+.text-right {
+  text-align: right;
+}

assets/less/components/alert.less

@@ -24,3 +24,23 @@
   from { opacity: 0; }
   to { opacity: 1; }
 }
+
+.form-message {
+
+  display: flex;
+  flex-direction: column;
+  margin: 1rem 1rem 1rem 0;
+  padding: 1rem 1rem 0;
+
+  &--primary {
+    color: @alert-primary-text-color;
+    border: 1px solid @alert-primary-border-color;
+    background: @alert-primary-color;
+  }
+
+  &--success {
+    color: @alert-success-text-color;
+    border: 1px solid @alert-success-border-color;
+    background: @alert-success-color;
+  }
+}

assets/less/settings.less

@@ -50,7 +50,14 @@
 
 // Notices
 @alert-notice-color: aliceblue;
-@alert-success-color: palegreen;
+
+@alert-success-color: #c6f9d3;
+@alert-success-border-color: #a1dfb1;
+@alert-success-text-color: #002710;
+
+@alert-primary-color: #cfe5fb;
+@alert-primary-border-color: #b5cce3;
+@alert-primary-text-color: #172a3e;
 
 // Forms
 @form-error-color: red;

config/app_routes/frontpageconfig.yaml

@@ -0,0 +1,4 @@
+frontpageconfig:
+    controller: App\Controller\FrontPageConfigurationController::frontPageConfig
+    path: /frontpageconfig
+    methods: [GET, POST]

config/routes.yaml

@@ -16,6 +16,9 @@ _forum_category:
 _front:
     resource: app_routes/front.yaml
 
+_frontpageconfig:
+    resource: app_routes/frontpageconfig.yaml
+
 _message:
     resource: app_routes/message.yaml
 

src/Controller/FrontController.php

@@ -3,7 +3,9 @@
 namespace App\Controller;
 
 use App\Entity\User;
+use App\Entity\ForumConfiguration;
 use App\Repository\ForumRepository;
+use App\Repository\ForumConfigurationRepository;
 use App\Repository\SubmissionRepository;
 use App\Utils\PermissionsChecker;
 use Symfony\Component\HttpFoundation\Response;
@@ -26,9 +28,11 @@
  *   instead.
  */
 final class FrontController extends AbstractController {
-    public function front(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page) {
+    public function front(ForumRepository $fr, SubmissionRepository $sr, ForumConfigurationRepository $fcr, string $sortBy, int $page) {
         $user = $this->getUser();
 
+        $siteConfig = $fcr->findSitewide();
+
         if (!$user instanceof User) {
             //$listing = User::FRONT_FEATURED;
             $listing = User::FRONT_ALL;
@@ -41,20 +45,20 @@ public function front(ForumRepository $fr, SubmissionRepository $sr, string $sor
 
         switch ($listing) {
           case User::FRONT_SUBSCRIBED:
-              return $this->subscribed($fr, $sr, $sortBy, $page);
+              return $this->subscribed($fr, $sr, $sortBy, $page, $siteConfig);
           case User::FRONT_FEATURED:
-              return $this->featured($fr, $sr, $sortBy, $page);
+              return $this->featured($fr, $sr, $sortBy, $page, $siteConfig);
           case User::FRONT_ALL:
-              //return $this->all($sr, $sortBy, $page);
-              return $this->all($fr, $sr, $sortBy, $page);
+              //return $this->all($sr, $sortBy, $page, $siteConfig);
+              return $this->all($fr, $sr, $sortBy, $page, $siteConfig);
           case User::FRONT_MODERATED:
-              return $this->moderated($fr, $sr, $sortBy, $page);
+              return $this->moderated($fr, $sr, $sortBy, $page, $siteConfig);
           default:
               throw new \InvalidArgumentException('bad front page selection');
         }
     }
 
-    public function featured(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page) {
+    public function featured(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page, ForumConfiguration $siteConfig) {
         $forums = $fr->findFeaturedForumNames();
         $submissions = $sr->findFrontPageSubmissions($forums, $sortBy, $page);
 
@@ -63,10 +67,11 @@ public function featured(ForumRepository $fr, SubmissionRepository $sr, string $
             'listing' => 'featured',
             'submissions' => $submissions,
             'sort_by' => $sortBy,
+            'announcement' => $siteConfig->getAnnouncement(),
         ]);
     }
 
-    public function subscribed(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page) {
+    public function subscribed(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page, ForumConfiguration $siteConfig) {
         $this->denyAccessUnlessGranted('ROLE_USER');
 
         $forums = $fr->findSubscribedForumNames($this->getUser());
@@ -84,6 +89,7 @@ public function subscribed(ForumRepository $fr, SubmissionRepository $sr, string
             'listing' => 'subscribed',
             'sort_by' => $sortBy,
             'submissions' => $submissions,
+            'announcement' => $siteConfig->getAnnouncement(),
         ]);
     }
 
@@ -94,7 +100,7 @@ public function subscribed(ForumRepository $fr, SubmissionRepository $sr, string
      *
      * @return Response
      */
-    public function all(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page) {
+    public function all(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page, ForumConfiguration $siteConfig) {
         # Added for v1.
         $admin = PermissionsChecker::isAdmin($this->getUser());
         $forums = $fr->findAllForumNames();
@@ -105,10 +111,11 @@ public function all(ForumRepository $fr, SubmissionRepository $sr, string $sortB
             'listing' => 'all',
             'sort_by' => $sortBy,
             'submissions' => $submissions,
+            'announcement' => $siteConfig->getAnnouncement(),
         ]);
     }
 
-    public function moderated(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page) {
+    public function moderated(ForumRepository $fr, SubmissionRepository $sr, string $sortBy, int $page, ForumConfiguration $siteConfig) {
         $this->denyAccessUnlessGranted('ROLE_USER');
 
         $forums = $fr->findModeratedForumNames($this->getUser());
@@ -119,6 +126,7 @@ public function moderated(ForumRepository $fr, SubmissionRepository $sr, string
             'listing' => 'moderated',
             'sort_by' => $sortBy,
             'submissions' => $submissions,
+            'announcement' => $siteConfig->getAnnouncement(),
         ]);
     }
 

src/Controller/FrontPageConfigurationController.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\User;
+use App\Entity\ForumConfiguration;
+use App\Repository\ForumRepository;
+use App\Repository\ForumConfigurationRepository;
+use App\Repository\SubmissionRepository;
+use Symfony\Component\HttpFoundation\Response;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
+use App\Form\ForumConfigurationType;
+use App\Form\Model\ForumConfigurationData;
+use Doctrine\ORM\EntityManager;
+use Symfony\Component\HttpFoundation\Request;
+
+
+ /**
+  * @IsGranted("ROLE_ADMIN")
+  */
+final class FrontPageConfigurationController extends AbstractController {
+    public function frontPageConfig(ForumRepository $fr, SubmissionRepository $sr, ForumConfigurationRepository $fcr, EntityManager $em, Request $request) {
+        $data = new ForumConfigurationData($fcr->findSitewide());
+
+        $form = $this->createForm(ForumConfigurationType::class, $data);
+        $form->handleRequest($request);
+
+        $message = "";
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $fc = $data->toForumConfiguration();
+
+            // For sitewide settings, we need to force this to null.
+            $fc->setForumId(null);
+
+            if($fc->getId() == null || trim($fc->getId()) == "")
+                $em->persist($fc);
+            else
+                $em->merge($fc);
+
+            $em->flush();
+
+            // After saving, pull the data back down again.
+            $data = new ForumConfigurationData($fcr->findSitewide());
+            $form = $this->createForm(ForumConfigurationType::class, $data);
+
+            $message = "front_page_configuration_form.message_saved";
+        }
+
+        return $this->render('frontpageconfig/frontpageconfig.html.twig', [
+            'form' => $form->createView(),
+            'message' => $message,
+        ]);
+    }
+}

src/Entity/ForumConfiguration.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\Common\Collections\Selectable;
+use Doctrine\ORM\Mapping as ORM;
+use Pagerfanta\Adapter\DoctrineCollectionAdapter;
+use Pagerfanta\Adapter\DoctrineSelectableAdapter;
+use Pagerfanta\Pagerfanta;
+
+/**
+ * @ORM\Entity(repositoryClass="App\Repository\ForumConfigurationRepository")
+ * @ORM\Table(name="forum_configuration")
+ */
+class ForumConfiguration {
+    /**
+     * @ORM\Column(type="bigint")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\Id()
+     *
+     * @var int|null
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(type="bigint", nullable=true)
+     *
+     * @var int|null
+     */
+    private $forumId;
+
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     *
+     * @var string
+     */
+    private $announcement;
+
+    public function __construct($forumId) {
+        $this->forumId = $forumId;
+    }
+
+    public function getId() {
+      return $this->id;
+    }
+
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    public function getForumId() {
+      return $this->forumId;
+    }
+
+    public function setForumId($forumId) {
+      $this->forumId = $forumId;
+    }
+
+    public function getAnnouncement() {
+        return $this->announcement;
+    }
+
+    public function setAnnouncement($announcement) {
+        $this->announcement = $announcement;
+    }
+}

src/Form/ForumConfigurationType.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Form;
+
+use App\Form\Model\ForumConfigurationData;
+use Symfony\Component\Form\AbstractType;
+use App\Form\Type\MarkdownType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class ForumConfigurationType extends AbstractType {
+    public function buildForm(FormBuilderInterface $builder, array $options) {
+        $builder
+            ->add('announcement', MarkdownType::class, [
+                'label' => 'front_page_configuration_form.announcement',
+                'required' => false
+            ])
+            ->add('id', HiddenType::class, [])
+            ->add('forumId', HiddenType::class, [])
+            ->add('submit', SubmitType::class, [
+                'label' => 'front_page_configuration_form.save',
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver) {
+        $resolver->setDefaults([
+            'data_class' => ForumConfigurationData::class,
+        ]);
+    }
+}

src/Form/Model/ForumConfigurationData.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Form\Model;
+
+use App\Entity\ForumConfiguration;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class ForumConfigurationData {
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var int|null
+     */
+    public $forumId;
+
+    /**
+     * @var string|null
+     */
+    public $announcement;
+
+    public function __construct(ForumConfiguration $fc) {
+        $this->id = $fc->getId();
+        $this->forumId = $fc->getForumId();
+        $this->announcement = $fc->getAnnouncement();
+    }
+
+    public function toForumConfiguration(): ForumConfiguration {
+         $fc = new ForumConfiguration($this->forumId);
+         $fc->setId($this->id);
+         $fc->setAnnouncement($this->announcement);
+
+         return $fc;
+    }
+}