Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-16 00:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Organization + calendar fixes/extensions

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-02-14 23:10:58 +01:00
parent 5b293282fa
commit 7a4ec7af7d
5 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Controller.php
View File

@ -102,7 +102,7 @@ class Controller extends ModuleAbstract implements WebInterface
*/ */
protected static $routes = [ protected static $routes = [
'^.*/backend/news/dashboard.*$' => [['dest' => '\Modules\News\Controller:viewNewsDashboard', 'method' => 'GET', 'type' => ViewLayout::MAIN],], '^.*/backend/news/dashboard.*$' => [['dest' => '\Modules\News\Controller:viewNewsDashboard', 'method' => 'GET', 'type' => ViewLayout::MAIN],],
'^.*/backend/news/single.*$' => [['dest' => '\Modules\News\Controller:viewNewsArticle', 'method' => 'GET', 'type' => ViewLayout::MAIN],], '^.*/backend/news/article.*$' => [['dest' => '\Modules\News\Controller:viewNewsArticle', 'method' => 'GET', 'type' => ViewLayout::MAIN],],
'^.*/backend/news/archive.*$' => [['dest' => '\Modules\News\Controller:viewNewsArchive', 'method' => 'GET', 'type' => ViewLayout::MAIN],], '^.*/backend/news/archive.*$' => [['dest' => '\Modules\News\Controller:viewNewsArchive', 'method' => 'GET', 'type' => ViewLayout::MAIN],],
'^.*/backend/news/create.*$' => [['dest' => '\Modules\News\Controller:viewNewsCreate', 'method' => 'GET', 'type' => ViewLayout::MAIN],], '^.*/backend/news/create.*$' => [['dest' => '\Modules\News\Controller:viewNewsCreate', 'method' => 'GET', 'type' => ViewLayout::MAIN],],
]; ];
@ -123,10 +123,9 @@ class Controller extends ModuleAbstract implements WebInterface
$view->setTemplate('/Modules/News/Theme/Backend/news-dashboard'); $view->setTemplate('/Modules/News/Theme/Backend/news-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response));
$news = $this->getNewsListR(20, 0, 'news.news_publish', 'DESC', $this->app->accountManager->get($request->getAccount())); $mapper = new NewsArticleMapper($this->app->dbPool->get());
$headline = $this->getHeadlineListR(20, 0, 'news.news_publish', 'ASC', $this->app->accountManager->get($request->getAccount())); $news = $mapper->getNewest(50);
$view->addData('newsList', $news); $view->addData('news', $news);
$view->addData('headlineList', $headline);
return $view; return $view;
} }
@ -149,7 +148,7 @@ class Controller extends ModuleAbstract implements WebInterface
$newsArticleMapper = new NewsArticleMapper($this->app->dbPool->get()); $newsArticleMapper = new NewsArticleMapper($this->app->dbPool->get());
$article = $newsArticleMapper->get((int) $request->getData('id')); $article = $newsArticleMapper->get((int) $request->getData('id'));
$view->addData('newsList', $article); $view->addData('news', $article);
return $view; return $view;
} }

8
Models/NewsArticleMapper.php
View File

@ -57,6 +57,14 @@ class NewsArticleMapper extends DataMapperAbstract
*/ */
protected static $primaryField = 'news_id'; protected static $primaryField = 'news_id';
/**
* Created at.
*
* @var string
* @since 1.0.0
*/
protected static $createdAt = 'news_created_at';
/** /**
* Create article. * Create article.
* *

3
Theme/backend/Lang/en.lang.php
View File

@ -34,4 +34,7 @@ $MODLANG['News'] = [
'Title' => 'Title', 'Title' => 'Title',
'Type' => 'Type', 'Type' => 'Type',
'Visible' => 'Visible', 'Visible' => 'Visible',
'TYPE0' => 'Article',
'TYPE1' => 'Link',
'TYPE2' => 'Headline',
]; ];

38
Theme/backend/news-dashboard.tpl.php
View File

@ -17,38 +17,34 @@
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
$newsList = $this->getData('newsList'); $newsList = $this->getData('news');
$headlineList = $this->getData('headlineList');
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
<section class="box w-50 floatLeft"> <section class="box w-100 floatLeft">
<table class="table"> <table class="table">
<caption><?= $this->l11n->lang['News']['News'] ?></caption> <caption><?= $this->l11n->lang['News']['News'] ?></caption>
<thead> <thead>
<tr> <tr>
<td>
<td><?= $this->l11n->lang['News']['Type']; ?>
<td class="wf-100"><?= $this->l11n->lang['News']['Title']; ?> <td class="wf-100"><?= $this->l11n->lang['News']['Title']; ?>
<td><?= $this->l11n->lang['News']['Author']; ?> <td><?= $this->l11n->lang['News']['Author']; ?>
<td><?= $this->l11n->lang['News']['Date']; ?> <td><?= $this->l11n->lang['News']['Date']; ?>
<tbody> <tbody>
<?php $count = 0; foreach([] as $key => $value) : $count++; ?> <?php $count = 0; foreach($newsList as $key => $news) : $count++;
<?php endforeach; ?> $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/news/article?id=' . $news->getId());
<?php if($count === 0) : ?> $color = 'darkred';
<tr><td colspan="3" class="empty"><?= $this->l11n->lang[0]['Empty']; ?> if($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
<?php endif; ?> elseif($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
</table> elseif($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
</section> ?>
<tr>
<section class="box w-50 floatLeft"> <td><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
<table class="table"> <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->l11n->lang['News']['TYPE' . $news->getType()]; ?></span></a>
<caption><?= $this->l11n->lang['News']['Headlines'] ?></caption> <td><a href="<?= $url; ?>"><?= $news->getTitle(); ?></a>
<thead> <td><a href="<?= $url; ?>"><?= $news->getCreatedBy(); ?></a>
<tr> <td><a href="<?= $url; ?>"><?= $news->getPublish()->format('Y-m-d'); ?></a>
<td class="wf-100"><?= $this->l11n->lang['News']['Title']; ?>
<td><?= $this->l11n->lang['News']['Author']; ?>
<td><?= $this->l11n->lang['News']['Date']; ?>
<tbody>
<?php $count = 0; foreach([] as $key => $value) : $count++; ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php if($count === 0) : ?> <?php if($count === 0) : ?>
<tr><td colspan="3" class="empty"><?= $this->l11n->lang[0]['Empty']; ?> <tr><td colspan="3" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>

40
Theme/backend/news-single.tpl.php
View File

@ -1,13 +1,31 @@
<div class="b b-5 c7-1 c7" id="i7-1-1"> <?php
<h1> /**
<?= /** @var \Modules\News\Article $article */ * Orange Management
$article->getTitle(); ?> *
<i class="fa fa-minus min"></i> * PHP Version 7.0
<i class="fa fa-plus max vh"></i> *
</h1> * @category TBD
* @package TBD
* @author OMS Development Team <dev@oms.com>
* @author Dennis Eichhorn <d.eichhorn@oms.com>
* @copyright 2013 Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://orange-management.com
*/
/**
* @var \phpOMS\Views\View $this
*/
<div class="bc-1"> $news = $this->getData('news');
<span><?= $article->getPublish()->format('Y-m-d H:i:s'); ?></span> <span><?= $article->getAuthor(); ?></span>
<?= $article->getContent(); ?> echo $this->getData('nav')->render(); ?>
<section class="box w-100">
<h1><?= $news->getTitle(); ?></h1>
<div class="inner">
<article>
<?= $news->getContent(); ?>
</article>
</div> </div>
</div> </section>