Merge pull request #357 from jan-stanek/upravy

obsah s poradatelem

Author: Jan Staněk

app/WebModule/components/IOrganizerContentControlFactory.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\WebModule\Components;
+
+
+/**
+ * Factory komponenty s informací o pořadateli.
+ *
+ * @author Jan Staněk <[email protected]>
+ */
+interface IOrganizerContentControlFactory
+{
+    /**
+     * @return OrganizerContentControl
+     */
+    public function create();
+}

app/WebModule/components/OrganizerContentControl.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\WebModule\Components;
+
+use Nette\Application\UI\Control;
+
+
+/**
+ * Komponenta s informací o pořadateli.
+ *
+ * @author Jan Staněk <[email protected]>
+ */
+class OrganizerContentControl extends Control
+{
+    /**
+     * @param $content
+     */
+    public function render($content)
+    {
+        $template = $this->template;
+        $template->setFile(__DIR__ . '/templates/organizer_content.latte');
+
+        $template->heading = $content->getHeading();
+        $template->organizer = $content->getOrganizer();
+
+        $template->render();
+    }
+}

app/WebModule/components/templates/organizer_content.latte

@@ -0,0 +1,7 @@
+<div class="row" n:ifcontent>
+    <div class="col-sm-12" n:ifcontent>
+        <h3 n:ifcontent>{$heading}</h3>
+    </div>
+</div>
+{$organizer|noescape}
+<img src="img/logo.png" width="100%"/>

app/WebModule/presenters/PagePresenter.php

@@ -11,6 +11,7 @@
 use App\WebModule\Components\IImageContentControlFactory;
 use App\WebModule\Components\ILectorsContentControlFactory;
 use App\WebModule\Components\INewsContentControlFactory;
+use App\WebModule\Components\IOrganizerContentControlFactory;
 use App\WebModule\Components\IPlaceContentControlFactory;
 use App\WebModule\Components\IProgramsContentControlFactory;
 use App\WebModule\Components\ITextContentControlFactory;
@@ -104,6 +105,12 @@ class PagePresenter extends WebBasePresenter
      */
     public $lectorsContentControlFactory;
 
+    /**
+     * @var IOrganizerContentControlFactory
+     * @inject
+     */
+    public $organizerContentControlFactory;
+
 
     public function renderDefault($slug)
     {
@@ -191,4 +198,9 @@ protected function createComponentLectorsContent()
     {
         return $this->lectorsContentControlFactory->create();
     }
+
+    protected function createComponentOrganizerContent()
+    {
+        return $this->organizerContentControlFactory->create();
+    }
 }

app/config/config.neon

@@ -181,6 +181,7 @@ services:
     - App\WebModule\Components\IUsersContentControlFactory
     - App\WebModule\Components\ILectorsContentControlFactory
     - App\WebModule\Components\IApplicationsGridControlFactory
+    - App\WebModule\Components\IOrganizerContentControlFactory
 
     - App\WebModule\Forms\BaseForm
     - App\WebModule\Forms\AdditionalInformationForm

app/lang/admin.cs_CZ.neon

@@ -89,6 +89,7 @@ cms:
     pages_content_news_count_note: "Pokud necháte počet prázdný, zobrazí se všechny aktuality."
     pages_content_text: "Text"
     pages_content_users_roles: "Zobrazované role"
+    pages_content_organizer: "Pořadatel"
 
     news_heading: "Aktuality"
     news_published: "Zveřejnit"

app/lang/common.cs_CZ.neon

@@ -49,6 +49,7 @@ content:
         lectors: "Přehled lektorů"
         blocks: "Program semináře"
         capacities: "Kapacita semináře"
+        organizer: "Pořadatel"
 
     default_heading:
         text: ""
@@ -64,6 +65,7 @@ content:
         lectors: "Přehled lektorů"
         blocks: "Program semináře"
         capacities: "Kapacita semináře"
+        organizer: "Pořadatel"
 
 area:
     main: "Hlavní oblast"

app/model/CMS/Content/Content.php

@@ -30,7 +30,8 @@
  *     "users_content" = "UsersContent",
  *     "lectors_content" = "LectorsContent",
  *     "blocks_content" = "BlocksContent",
- *     "capacities_content" = "CapacitiesContent"
+ *     "capacities_content" = "CapacitiesContent",
+ *     "organizer_content" = "OrganizerContent"
  * })
  */
 abstract class Content implements IContent
@@ -100,6 +101,11 @@ abstract class Content implements IContent
      */
     const CAPACITIES = 'capacities';
 
