From f029a657f60d7ba8240694f4835789df78ef6652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A8=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <solidovic@gmail.com>
Date: Sat, 30 Aug 2014 17:05:02 +0400
Subject: [PATCH] 123

---
 .../application/views/teacher/map/EditGroups.twig      |  1 -
 .../application/views/teacher/map/EditStudents.twig    |  2 +-
 ~dev_rating/media/css/base.css                         |  4 ++--
 ~dev_rating/media/css/construct.css                    |  9 ++++++++-
 ~dev_rating/media/js/construct/edit.js                 | 10 +++++++---
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/~dev_rating/application/views/teacher/map/EditGroups.twig b/~dev_rating/application/views/teacher/map/EditGroups.twig
index eaecda42b..f900191e5 100644
--- a/~dev_rating/application/views/teacher/map/EditGroups.twig
+++ b/~dev_rating/application/views/teacher/map/EditGroups.twig
@@ -5,7 +5,6 @@
 {% block step_4 %}active{% endblock %}
 
 {% block map_content %}
-	<p class="notification">Обратите внимание, если вам нужно прикрепить 1-ого или максимум 4-х студентов из группы, то удобней это сделать на странице 'Прикрепление студентов'</p>
 	<div class="ChangeStudyGroupDIV">	
 		<select class="SelectStudyGroup default_select">
 			<option value="0">Выберите группу:</option>
diff --git a/~dev_rating/application/views/teacher/map/EditStudents.twig b/~dev_rating/application/views/teacher/map/EditStudents.twig
index 950e4c7e8..15c5cd7b6 100644
--- a/~dev_rating/application/views/teacher/map/EditStudents.twig
+++ b/~dev_rating/application/views/teacher/map/EditStudents.twig
@@ -17,7 +17,7 @@
 				{% endif %}
 				<div class="GradeAndGroupTitle" id="{{ Student.Grade }}_{{ Student.GroupNum }}">
 					<span class="info">Курс {{ Student.Grade }}, Группа {{ Student.GroupNum }}</span>
-					<span class="ActionShowHideGroupContainer">Открыть список студентов</span>
+					<span class="ActionShowHideGroupContainer">Открыть список ▼</span>
 				</div>
 				<div class="GroupContainer">
 					{% set NowGroupNum = Student.GroupNum %}
diff --git a/~dev_rating/media/css/base.css b/~dev_rating/media/css/base.css
index 33491461c..51f4ddbfe 100644
--- a/~dev_rating/media/css/base.css
+++ b/~dev_rating/media/css/base.css
@@ -201,8 +201,8 @@ p.notification{
 	font-size: 16px;
 }
 h2.BlueTitle{
-	font-size: 18px;
-	font-weight: normal;
+	font-size: 15px;
+	font-weight: bold;
 	color: #3399CC;
 }
 
diff --git a/~dev_rating/media/css/construct.css b/~dev_rating/media/css/construct.css
index 828537250..511e2dca7 100644
--- a/~dev_rating/media/css/construct.css
+++ b/~dev_rating/media/css/construct.css
@@ -234,13 +234,20 @@
 /* Прикрипление студентов */
 .StudentsList {}
 	.StudentsList .GradeAndGroupTitle {
+		background: #f1f1f1;
+		padding: 5px 10px;
 		margin-top: 20px;
 		font-weight: bold;
 		font-size: 15px;
 		color: #333;
 	}
+		.GradeAndGroupTitle .ActionShowHideGroupContainer{
+			margin-left: 40px;
+			font-size: 13px;
+			cursor: pointer
+		}
 	.StudentsList .GroupContainer {
-		
+		display: none;
 	}
 	.StudentsList .Student {
 		margin: 10px 0;
diff --git a/~dev_rating/media/js/construct/edit.js b/~dev_rating/media/js/construct/edit.js
index 1357ddf72..425a78c58 100644
--- a/~dev_rating/media/js/construct/edit.js
+++ b/~dev_rating/media/js/construct/edit.js
@@ -663,10 +663,14 @@ $('.StudentsList').on('click', '.Action_UnbindStudent', function(){
 });
 
 $('.StudentsList').on('click', '.ActionShowHideGroupContainer', function(){
-	if ($(this).parent().next('.GroupContainer').attr('class') == 'block')
-		$(this).parent().next('.GroupContainer').hide();
-	if ($(this).parent().next('.GroupContainer').attr('class') == 'none')
+	if ($(this).parent().next('.GroupContainer').css('display') == 'none') {
+		$(this).text('Скрыть список ▲');
 		$(this).parent().next('.GroupContainer').show();
+	}
+	else {
+		$(this).text('Открыть список ▼');
+		$(this).parent().next('.GroupContainer').hide();
+	}
 });
 
 // Добавить преподавателя
-- 
GitLab