From 33332ab1d05797b28ac58ed25b261280526096f3 Mon Sep 17 00:00:00 2001 From: VladimirCherkasov <vcherckasov@yandex.ru> Date: Thu, 9 Jul 2015 12:01:27 +0300 Subject: [PATCH] move support interface in admin/requests/errors --- ~dev_rating/application/bootstrap.php | 8 -------- .../classes/Controller/Admin/Requests.php | 15 +++++++++++++++ .../classes/Controller/Support/Index.php | 15 --------------- .../application/views/admin/menu/system.twig | 6 +++--- .../application/views/admin/requests/errors.twig | 1 + ~dev_rating/application/views/support/index.twig | 2 -- 6 files changed, 19 insertions(+), 28 deletions(-) create mode 100644 ~dev_rating/application/classes/Controller/Admin/Requests.php delete mode 100644 ~dev_rating/application/classes/Controller/Support/Index.php create mode 100644 ~dev_rating/application/views/admin/requests/errors.twig delete mode 100644 ~dev_rating/application/views/support/index.twig diff --git a/~dev_rating/application/bootstrap.php b/~dev_rating/application/bootstrap.php index 6f6d07df6..19dcd3ba3 100644 --- a/~dev_rating/application/bootstrap.php +++ b/~dev_rating/application/bootstrap.php @@ -202,14 +202,6 @@ Route::set('common:index', 'index') // 'action' => 'profile' // ]); -// --------------- Support ---------------- - -Route::set('support:index', 'support(/index)') - ->defaults([ - 'directory' => 'Support', - 'controller' => 'Index', - 'action' => 'index' - ]); // --------------- Students ---------------- diff --git a/~dev_rating/application/classes/Controller/Admin/Requests.php b/~dev_rating/application/classes/Controller/Admin/Requests.php new file mode 100644 index 000000000..a225fdac4 --- /dev/null +++ b/~dev_rating/application/classes/Controller/Admin/Requests.php @@ -0,0 +1,15 @@ +<?php defined('SYSPATH') or die('No direct script access.'); + +class Controller_Admin_Requests extends Controller_Environment_Admin +{ + + public function before() { + parent::before(); + } + + public function action_errors() { + $this->twig->set_filename('admin/requests/errors'); + } + +} + diff --git a/~dev_rating/application/classes/Controller/Support/Index.php b/~dev_rating/application/classes/Controller/Support/Index.php deleted file mode 100644 index 4a0ebd0e6..000000000 --- a/~dev_rating/application/classes/Controller/Support/Index.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php defined('SYSPATH') or die('No direct script access.'); - -class Controller_Support_Index extends Controller_Environment_Admin -{ - - public function before() { - parent::before(); - } - - public function action_index() { - $this->twig->set_filename('support/index'); - } - -} - diff --git a/~dev_rating/application/views/admin/menu/system.twig b/~dev_rating/application/views/admin/menu/system.twig index a67f56614..c440438ab 100644 --- a/~dev_rating/application/views/admin/menu/system.twig +++ b/~dev_rating/application/views/admin/menu/system.twig @@ -6,14 +6,14 @@ <ul> {# HTML.anchor('admin/log/user', '<li>Рстория действий</li>')|raw #} {# HTML.anchor('admin/log/kohana', '<li>Log-файлы Kohana</li>')|raw #} - {# HTML.anchor('admin/requests/errors', '<li>Сообщения РѕР± ошибках</li>')|raw #} + {{ HTML.anchor('admin/requests/errors', '<li>Сообщения РѕР± ошибках</li>')|raw }} {# HTML.anchor('admin/stats', '<li>Статистика использования</li>')|raw #} {# HTML.anchor('admin/sysinfo', '<li>Рнформация Рѕ системе</li>')|raw #} <li class='dev'>Рстория действий</li> <li class='dev'>Log-файлы Kohana</li> - <li class='dev'>Сообщения РѕР± ошибках</li> + {# <li class='dev'>Сообщения РѕР± ошибках</li> #} <li class='dev'>Статистика использования</li> <li class='dev'>Рнформация Рѕ системе</li> </ul> </div> -</div> \ No newline at end of file +</div> diff --git a/~dev_rating/application/views/admin/requests/errors.twig b/~dev_rating/application/views/admin/requests/errors.twig new file mode 100644 index 000000000..d5a91d617 --- /dev/null +++ b/~dev_rating/application/views/admin/requests/errors.twig @@ -0,0 +1 @@ +{% extends "admin/base" %} diff --git a/~dev_rating/application/views/support/index.twig b/~dev_rating/application/views/support/index.twig deleted file mode 100644 index 6ae7e6ff3..000000000 --- a/~dev_rating/application/views/support/index.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% extends 'base' %} - -- GitLab