From f7843d534c320f02b3926f687f327da35e9805ee Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 11 Feb 2016 21:10:18 +0100 Subject: [PATCH] Templating --- Controller.php | 23 ++++++++ Theme/backend/media-list.tpl.php | 25 +++------ Theme/backend/media-single.tpl.php | 84 +++++------------------------- 3 files changed, 45 insertions(+), 87 deletions(-) diff --git a/Controller.php b/Controller.php index f078067..acfcbad 100644 --- a/Controller.php +++ b/Controller.php @@ -108,6 +108,7 @@ class Controller extends ModuleAbstract implements WebInterface ['dest' => '\Modules\Media\Controller:setUpFileUploader', 'method' => 'GET', 'type' => ViewLayout::NULL], ['dest' => '\Modules\Media\Controller:viewMediaCreate', 'method' => 'GET', 'type' => ViewLayout::MAIN], ], + '^.*/backend/media/single.*$' => [['dest' => '\Modules\Media\Controller:viewMediaSingle', 'method' => 'GET', 'type' => ViewLayout::MAIN],], '^.*/api/media/collection.*$' => [['dest' => '\Modules\Media\Controller:apiCollectionCreate', 'method' => 'POST', 'type' => ViewLayout::MAIN],], '^.*/api/media$' => [['dest' => '\Modules\Media\Controller:apiMediaUpload', 'method' => 'POST', 'type' => ViewLayout::NULL],], @@ -149,6 +150,28 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + * @author Dennis Eichhorn + */ + public function viewMediaSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/Media/Theme/Backend/media-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000401001, $request, $response)); + + $mediaMapper = new MediaMapper($this->app->dbPool->get()); + $view->addData('media', $mediaMapper->get($request->getData('id'))); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Theme/backend/media-list.tpl.php b/Theme/backend/media-list.tpl.php index 59b03a7..550fb89 100644 --- a/Theme/backend/media-list.tpl.php +++ b/Theme/backend/media-list.tpl.php @@ -18,17 +18,7 @@ */ $mediaMapper = new \Modules\Media\Models\MediaMapper($this->app->dbPool->get()); -$media = $mediaMapper - ->listResults( - $mediaMapper - ->find('media.media_id', - 'media.media_name', - 'media.media_extension', - 'media.media_size', - 'media.media_created_at', - 'media.media_created_by') - //->newest('reporter_template.reporter_template_created') - ); +$media = $mediaMapper->getNewest(25); $footerView = new \Web\Views\Lists\PaginationView($this->app, $this->request, $this->response); $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); @@ -50,13 +40,14 @@ echo $this->getData('nav')->render(); ?> render(); ?> - $value) : $count++; ?> + $value) : $count++; + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?id=' . $value->getId()); ?> - getName(); ?> - getExtension(); ?> - getSize(); ?> - getCreatedBy(); ?> - getCreatedAt()->format('Y-m-d H:i:s'); ?> + getName(); ?> + getExtension(); ?> + getSize(); ?> + getCreatedBy(); ?> + getCreatedAt()->format('Y-m-d H:i:s'); ?> l11n->lang[0]['Empty']; ?> diff --git a/Theme/backend/media-single.tpl.php b/Theme/backend/media-single.tpl.php index 978b210..1369eb1 100644 --- a/Theme/backend/media-single.tpl.php +++ b/Theme/backend/media-single.tpl.php @@ -13,76 +13,20 @@ * @version 1.0.0 * @link http://orange-management.com */ -/** @noinspection PhpUndefinedMethodInspection */ -\phpOMS\Module\ModuleFactory::$loaded['Navigation']->call([\Modules\Navigation\Models\NavigationType::CONTENT, - 1000401001,]); +/** + * @var \phpOMS\Views\View $this + */ +$media = $this->getData('media'); +echo $this->getData('nav')->render(); ?> -
-

- app->accountManager->get($request->getAccount())->getL11n()->lang['Media']['Preview']; ?> - - -

- -
+
+

getName() ?>

+
+ getExtension(), ['gif', 'bmp', 'jpg', 'jpeg', 'png'])) : ?> + + + 
getPath())); ?>
+
-
- -
-

- app->accountManager->get($request->getAccount())->getL11n()->lang['Media']['Data']; ?> - - -

- -
- - - - - - - - - -
- getName(); ?> -
- getExtension(); ?> -
- getSize()); ?> -
- getAuthor(); ?> -
- getCreated()->format('Y-m-d H:i:s'); ?> -
- asldkf -
- asldkf -
- -
-
- - -
-

- app->accountManager->get($request->getAccount())->getL11n()->lang['Media']['Settings']; ?> - - -

- -
-
    -
  • - -
  • - -
  • - -
  • -
-
-
+