From 7fcbbef684eeb585966d59a9b1326dfc8e172a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A0=D1=83=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=86?= <andrey.rudenets@gmail.com>
Date: Sat, 23 Aug 2014 21:26:08 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D0=BD=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0=20-=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=D0=BC=D0=B8:=20vol.?=
 =?UTF-8?q?=201/3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ~dev_rating/application/bootstrap.php         |  2 +-
 .../classes/Controller/Admin/Accounts.php     |  6 +--
 .../classes/Controller/Admin/Departaments.php |  6 +--
 .../classes/Controller/Admin/Disciplines.php  |  4 +-
 .../classes/Controller/Admin/Students.php     |  4 +-
 .../classes/Controller/Admin/StudyGroups.php  |  4 +-
 .../classes/Controller/Admin/Teachers.php     |  4 +-
 ~dev_rating/application/views/admin/base.twig | 11 ++---
 .../views/admin/students/index.twig           |  1 -
 .../views/admin/teachers/index.twig           | 48 ++++++++++++++++++-
 ~dev_rating/media/css/admin/base.css          | 36 ++++++++++++--
 11 files changed, 96 insertions(+), 30 deletions(-)

diff --git a/~dev_rating/application/bootstrap.php b/~dev_rating/application/bootstrap.php
index 6b3e6cb50..3b73cea00 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 82c61bac8..90d6dcc7d 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 77f3eaced..98d40efa7 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 737552bfb..388e85a4d 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 f1d4c364f..8da9f568c 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 737552bfb..abbc11ef0 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 9a092d652..391e1b616 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 9e0e53372..cb1a6ca2f 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 aa3d5f102..e69de29bb 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 aa3d5f102..2da6be910 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 2118bdd40..976f60603 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;
-- 
GitLab