From 7f145ceaa475a38c61f26533d0fbfce175865b17 Mon Sep 17 00:00:00 2001
From: Andrew Rudenets <andrey.rudenets@gmail.com>
Date: Sat, 11 Jul 2015 15:00:41 +0300
Subject: [PATCH] Added default styles for search results

---
 media/less/common/forms.less                  |  6 ++++
 media/less/controls/search.less               | 29 +++++++++++++++++++
 .../views/controls/searchTeacher.twig         |  2 +-
 .../views/office/students/search.twig         |  8 ++---
 .../views/office/teachers/search.twig         | 13 +++++----
 5 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/media/less/common/forms.less b/media/less/common/forms.less
index fc0cedd9a..5497ffc28 100644
--- a/media/less/common/forms.less
+++ b/media/less/common/forms.less
@@ -22,6 +22,12 @@
     &.P2Width {
         width: 18.5% !important;
     }
+    &.Width65 {
+        width: 65% !important;
+    }
+    &.Width35 {
+        width: 33.5% !important;
+    }
     &.marginBetween {
         margin-bottom: 5px;
         //&:last-child {  margin-bottom: 0;  }
diff --git a/media/less/controls/search.less b/media/less/controls/search.less
index dac763a5c..eb1ac2a6d 100644
--- a/media/less/controls/search.less
+++ b/media/less/controls/search.less
@@ -18,3 +18,32 @@
 #resultPrototype {
     display: none;
 }
+
+.ResultRow {
+    .FirstLine {
+        font-size: 1.1em;
+        font-weight: 600;
+    }
+
+    .SecondLine {
+        font-size: 0.8em;
+        width: 90%;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+    .ActionBar {
+        text-align: right;
+        display: block;
+        vertical-align: middle;
+        &.Padding
+        {
+            padding: 8px 0;
+        }
+    }
+    background: #EDF1F5;
+    overflow: hidden;
+    margin: 10px 0;
+    padding: 7px 10px;
+    box-shadow: 2px 2px 2px #DDE8F0;
+}
diff --git a/~dev_rating/application/views/controls/searchTeacher.twig b/~dev_rating/application/views/controls/searchTeacher.twig
index b565f25d1..aa25110ce 100644
--- a/~dev_rating/application/views/controls/searchTeacher.twig
+++ b/~dev_rating/application/views/controls/searchTeacher.twig
@@ -38,7 +38,7 @@
                 <select class="SelectDepartment defaultForm {{ Faculties|length ? "HalfWidth" : "FullWidth" }} FRight" {{ Departments|length ?: "disabled" }}>
                     <option value="0">-- Фильтр по кафедре --</option>
                     {% for Dep in Departments %}
-                        <option value="{{ Dep.ID }}">{{ Dep.Name|default('Служебная кафедра') }}</option>
+                        <option value="{{ Dep.ID }}">{{ Dep.Name|default('Без кафедры') }}</option>
                     {% endfor %}
                 </select>
             </div>
diff --git a/~dev_rating/application/views/office/students/search.twig b/~dev_rating/application/views/office/students/search.twig
index f103403a1..797e0bbf2 100644
--- a/~dev_rating/application/views/office/students/search.twig
+++ b/~dev_rating/application/views/office/students/search.twig
@@ -12,19 +12,19 @@
 {% block _ResultPrototype %}
     <div class="goodClearFix">
         <div class="defaultForm FLeft">
-            <div class="StudentName">
-                <a href="{{ URL.site('office/students/profile/[# ID #]') }}">
+            <div class="FirstLine">
+                <a href="{{ URL.site('office/students/[# ID #]') }}">
                     [# LastName #] [# FirstName #] [# SecondName #]
                 </a>
             </div>
+            <div class="SecondLine">[# GradeNum #] РєСѓСЂСЃ, [# GroupNum #] РіСЂСѓРїРїР°</div>
         </div>
         <div class="defaultForm FRight">
-            <div class="StudentGroup">[# GradeNum #].[# GroupNum #]</div>
+            <div class="ActionBar Padding">&nbsp;</div>
         </div>
     </div>
 {% endblock %}
 
-
 {% block main_top_title %}Студенты{% endblock %}
 
 {% block office_content %}
diff --git a/~dev_rating/application/views/office/teachers/search.twig b/~dev_rating/application/views/office/teachers/search.twig
index 5003a6c72..01dad6f88 100644
--- a/~dev_rating/application/views/office/teachers/search.twig
+++ b/~dev_rating/application/views/office/teachers/search.twig
@@ -12,19 +12,20 @@
 
 {% block _ResultPrototype %}
     <div class="goodClearFix">
-        <div class="defaultForm FLeft">
-            <div class="StudentName">
-                <a href="{{ URL.site('office/teachers/profile/[# ID #]') }}">
+        <div class="defaultForm FLeft Width65">
+            <div class="FirstLine">
+                <a href="{{ URL.site('office/teachers/[# ID #]') }}">
                     [# LastName #] [# FirstName #] [# SecondName #]
                 </a>
             </div>
+            <div class="SecondLine">[# DepName #]</div>
         </div>
-        <div class="defaultForm FRight">
-            <div class="StudentGroup">[# DepName #]</div>
+        <div class="defaultForm FRight Width35">
+            <div class="ActionBar Padding">&nbsp;</div>
         </div>
     </div>
 {% endblock %}
 
 {% block office_content %}
-    {{ search.control(block('_ResultPrototype'), []) }}
+    {{ search.control(block('_ResultPrototype'), Faculties, Departments) }}
 {% endblock %}
-- 
GitLab