From c5ed323a98d59502105eb0b8002835bc0cd5f1f8 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: Sun, 24 Aug 2014 21:58:03 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B9,=20vol.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/teachers/handler/listOutput.twig     |  6 ++++--
 .../views/admin/teachers/index.twig            | 12 +++---------
 ~dev_rating/media/css/admin/base.css           |  2 +-
 ~dev_rating/media/js/admin/teachers/index.js   | 18 +++++++++++++-----
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/~dev_rating/application/views/admin/teachers/handler/listOutput.twig b/~dev_rating/application/views/admin/teachers/handler/listOutput.twig
index fd0f50713..03414238c 100644
--- a/~dev_rating/application/views/admin/teachers/handler/listOutput.twig
+++ b/~dev_rating/application/views/admin/teachers/handler/listOutput.twig
@@ -10,13 +10,15 @@
     {% endif %}
     <div class="search_item">
         <div class="search_item_info">
-            <div class="search_item_firstLine">{{ row.LastName }} {{ row.FirstName }} {{ row.SecondName }}</div>
+            <div class="search_item_firstLine"><a href="#">{{ row.LastName }} {{ row.FirstName }} {{ row.SecondName }}</a></div>
             <div class="search_item_secondLine">{{ row.JobPositionName }}, {{ row.DepartmentName }}</div>
         </div>
         <div class="search_item_actions">
-            <a href="#">Удалить</a>
+            <a href="#">Редактировать</a>
         </div>
     </div>
+{% else %}
+    Нет результатов!
 {% endfor %}
 </div>
 
diff --git a/~dev_rating/application/views/admin/teachers/index.twig b/~dev_rating/application/views/admin/teachers/index.twig
index ae458dd58..5fef921bf 100644
--- a/~dev_rating/application/views/admin/teachers/index.twig
+++ b/~dev_rating/application/views/admin/teachers/index.twig
@@ -4,6 +4,7 @@
 {{ HTML.script('media/js/admin/teachers/index.js')|raw }}
 {% endblock %}
 
+{% block title %}Преподаватели{% endblock %}
 {% block main_top_title %}Управление преподавателями{% endblock %}
 
 {% block main_content %}
@@ -33,17 +34,10 @@
             </div>            
         </div>
         <div class='search_results'>
-            <div class='search_results_title'>
+            <div class='search_results_title' id="search_title">
                 
             </div>
-            <div class='results' id='results'>
-                <div class='item'>
-                    <div class='item_title'></div>
-                    <div class='item_actions'></div>
-                </div>
-            </div>
-            <div class='paginator'>
-                
+            <div class='results' id='search_results'>
             </div>
         </div>
     </div>
diff --git a/~dev_rating/media/css/admin/base.css b/~dev_rating/media/css/admin/base.css
index 26cb40eab..d4a026169 100644
--- a/~dev_rating/media/css/admin/base.css
+++ b/~dev_rating/media/css/admin/base.css
@@ -251,7 +251,7 @@ a:hover {
     background: #fff;
 }
 
-.search_item .search_item_firstLine
+.search_item .search_item_firstLine a
 {
     font-size: 18px;
 }
diff --git a/~dev_rating/media/js/admin/teachers/index.js b/~dev_rating/media/js/admin/teachers/index.js
index 390fbfe22..1de918011 100644
--- a/~dev_rating/media/js/admin/teachers/index.js
+++ b/~dev_rating/media/js/admin/teachers/index.js
@@ -1,29 +1,37 @@
 $(function()
 {
+    $("#facultySelect [value='0']").attr('selected', 'selected');
+    $('#departmentSelect').attr('disabled', 'disabled');
+    $("#departmentSelect [value='0']").attr('selected', 'selected');
     // Выбор факультета
     $('#facultySelect').change(function(){
         if (($('#facultySelect option:selected').val()!= '0')) {
 
+                $("#search_results").html('');
                 $("#departmentSelect").html('<option value="0">--- Кафедра ---</option>');
-
+                $('#departmentSelect').attr('disabled', 'disabled');
                 $.post('/~dev_rating/handler/admTeachers/getTeachersList', {'facultyID': $('#facultySelect option:selected').val(), 'departmentID': '0'}, function(data){
-                    $("#results").html(data);
+                    $("#search_results").html(data);
                 });
-
                 $.post('/~dev_rating/handler/admTeachers/getDepartmentsList', {'facultyID': $('#facultySelect option:selected').val()}, function(data){
                     $.each(data, function(i){
                         $("#departmentSelect").append('<option value="'+data[i].ID+'">'+data[i].Name+'</option>');
                     });
+                    $("#departmentSelect").removeAttr("disabled");
                 }, "json");
-
+        }
+        else
+        {
+                $('#departmentSelect').attr('disabled', 'disabled');
         }
     });
 
     // Выбор кафедры
     $('#departmentSelect').change(function(){
+        $("#search_results").html('');
         if (($('#departmentSelect option:selected').val()!= '0')) {
                 $.post('/~dev_rating/handler/admTeachers/getTeachersList', {'facultyID': '0', 'departmentID': $('#departmentSelect option:selected').val()}, function(data){
-                        $("#results").html(data);
+                        $("#search_results").html(data);
                 });
         }
     });
-- 
GitLab