diff --git a/media/less/common.less b/media/less/common.less
index 375d31d1537e1c240951e595054b935c47e21465..cd67fba5a72acfbac751db9cb8b35fd31db41268 100644
--- a/media/less/common.less
+++ b/media/less/common.less
@@ -155,7 +155,9 @@ input[type="checkbox"] {
}
}
-.goodClearFix:after {
+// DEPRECATED: .goodClearFix
+
+.goodClearFix:after, .ClearFix:after {
content: '.';
display: block;
height: 0;
@@ -163,12 +165,18 @@ input[type="checkbox"] {
visibility: hidden;
}
-* html .goodClearFix {
+* html .goodClearFix, * html .ClearFix {
height: 1%;
}
-.goodClearFix {
+.goodClearFix, .ClearFix {
display: block;
+ & .FLeft, & .FloatLeft {
+ float: left;
+ }
+ & .FRight, & .FloatRight {
+ float: right;
+ }
}
.Warning {
@@ -183,6 +191,24 @@ input[type="checkbox"] {
border-radius: 0 0 0 5px;
}
+.Margin5
+{
+ &.Top { margin-top: 5px; }
+ &.Left { margin-left: 5px; }
+ &.Right { margin-right: 5px; }
+ &.Bottom { margin-bottom: 5px; }
+ &.All { margin: 5px; }
+}
+
+.Margin10
+{
+ &.Top { margin-top: 10px; }
+ &.Left { margin-left: 10px; }
+ &.Right { margin-right: 10px; }
+ &.Bottom { margin-bottom: 10px; }
+ &.All { margin: 10px; }
+}
+
// ---------------------------------------------------------------------------------------------------------------------
// Header
// ---------------------------------------------------------------------------------------------------------------------
diff --git a/media/less/common/forms.less b/media/less/common/forms.less
index 2bb7d6636bf2f84bff8bf537a93166b0ef27c4bf..05534fd93922941c4f6dc97aba8aa54eff390a4d 100644
--- a/media/less/common/forms.less
+++ b/media/less/common/forms.less
@@ -5,7 +5,7 @@
width: 100%;
}
&.HalfWidth {
- width: 50%;
+ width: 50% !important;
&.left {
margin-left: -5px;
}
@@ -14,13 +14,7 @@
}
}
select&.HalfWidth {
- width: 49%;
- }
- &.FLeft {
- float: left;
- }
- &.FRight {
- float: right;
+ width: 49% !important;
}
&.P1Width {
width: 80% !important;
@@ -39,7 +33,7 @@
//&:last-child { margin-bottom: 0; }
}
select& {
- padding: 7px;
+ padding: 6px;
font-size: 0.85em;
border-radius: 2px;
border: 1px solid @ColorGrey;
@@ -94,7 +88,7 @@ input[type=button].defaultForm, button.defaultForm, input[type=submit].defaultFo
select.defaultForm
{
- padding: 7px;
+ padding: 6px;
font-size: 0.85em;
border-radius: 2px;
border: 1px solid @ColorGrey;
diff --git a/media/less/common/tabs.less b/media/less/common/tabs.less
index 043d40362bfaf762e0f13445bc1a0a5ac2fee047..bda83fce158b01eb56ce8418372e86eb369fe173 100644
--- a/media/less/common/tabs.less
+++ b/media/less/common/tabs.less
@@ -2,7 +2,7 @@
.tabsWrapper {
margin: 5px auto;
- width: 100%;
+ width: 95%;
.tabs {
display: table;
diff --git a/~dev_rating/application/classes/Controller/Office/Disciplines.php b/~dev_rating/application/classes/Controller/Office/Disciplines.php
index 9f9e87fda1e0bfca397724d649a8a51e9b134e06..6d44088e5e23c15fe1f0ea0f6f97da2bcc84bc41 100644
--- a/~dev_rating/application/classes/Controller/Office/Disciplines.php
+++ b/~dev_rating/application/classes/Controller/Office/Disciplines.php
@@ -2,5 +2,17 @@
class Controller_Office_Disciplines extends Controller_Environment_Office
{
-// public function action_index() {}
+
+ public function action_index()
+ {
+ $this->twig->set_filename(self::OFFICE . 'disciplines');
+ }
+
+ public function action_regular() {
+ $this->twig->set_filename(self::OFFICE . 'disciplines');
+ }
+
+ public function action_compound() {
+ $this->twig->set_filename(self::OFFICE . 'disciplines');
+ }
}
diff --git a/~dev_rating/application/views/office/disciplines.twig b/~dev_rating/application/views/office/disciplines.twig
new file mode 100644
index 0000000000000000000000000000000000000000..eee03acd0279a42bc39a8b234dce15086cc7f055
--- /dev/null
+++ b/~dev_rating/application/views/office/disciplines.twig
@@ -0,0 +1,12 @@
+{% extends "office/base" %}
+
+{% block main_top_title %}Дисциплины{% endblock %}
+
+{% block office_tabs %}
+ <div class="tabsWrapper noTopMargin">
+ <div class="tabs">
+ <div class="tab">{{ HTML.anchor('office/disciplines/regular', 'Дисциплины')|raw }}</div>
+ <div class="tab">{{ HTML.anchor('office/disciplines/compound', 'Составные дисциплины')|raw }}</div>
+ </div>
+ </div>
+{% endblock %}
\ No newline at end of file
diff --git a/~dev_rating/application/views/office/subjects/upload.twig b/~dev_rating/application/views/office/subjects/upload.twig
index 6fadeba3548361bbd318f5fb662e5b8d932959ea..5b0f78b4711bade8cfc7b224c28a5aad25fc7251 100644
--- a/~dev_rating/application/views/office/subjects/upload.twig
+++ b/~dev_rating/application/views/office/subjects/upload.twig
@@ -6,7 +6,22 @@
{% block office_content %}
- <h2 class="defaultForm marginBetween">Пакетная загрузка предметов</h2>
+ <h2 class="Margin10 Bottom">Добавление предмета</h2>
+
+ <div class="ClearFix Margin10 Bottom">
+ <div class="defaultForm P1Width FLeft ClearFix">
+ <input type="text" id="SubjectName" placeholder="Введите название предмета" class="defaultForm HalfWidth FLeft">
+ <select id="facultySelect" name="facultyID" class="defaultForm HalfWidth FRight">
+ <option value="0" selected="selected">— Выберите подразделение ЮФУ —</option>
+ {% for row in Faculties %}
+ <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
+ {% endfor %}
+ </select>
+ </div>
+ <button class="defaultForm noMargin GreenButton P2Width FRight">Добавить</button>
+ </div>
+
+ <h2 class="Margin5 Bottom">Пакетная загрузка предметов</h2>
{% if UploadingResult is not empty %}
<p>Обработано: {{ UploadingResult.RecordsCount }}, в том числе с ошибками: {{ UploadingResult.ErrorsCount }},
@@ -28,16 +43,16 @@
<p><pre>Название;Аббревиатура</pre></p>
<form enctype="multipart/form-data" action="" method="POST">
<div class="goodClearFix defaultForm marginBetween">
- <select id="facultySelect" name="facultyID" class="defaultForm">
+ <select name="facultyID" class="defaultForm">
<option value="0" selected="selected">— Выберите подразделение ЮФУ —</option>
{% for row in Faculties %}
<option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
{% endfor %}
</select>
</div>
- <div class="goodClearFix">
- <div class="defaultForm FLeft"><input name="students" class="defaultForm FullWidth" type="file"></div>
- <div class="defaultForm FRight"><input type="submit" class="defaultForm GreenButton P2Width noMargin" value="Загрузить"></div>
+ <div class="ClearFix">
+ <input name="students" class="defaultForm FullWidth P1Width FLeft" type="file">
+ <input type="submit" class="defaultForm GreenButton P2Width noMargin FRight" value="Загрузить">
</div>
</form>
{% endblock %}
diff --git a/~dev_rating/application/views/teacher/discipline/MapBase.twig b/~dev_rating/application/views/teacher/discipline/MapBase.twig
index 2178843ab94303b2d64db46862129de649b81d1b..4f0c357267555e7e8a0228334077891f9b7b1d3f 100644
--- a/~dev_rating/application/views/teacher/discipline/MapBase.twig
+++ b/~dev_rating/application/views/teacher/discipline/MapBase.twig
@@ -24,7 +24,7 @@
{% block main_content %}
{% if Discipline.IsLocked == 1 %}
<p class="Warning">
- Был добавлен первый балл. Редактирование <u>базовых настроек</u>, <u>модулей</u> и <u>групп</u> невозможно.
+ Был добавлен балл. Редактирование <u>базовых настроек</u>, <u>модулей</u> и <u>групп</u> невозможно.
</p>
{% endif %}
<div class="tabsWrapper">
diff --git a/~dev_rating/application/views/teacher/discipline/edit/groups.twig b/~dev_rating/application/views/teacher/discipline/edit/groups.twig
index 65932916810e65142b1cf28e0d97dd795637fd61..1cbe1e102ff7de4d5e655a54b91d076efa13b53a 100644
--- a/~dev_rating/application/views/teacher/discipline/edit/groups.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/groups.twig
@@ -8,14 +8,16 @@
{% endblock %}
{% block map_content %}
- <div class="ChangeStudyGroupDIV">
+ <div class="ChangeStudyGroupDIV goodClearFix">
<select class="SelectStudyGroup defaultForm P1Width">
<option value="0">Выберите группу:</option>
{% for Group in Groups %}
<option value="{{ Group.ID }}">Группа {{ Group.GroupNum }}{% if Group.SpecName is not null %} - {{ Group.SpecName }}{% endif %}</option>
{% endfor %}
</select>
- <button class="defaultForm BlueButton P2Width AttachGroupButton">Прикрепить группу</button>
+ <div class="defaultForm FRight P2Width">
+ <button class="defaultForm BlueButton FullWidth noMargin AttachGroupButton">Прикрепить группу</button>
+ </div>
</div>
<div class="AttachedGroupsList">
<h2 class="BlueTitle">Прикрепленные группы</h2>
diff --git a/~dev_rating/application/views/teacher/discipline/edit/students.twig b/~dev_rating/application/views/teacher/discipline/edit/students.twig
index d655deb9c05062735d931acf1f9c36e1504489f0..48c7e4340cda3e17152782af4482e2db38c9a2b0 100644
--- a/~dev_rating/application/views/teacher/discipline/edit/students.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/students.twig
@@ -39,13 +39,10 @@
{% for student in group %}
{{ idx.outputStudent(student) }}
{% endfor %}
- <!-- <button class="btn_editStudents">Отсоединить всех</button> -->
</div>
{% endfor %}
</div>
-
-
<div class="AttachedStudentsList">
<h2 class="BlueTitle">Прикрепленные студенты</h2>
{% for groupID, group in GroupsAttached %}
@@ -58,13 +55,9 @@
{% endfor %}
</div>
-
-
-
-
-
<div class="SearchStudents">
<h2 class="BlueTitle">Поиск студентов</h2>
+
<div class="SearchSettings">
<select class="SelectGrade defaultForm">
<option value="0">Выберите курс:</option>
@@ -75,14 +68,21 @@
</option>
{% endfor %}
</select>
- <select class="SelectStudyGroup defaultForm">
+
+ <select class="SelectStudyGroup defaultForm FLeft">
<option value="0">Выберите группу:</option>
{% for Group in GroupsList %}
<option value="{{ Group.ID }}">Группа {{ Group.GroupNum }} - {{ Group.SpecName }}</option>
{% endfor %}
</select>
- <input type="text" class="InputStudentName defaultForm P1Width" placeholder="Фамилия РРјСЏ Отчество" value="">
- <button class="searchBtn defaultForm BlueButton P2Width">РџРѕРёСЃРє</button>
+
+ <div class="ClearFix">
+ <input type="text" class="InputStudentName defaultForm FLeft P1Width" placeholder="Фамилия РРјСЏ Отчество"
+ value="">
+ <div class="defaultForm FRight P2Width Margin10 Top">
+ <button class="defaultForm BlueButton FullWidth noMargin searchBtn">РџРѕРёСЃРє</button>
+ </div>
+ </div>
</div>
<div class="SearchResult"></div>
</div>
diff --git a/~dev_rating/application/views/teacher/discipline/edit/teachers.twig b/~dev_rating/application/views/teacher/discipline/edit/teachers.twig
index 88b80fe77d2296b58badd3a8eae04769dc65743b..0ad6157f2cf53695049c0ad6e1e0f4e721afd3eb 100644
--- a/~dev_rating/application/views/teacher/discipline/edit/teachers.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/teachers.twig
@@ -38,8 +38,13 @@
<option value="{{ Dep.ID }}">{{ Dep.Name|default('Служебная кафедра') }}</option>
{% endfor %}
</select>
- <input type="text" class="InputTeacherName defaultForm P1Width" placeholder="Фамилия РРјСЏ Отчество" value="">
- <button class="searchBtn defaultForm BlueButton P2Width">РџРѕРёСЃРє</button>
+ <div class="ClearFix">
+ <input type="text" class="InputTeacherName defaultForm FLeft P1Width" placeholder="Фамилия РРјСЏ Отчество"
+ value="">
+ <div class="defaultForm FRight P2Width Margin10 Top">
+ <button class="defaultForm BlueButton FullWidth noMargin searchBtn">РџРѕРёСЃРє</button>
+ </div>
+ </div>
</div>
<div class="SearchResult">
</div>