From 44cee5d14948b0586eaf772ca64675ceec6ea69f Mon Sep 17 00:00:00 2001
From: pimka <pimka@ro.ru>
Date: Tue, 5 Aug 2014 14:52:08 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=BD=D1=84=D0=BE=20=D0=BE=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/student/subject.twig | 12 ++++++++----
 media/css/modules.css                  | 27 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/application/views/student/subject.twig b/application/views/student/subject.twig
index ece1a1c3f..1c9954a21 100644
--- a/application/views/student/subject.twig
+++ b/application/views/student/subject.twig
@@ -23,13 +23,17 @@
 {% import 'student/subject' as mod %}
 {% block title %}{{ Subject.Title|default('Предмет')  }}{% endblock %}
 {% block main_top_title %} {{ Subject.Title|default('Предмет')  }} {% endblock %}
+
 {% block main_content %}
+
 <div class='main_teachers'>
-    <b>Преподаватели:</b> {{ Subject.Teachers }}<br>
-    <b>Форма промежуточной аттестации:</b> {{ Subject.Control }}<br>
-    <b>Всего {{ Subject.LectureHours + Subject.SeminarHours }} ч.</b>, в том числе 
-    <b>{{ Subject.LectureHours }} ч.</b> лекций и <b>{{ Subject.SeminarHours }} ч.</b> практики
+    <div class="main_teachers_content">
+        <div class="teachers_part_color"><div class="teachers_tittle">Преподаватели:</div> <div class="teachers_info">{{ Subject.Teachers }}</div> </div>
+        <div class="teachers_part_color"><div class="teachers_tittle">Форма промежуточной аттестации:</div>  <div class="teachers_info">{{ Subject.Control }} </div></div>
+        <div class="teachers_part_color"><div class="teachers_tittle">Часов: </div>  <div class="teachers_info"> {{ Subject.LectureHours + Subject.SeminarHours }} (</div><div class="teachers_tittle"> Лекций:</div> <div class="teachers_info">{{ Subject.LectureHours }}</div> <div class="teachers_tittle"> Практики:</div> <div class="teachers_info">{{ Subject.SeminarHours }})</div> </div>
+    </div>
 </div>
+
 <div class="main_modules">
 	{% for i in range(1, discipline.ModulesCount) %}
             <table border="0" cellspacing="0" class="module_table">
diff --git a/media/css/modules.css b/media/css/modules.css
index 00e488a08..d43f8508a 100644
--- a/media/css/modules.css
+++ b/media/css/modules.css
@@ -1,8 +1,35 @@
+
+.main_teachers_content {
+	margin-top: 20px;
+	text-align: center;
+	/*background-color: #f1f1f1; */
+}
+
+.teachers_part_color {
+	padding-left: 5px;
+	padding-right: 5px;
+	background-color: #f1f1f1;
+	display: inline-block;
+}
+
+.teachers_tittle {
+	display: inline-block;
+	font: 10pt sans-serif;
+	color: #2bbd1a;	
+}
+
+.teachers_info {
+	display: inline-block;
+	font: 9pt sans-serif;
+	color: #757575;	
+}
+
 .main_modules { 
 	padding-left: 20px;
 	padding-right: 20px;
 }  
 
+
 .module_table {
 	margin-top: 20px;
     margin-left:auto; 
-- 
GitLab