+    /**
+     * OrganizerContent
+     */
+    const ORGANIZER = 'organizer';
+
 
     /**
      * Hlavní oblast stránky.
@@ -111,6 +117,7 @@ abstract class Content implements IContent
      */
     const SIDEBAR = 'sidebar';
 
+
     public static $types = [
         self::TEXT,
         self::IMAGE,
@@ -124,7 +131,8 @@ abstract class Content implements IContent
         self::USERS,
         self::LECTORS,
         self::BLOCKS,
-        self::CAPACITIES
+        self::CAPACITIES,
+        self::ORGANIZER
     ];
 
     public static $areas = [

app/model/CMS/Content/OrganizerContent.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Model\CMS\Content;
+
+use Doctrine\ORM\Mapping as ORM;
+use Nette\Application\UI\Form;
+
+
+/**
+ * Entita obsahu s informací o pořadateli.
+ *
+ * @author Jan Staněk <[email protected]>
+ * @ORM\Entity
+ * @ORM\Table(name="organizer_content")
+ */
+class OrganizerContent extends Content implements IContent
+{
+    protected $type = Content::ORGANIZER;
+
+    /**
+     * Pořadatel.
+     * @ORM\Column(type="string", nullable=true)
+     * @var string
+     */
+    protected $organizer;
+
+
+    /**
+     * @return string
+     */
+    public function getOrganizer()
+    {
+        return $this->organizer;
+    }
+
+    /**
+     * @param string $organizer
+     */
+    public function setOrganizer($organizer)
+    {
+        $this->organizer = $organizer;
+    }
+
+    /**
+     * Přidá do formuláře pro editaci stránky formulář pro úpravu obsahu.
+     * @param Form $form
+     * @return Form
+     */
+    public function addContentForm(Form $form)
+    {
+        parent::addContentForm($form);
+
+        $formContainer = $form[$this->getContentFormName()];
+
+        $formContainer->addText('organizer', 'admin.cms.pages_content_organizer')
+            ->setDefaultValue($this->organizer);
+
+        return $form;
+    }
+
+    /**
+     * Zpracuje při uložení stránky část formuláře týkající se obsahu.
+     * @param Form $form
+     * @param \stdClass $values
+     */
+    public function contentFormSucceeded(Form $form, \stdClass $values)
+    {
+        parent::contentFormSucceeded($form, $values);
+        $values = $values[$this->getContentFormName()];
+        $this->organizer = $values['organizer'];
+    }
+}

app/model/User/CustomInputValue/CustomSelectValue.php

@@ -16,7 +16,7 @@ class CustomSelectValue extends CustomInputValue implements ICustomInputValue
 {
     /**
      * Vybraná položka výběrového pole přihlášky.
-     * @ORM\Column(type="integer")
+     * @ORM\Column(type="integer", nullable=true)
      * @var int
      */
     protected $value;

migrations/initial_data.sql

@@ -5,11 +5,10 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 
 INSERT INTO `content` (`id`, `page_id`, `heading`, `area`, `position`, `type`) VALUES
   (1, 1, 'Úspěšně jste nainstalovali SRS. Gratulujeme!', 'main', 1, 'text_content'),
-  (2, 1, 'Pořadatel', 'sidebar', 1, 'text_content'),
-  (3, 1, '', 'sidebar', 2, 'image_content');
+  (2, 1, 'Pořadatel', 'sidebar', 1, 'organizer_content');
 
-INSERT INTO `image_content` (`id`, `image`, `align`, `width`, `height`) VALUES
-  (3, '/logo/skaut.png', 'center', 120, 150);
+INSERT INTO `organizer_content` (`id`, `organizer`) VALUES
+  (2, 'Junák - český skaut, z. s.');
 
 INSERT INTO `page` (`id`, `name`, `slug`, `position`, `public`) VALUES
   (1, 'Homepage', '/', 1, 1);
@@ -119,5 +118,4 @@ INSERT INTO `settings` (`item`, `value`) VALUES
   ('variable_symbol_code', '');
 
 INSERT INTO `text_content` (`id`, `text`) VALUES
-  (1, '<p>Obsah této stránky můžete změnit v administraci v sekci Web.</p>'),
-  (2, '<p>Junák – český skaut</p>');
+  (1, '<p>Obsah této stránky můžete změnit v administraci v sekci Web.</p>');

migrations/initial_schema.sql

@@ -242,6 +242,13 @@ CREATE TABLE `news_content` (
   CONSTRAINT `FK_A9212C4FBF396750` FOREIGN KEY (`id`) REFERENCES `content` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+CREATE TABLE `organizer_content` (
+  `id` int(11) NOT NULL,
+  `organizer` VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `FK_B7F48760BF396750` FOREIGN KEY (`id`) REFERENCES `content` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
 CREATE TABLE `page` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,