From 8e08dfa0304bd33851891a5fb7d381252b22af68 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 6 May 2016 18:24:44 +0200
Subject: [PATCH] Reformatting and new directory (capitalization)

---
 Controller.php                       | 17 +++++++----------
 Theme/Backend/news-dashboard.tpl.php | 10 +++++-----
 Theme/backend/news-dashboard.tpl.php | 10 +++++-----
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Controller.php b/Controller.php
index dfcd5f8..dc49537 100644
--- a/Controller.php
+++ b/Controller.php
@@ -15,8 +15,6 @@
  */
 namespace Modules\News;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
 use Modules\News\Models\NewsArticle;
 use Modules\News\Models\NewsArticleMapper;
 use phpOMS\Account\Account;
@@ -26,7 +24,6 @@ use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Module\WebInterface;
 use phpOMS\Views\View;
-use phpOMS\Views\ViewLayout;
 
 /**
  * News controller class.
@@ -88,7 +85,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -111,7 +108,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -134,7 +131,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -153,7 +150,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @param ResponseAbstract $response Response
      * @param mixed            $data     Generic data
      *
-     * @return RenderableInterface
+     * @return \Serializable
      *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
@@ -180,13 +177,13 @@ class Controller extends ModuleAbstract implements WebInterface
     public function createNews(...$articleElements)
     {
         $newsArticle = new NewsArticle();
-        $newsArticle->setAuthor($articleElements[0]);
-        $newsArticle->setCreated($articleElements[1]);
+        $newsArticle->setCreatedBy($articleElements[0]);
+        $newsArticle->setCreatedAt($articleElements[1]);
         $newsArticle->setPublish($articleElements[2]);
         $newsArticle->setTitle($articleElements[3]);
         $newsArticle->setPlain($articleElements[4]);
         $newsArticle->setContent($articleElements[5]);
-        $newsArticle->setLang($articleElements[6]);
+        $newsArticle->setLanguage($articleElements[6]);
         $newsArticle->setType($articleElements[7]);
         $newsArticle->setStatus($articleElements[8]);
         $newsArticle->setFeatured($articleElements[9]);
diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index fe52a77..56de42d 100644
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -40,11 +40,11 @@ echo $this->getData('nav')->render(); ?>
                 elseif($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
                 ?>
                     <tr>
-                        <td><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
-                        <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->lang['News']['TYPE' . $news->getType()]; ?></span></a>
-                        <td><a href="<?= $url; ?>"><?= $news->getTitle(); ?></a>
-                        <td><a href="<?= $url; ?>"><?= $news->getCreatedBy(); ?></a>
-                        <td><a href="<?= $url; ?>"><?= $news->getPublish()->format('Y-m-d'); ?></a>
+                        <td data-label=""><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Type']; ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->lang['News']['TYPE' . $news->getType()]; ?></span></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Title']; ?>"><a href="<?= $url; ?>"><?= $news->getTitle(); ?></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Author']; ?>"><a href="<?= $url; ?>"><?= $news->getCreatedBy(); ?></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Date']; ?>"><a href="<?= $url; ?>"><?= $news->getPublish()->format('Y-m-d'); ?></a>
                 <?php endforeach; ?>
                 <?php if($count === 0) : ?>
         <tr><td colspan="3" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
diff --git a/Theme/backend/news-dashboard.tpl.php b/Theme/backend/news-dashboard.tpl.php
index fe52a77..56de42d 100644
--- a/Theme/backend/news-dashboard.tpl.php
+++ b/Theme/backend/news-dashboard.tpl.php
@@ -40,11 +40,11 @@ echo $this->getData('nav')->render(); ?>
                 elseif($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
                 ?>
                     <tr>
-                        <td><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
-                        <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->lang['News']['TYPE' . $news->getType()]; ?></span></a>
-                        <td><a href="<?= $url; ?>"><?= $news->getTitle(); ?></a>
-                        <td><a href="<?= $url; ?>"><?= $news->getCreatedBy(); ?></a>
-                        <td><a href="<?= $url; ?>"><?= $news->getPublish()->format('Y-m-d'); ?></a>
+                        <td data-label=""><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Type']; ?>"><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->lang['News']['TYPE' . $news->getType()]; ?></span></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Title']; ?>"><a href="<?= $url; ?>"><?= $news->getTitle(); ?></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Author']; ?>"><a href="<?= $url; ?>"><?= $news->getCreatedBy(); ?></a>
+                        <td data-label="<?= $this->l11n->lang['News']['Date']; ?>"><a href="<?= $url; ?>"><?= $news->getPublish()->format('Y-m-d'); ?></a>
                 <?php endforeach; ?>
                 <?php if($count === 0) : ?>
         <tr><td colspan="3" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>