diff --git a/~dev_rating/application/bootstrap.php b/~dev_rating/application/bootstrap.php index 6b3e6cb50c539c8568831a696e425e90cd7dd65e..3b73cea004efa439ed8084817d60a646ab4877a3 100644 --- a/~dev_rating/application/bootstrap.php +++ b/~dev_rating/application/bootstrap.php @@ -298,7 +298,7 @@ Route::set('teacher:profile', 'teacher/profile(/<action>(/<id>))', array('action )); /* --------------- Администрирование ---------------- */ -Route::set('admin:common', 'admin(/<controller>/(<action>(/<param1>(:<param2>))))') +Route::set('admin:common', 'admin(/<controller>(/<action>(/<param1>(:<param2>))))') ->defaults(array( 'directory' => 'admin', 'controller' => 'index', diff --git a/~dev_rating/application/classes/Controller/Admin/Accounts.php b/~dev_rating/application/classes/Controller/Admin/Accounts.php index 82c61bac856b03b32f8ec9e12a5a728981625aa0..90d6dcc7d02824b37980cf12970bee1d882465d0 100644 --- a/~dev_rating/application/classes/Controller/Admin/Accounts.php +++ b/~dev_rating/application/classes/Controller/Admin/Accounts.php @@ -1,10 +1,10 @@ <?php defined('SYSPATH') or die('No direct script access.'); -class Controller_Admin_Index extends Controller_UserEnvi { +class Controller_Admin_Accounts extends Controller_UserEnvi { public function action_index() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/accounts/index'); $twig->User = $this->UserInfo; $this->response->body($twig); @@ -12,7 +12,7 @@ class Controller_Admin_Index extends Controller_UserEnvi { public function action_activationCodes() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/accounts/codes'); $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/Departaments.php b/~dev_rating/application/classes/Controller/Admin/Departaments.php index 77f3eacedd678e9335b57c52d6c0e7fb4bccd4fd..98d40efa7094073dda02ef7a90b657b564c6ad59 100644 --- a/~dev_rating/application/classes/Controller/Admin/Departaments.php +++ b/~dev_rating/application/classes/Controller/Admin/Departaments.php @@ -1,10 +1,10 @@ <?php defined('SYSPATH') or die('No direct script access.'); -class Controller_Admin_Index extends Controller_UserEnvi { +class Controller_Admin_Departaments extends Controller_UserEnvi { public function action_index() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/departaments/index'); $twig->User = $this->UserInfo; $this->response->body($twig); @@ -12,7 +12,7 @@ class Controller_Admin_Index extends Controller_UserEnvi { public function action_upload() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/departaments/upload'); $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/Disciplines.php b/~dev_rating/application/classes/Controller/Admin/Disciplines.php index 737552bfba606634ccd0ef3a941590ee6e6e414f..388e85a4d978501d6a224f545fe2b68b2114f064 100644 --- a/~dev_rating/application/classes/Controller/Admin/Disciplines.php +++ b/~dev_rating/application/classes/Controller/Admin/Disciplines.php @@ -1,10 +1,10 @@ <?php defined('SYSPATH') or die('No direct script access.'); -class Controller_Admin_Index extends Controller_UserEnvi { +class Controller_Admin_Disciplines extends Controller_UserEnvi { public function action_index() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/disciplines/index'); $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/Students.php b/~dev_rating/application/classes/Controller/Admin/Students.php index f1d4c364fa85bb5cf593b5cb676cdd28c0e3b892..8da9f568ce0eedf920291a03fd95b4dc93a08637 100644 --- a/~dev_rating/application/classes/Controller/Admin/Students.php +++ b/~dev_rating/application/classes/Controller/Admin/Students.php @@ -1,10 +1,10 @@ <?php defined('SYSPATH') or die('No direct script access.'); -class Controller_Admin_Index extends Controller_UserEnvi { +class Controller_Admin_Students extends Controller_UserEnvi { public function action_index() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/students/index'); $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/StudyGroups.php b/~dev_rating/application/classes/Controller/Admin/StudyGroups.php index 737552bfba606634ccd0ef3a941590ee6e6e414f..abbc11ef0917fd15ccf0f5423da93279a0ddab1d 100644 --- a/~dev_rating/application/classes/Controller/Admin/StudyGroups.php +++ b/~dev_rating/application/classes/Controller/Admin/StudyGroups.php @@ -1,10 +1,10 @@ <?php defined('SYSPATH') or die('No direct script access.'); -class Controller_Admin_Index extends Controller_UserEnvi { +class Controller_Admin_StudyGroups extends Controller_UserEnvi { public function action_index() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/studyGroups/index'); $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/Teachers.php b/~dev_rating/application/classes/Controller/Admin/Teachers.php index 9a092d652e96b4286fbafa83f4ba0f6ade94737d..391e1b61604ad9bc9f09ee7f3f32fd17f94c844e 100644 --- a/~dev_rating/application/classes/Controller/Admin/Teachers.php +++ b/~dev_rating/application/classes/Controller/Admin/Teachers.php @@ -1,10 +1,10 @@ <?php defined('SYSPATH') or die('No direct script access.'); -class Controller_Admin_Index extends Controller_UserEnvi { +class Controller_Admin_Teachers extends Controller_UserEnvi { public function action_index() { - $twig = Twig::factory('admin/index'); + $twig = Twig::factory('admin/teachers/index'); $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/views/admin/base.twig b/~dev_rating/application/views/admin/base.twig index 9e0e533724d9e5e8b94dfe865f0221cb29ef02d6..cb1a6ca2fa6b9a796d51e487dd50eb6da958533e 100644 --- a/~dev_rating/application/views/admin/base.twig +++ b/~dev_rating/application/views/admin/base.twig @@ -45,7 +45,7 @@ Панель администратора </div> <div class="top_user"> - {{ User.FirstName }} {{ User.LastName }} + {{ User.First }} {{ User.Last }} | {{ HTML.anchor('admin/logout', 'Выход РёР· панели администратора', {'title': 'Вернуться РЅР° сайт'})|raw }} </div> </div> @@ -61,17 +61,12 @@ </div> <div class="main"> <div class="main_top"> - <div class="main_top_tittle">{% block main_top_title %}Управление преподавателями{% endblock %}</div> + <div class="main_top_tittle">{% block main_top_title %}{% endblock %}</div> </div> <div class="main_content"> {% block main_content %} - <b>РўСѓС‚ форма РїРѕРёСЃРєР° преподавателей РїРѕ Р¤РРћ Рё/или факультету Рё/или кафедре РЅР° JS</b> - {{ admin.action('#', 'Загрузить СЃРїРёСЃРѕРє преподавателей', - 'Загрузить РІ систему '~System.Title~' СЃРїРёСЃРѕРє преподавателей РёР· заранее подготовленных csv-файлов. '~ - 'Для каждого преподавателя, загруженного данной утилитой, будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} - {{ admin.action('#', 'Добавить РЅРѕРІРѕРіРѕ преподавателя', 'Добавить РІ систему '~System.Title~' РЅРѕРІРѕРіРѕ преподавателя. '~ - 'Для него будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} + {% endblock %} </div> </div> diff --git a/~dev_rating/application/views/admin/students/index.twig b/~dev_rating/application/views/admin/students/index.twig index aa3d5f102316dc80c9fc5250352cdbeb5ba95b51..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/~dev_rating/application/views/admin/students/index.twig +++ b/~dev_rating/application/views/admin/students/index.twig @@ -1 +0,0 @@ -{# empty Twig template #} diff --git a/~dev_rating/application/views/admin/teachers/index.twig b/~dev_rating/application/views/admin/teachers/index.twig index aa3d5f102316dc80c9fc5250352cdbeb5ba95b51..2da6be9107021fbf35150df2753f963d939dc989 100644 --- a/~dev_rating/application/views/admin/teachers/index.twig +++ b/~dev_rating/application/views/admin/teachers/index.twig @@ -1 +1,47 @@ -{# empty Twig template #} +{% extends "admin/base" %} + +{% block main_top_title %}Управление преподавателями{% endblock %} + +{% block main_content %} + + <div class='search'> + <div class='search_box'> + <div class='search_inputs'> + <div class='search_mainInput'> + <input type='text' placeholder="РџРѕРёСЃРє РїРѕ фамилии, имени, отчеству"> + </div> + <div class='search_inputFilters'> + <div class='filter'> + <select> + <option>--- Подразделение ЮФУ ---</option> + <option>Рнститут математики, механики Рё компьютерных наук ЮФУ</option> + <option>Юридический факультет</option> + </select> + </div> + + <div class='filter'> + <select> + <option>--- Кафедра ---</option> + <option>Кафедра математического анализа</option> + <option>Кафедра теории упругости</option> + </select> + </div> + </div> + </div> + </div> + <div class='search_results'> + <div class='search_results_title'> + + </div> + <div class='paginator'> + + </div> + </div> + </div> + + {{ admin.action('#', 'Загрузить СЃРїРёСЃРѕРє преподавателей', + 'Загрузить РІ систему '~System.Title~' СЃРїРёСЃРѕРє преподавателей РёР· заранее подготовленных csv-файлов. '~ + 'Для каждого преподавателя, загруженного данной утилитой, будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} + {{ admin.action('#', 'Добавить РЅРѕРІРѕРіРѕ преподавателя', 'Добавить РІ систему '~System.Title~' РЅРѕРІРѕРіРѕ преподавателя. '~ + 'Для него будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} +{% endblock %} \ No newline at end of file diff --git a/~dev_rating/media/css/admin/base.css b/~dev_rating/media/css/admin/base.css index 2118bdd40220979281a0595704b977a04c4c435e..976f60603ad6f8b3934ab90ca940d04e2842370e 100644 --- a/~dev_rating/media/css/admin/base.css +++ b/~dev_rating/media/css/admin/base.css @@ -180,20 +180,46 @@ a:hover { .main_content { - width: 100%; - padding-top: 25px; - padding-bottom: 20px; - margin: 15px; + width: 98%; + margin: 25px auto; font-size: 10pt; } +/* ------------------------------------SEARCH----------------------------------------*/ + +.search .search_box +{ + background-color: #eee; + margin: 10px auto; + padding: 5px; +} +.search .search_box .search_mainInput input +{ + width: 100%; + padding: 4px; +} + +.search .search_box .search_mainInput +{ + margin-bottom: 5px; +} + +.search .search_box .search_inputFilters .filter +{ + display: inline-block; +} + +.search .search_box .search_inputFilters .filter select +{ + padding: 5px; + width: 200px; +} /*-------------------------------------ACTION-----------------------------------------*/ .action { - width: 95%; background-color: #ffffff; border: 1px solid #f2f2f2; border-left: 0;