Skip to content
Snippets Groups Projects
Commit 2b9e9275 authored by Andrew Rudenets's avatar Andrew Rudenets
Browse files

Merge remote-tracking branch 'mainrepo/interface_fixes'

parents ca2b1568 8ba516b1
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 102 additions and 36 deletions
media/less/common.less
+ 29
− 3
View file @ 2b9e9275
......@@ -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
// ---------------------------------------------------------------------------------------------------------------------
......
media/less/common/forms.less
+ 4
− 10
View file @ 2b9e9275
......@@ -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;
......
media/less/common/tabs.less
+ 1
− 1
View file @ 2b9e9275
......@@ -2,7 +2,7 @@
.tabsWrapper {
margin: 5px auto;
width: 100%;
width: 95%;
.tabs {
display: table;
......
~dev_rating/application/classes/Controller/Office/Disciplines.php
+ 13
− 1
View file @ 2b9e9275
......@@ -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');
}
}
~dev_rating/application/views/office/disciplines.twig 0 → 100644
+ 12
− 0
View file @ 2b9e9275
{% 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
~dev_rating/application/views/office/subjects/upload.twig
+ 20
− 5
View file @ 2b9e9275
......@@ -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 %}
~dev_rating/application/views/teacher/discipline/MapBase.twig
+ 1
− 1
View file @ 2b9e9275
......@@ -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">
......
~dev_rating/application/views/teacher/discipline/edit/groups.twig
+ 4
− 2
View file @ 2b9e9275
......@@ -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>
......
~dev_rating/application/views/teacher/discipline/edit/students.twig
+ 11
− 11
View file @ 2b9e9275
......@@ -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>
......
~dev_rating/application/views/teacher/discipline/edit/teachers.twig
+ 7
− 2
View file @ 2b9e9275
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment