From 3b8d21c78fd070454033850d56669d5b63fb6220 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 9 May 2018 20:46:03 +0200
Subject: [PATCH] Templating

---
 Controller.php                    | 12 +++++++++---
 Theme/Backend/task-create.tpl.php |  4 ++--
 Theme/Backend/task-single.tpl.php | 11 ++++++-----
 info.json                         |  3 ++-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Controller.php b/Controller.php
index 3033ec7..5fdb1ea 100644
--- a/Controller.php
+++ b/Controller.php
@@ -187,6 +187,12 @@ class Controller extends ModuleAbstract implements WebInterface
         $view->addData('task', $task);
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
 
+        $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app, $request, $response);
+        $view->addData('accGrpSelector', $accGrpSelector);
+
+        $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response);
+        $view->addData('editor', $editor);
+
         return $view;
     }
 
@@ -256,7 +262,7 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $val = [];
         if (($val['title'] = empty($request->getData('title')))
-            || ($val['description'] = empty($request->getData('description')))
+            || ($val['plain'] = empty($request->getData('plain')))
             || ($val['due'] = !((bool) strtotime((string) $request->getData('due'))))
             || ($val['forward'] = !(is_numeric($request->getData('forward') ?? 0)))
         ) {
@@ -317,8 +323,8 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $task = new Task();
         $task->setTitle((string) ($request->getData('title') ?? ''));
-        $task->setDescription(Markdown::parse((string) ($request->getData('description') ?? '')));
-        $task->setDescriptionRaw((string) ($request->getData('description') ?? ''));
+        $task->setDescription(Markdown::parse((string) ($request->getData('plain') ?? '')));
+        $task->setDescriptionRaw((string) ($request->getData('plain') ?? ''));
         $task->setCreatedBy($request->getHeader()->getAccount());
         $task->setDue(new \DateTime((string) ($request->getData('due') ?? 'now')));
         $task->setStatus(TaskStatus::OPEN);
diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
index e2ce50f..aa2f755 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -47,8 +47,8 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iTitle"><?= $this->getHtml('Title') ?></label>
                         <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->getHtml('Title') ?>" required>
                         <tr><td><label for="iMessage"><?= $this->getHtml('Message') ?></label>
-                        <tr><td><?= $this->getData('editor')->render('task-editor-tools'); ?>
-                        <tr><td><?= $this->getData('editor')->getData('text')->render('task-editor-text', 'plain', 'fTask'); ?>
+                        <tr><td><?= $this->getData('editor')->render('task-editor'); ?>
+                        <tr><td><?= $this->getData('editor')->getData('text')->render('task-editor', 'plain', 'fTask'); ?>
                         <tr><td>
                             <input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
                             <input type="hidden" name="type" value="<?= $this->printHtml(TaskType::SINGLE); ?>">
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 6347ce9..c3e00bc 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>
             </div>
             <header><h1><?= $this->printHtml($task->getTitle()); ?></h1></header>
             <div class="inner">
-                <?= $this->printHtml($task->getDescription()); ?>
+                <?= $task->getDescription(); ?>
             </div>
 
             <?php if (!empty($taskMedia)) : ?>
@@ -65,7 +65,7 @@ echo $this->getData('nav')->render(); ?>
 
                 <?php if ($element->getDescription() !== '') : ?>
                     <div class="inner">
-                        <?= $this->printHtml($element->getDescription()); ?>
+                        <?= $element->getDescription(); ?>
                     </div>
                 <?php endif; ?>
 
@@ -98,9 +98,10 @@ echo $this->getData('nav')->render(); ?>
         <section class="box wf-100">
             <div class="inner">
                 <form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task/element?{?}&csrf={$CSRF}'); ?>">
-                    <table class="layout wf-100">
+                    <table class="layout wf-100" style="table-layout: fixed">
                         <tr><td><label for="iMessage"><?= $this->getHtml('Message') ?></label>
-                        <tr><td><textarea id="iMessage" name="description"></textarea>
+                        <tr><td><?= $this->getData('editor')->render('task-editor'); ?>
+                        <tr><td><?= $this->getData('editor')->getData('text')->render('task-editor', 'plain', 'fTask'); ?>
                         <tr><td><label for="iDue"><?= $this->getHtml('Due') ?></label>
                         <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= $this->printHtml(!empty($elements) ? end($elements)->getDue()->format('Y-m-d\TH:i:s') : $task->getDue()->format('Y-m-d\TH:i:s')); ?>">
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status') ?></label>
@@ -112,7 +113,7 @@ echo $this->getData('nav')->render(); ?>
                                     <option value="<?= $this->printHtml(TaskStatus::DONE); ?>">Done
                                 </select>
                         <tr><td><label for="iReceiver"><?= $this->getHtml('To') ?></label>
-                        <tr><td><input type="text" id="iReceiver" name="forward" value="<?= $this->printHtml($this->request->getHeader()->getAccount()); ?>" placeholder="&#xf007; Guest">
+                        <tr><td><?= $this->getData('accGrpSelector')->render('iReceiver', true); ?>
                         <tr><td><label for="iMedia"><?= $this->getHtml('Media') ?></label>
                         <tr><td><div class="ipt-wrap">
                                 <div class="ipt-first"><input type="text" id="iMedia" placeholder="&#xf15b; File"></div>
diff --git a/info.json b/info.json
index 1a36e3f..f76e670 100644
--- a/info.json
+++ b/info.json
@@ -19,7 +19,8 @@
     "dependencies": {
         "Admin": "1.0.0",
         "Calendar": "1.0.0",
-        "Media": "1.0.0"
+        "Media": "1.0.0",
+        "Editor": "1.0.0"
     },
     "providing": {
         "Navigation": "*"