From 7fd81c4c2abd9e34bacd263d8649f79f2f763a4c Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Wed, 27 Sep 2017 22:40:39 -0600
Subject: [PATCH] Initial work on moving media controller to the backend

---
 modules/backend/controllers/Media.php       | 38 +++++++++++++++++++++
 modules/backend/controllers/media/index.htm |  7 ++++
 modules/cms/controllers/Media.php           | 23 ++-----------
 3 files changed, 48 insertions(+), 20 deletions(-)
 create mode 100644 modules/backend/controllers/Media.php
 create mode 100644 modules/backend/controllers/media/index.htm

diff --git a/modules/backend/controllers/Media.php b/modules/backend/controllers/Media.php
new file mode 100644
index 000000000..6a14c6635
--- /dev/null
+++ b/modules/backend/controllers/Media.php
@@ -0,0 +1,38 @@
+<?php namespace Backend\Controllers;
+
+use BackendMenu;
+use Backend\Classes\Controller;
+use Backend\Widgets\MediaManager;
+
+/**
+ * Backend Media Manager
+ *
+ * @package october\backend
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class Media extends Controller
+{
+    /**
+     * @var array Permissions required to view this page.
+     */
+    public $requiredPermissions = ['media.*'];
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        BackendMenu::setContext('October.Backend', 'media', true);
+        $this->pageTitle = 'cms::lang.media.menu_label';
+
+        $manager = new MediaManager($this, 'manager');
+        $manager->bindToController();
+    }
+
+    public function index()
+    {
+        $this->bodyClass = 'compact-container';
+    }
+}
diff --git a/modules/backend/controllers/media/index.htm b/modules/backend/controllers/media/index.htm
new file mode 100644
index 000000000..d6f5048c2
--- /dev/null
+++ b/modules/backend/controllers/media/index.htm
@@ -0,0 +1,7 @@
+<?= Block::put('head') ?><?= Block::endPut() ?>
+
+<?= Block::put('body') ?>
+    <?= Form::open(['class'=>'layout', 'onsubmit'=>'return false']) ?>
+        <?= $this->widget->manager->render() ?>
+    <?= Form::close() ?>
+<?= Block::endPut() ?>
\ No newline at end of file
diff --git a/modules/cms/controllers/Media.php b/modules/cms/controllers/Media.php
index 9d7b6d0b5..70622005e 100644
--- a/modules/cms/controllers/Media.php
+++ b/modules/cms/controllers/Media.php
@@ -1,38 +1,21 @@
 <?php namespace Cms\Controllers;
 
-use BackendMenu;
-use Backend\Classes\Controller;
-use Cms\Widgets\MediaManager;
+use Backend\Controllers\Media;
 
 /**
  * CMS Media Manager
  *
  * @package october\cms
  * @author Alexey Bobkov, Samuel Georges
+ * @deprecated Use Backend\Controllers\Media. Remove if year >= 2020.
  */
-class Media extends Controller
+class Media extends MediaController
 {
-    /**
-     * @var array Permissions required to view this page.
-     */
-    public $requiredPermissions = ['media.*'];
-
     /**
      * Constructor.
      */
     public function __construct()
     {
         parent::__construct();
-
-        BackendMenu::setContext('October.Cms', 'media', true);
-        $this->pageTitle = 'cms::lang.media.menu_label';
-
-        $manager = new MediaManager($this, 'manager');
-        $manager->bindToController();
-    }
-
-    public function index()
-    {
-        $this->bodyClass = 'compact-container';
     }
 }