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

Интерфейсные изменения на странице преподавателя

parent a3d15479
Branches
Tags
No related merge requests found
...@@ -21,12 +21,15 @@ class Controller_Teacher_Index extends Controller_UserEnvi { ...@@ -21,12 +21,15 @@ class Controller_Teacher_Index extends Controller_UserEnvi {
$disciplinesHandled[$i]['Title'] = $row['SubjectName']; $disciplinesHandled[$i]['Title'] = $row['SubjectName'];
$disciplinesHandled[$i]['GradeNum'] = $row['DisciplineGrade']; $disciplinesHandled[$i]['GradeNum'] = $row['DisciplineGrade'];
$disciplinesHandled[$i]['Degree'] = $degrees[$row['DisciplineDegree']]; $disciplinesHandled[$i]['Degree'] = $degrees[$row['DisciplineDegree']];
} }
if($discID != $row['DisciplineID']) if($discID != $row['DisciplineID'])
{ {
$j++; $k = 0; $j++; $k = 0;
$groupsInDiscipline = array(); $groupsInDiscipline = array();
$disciplinesHandled[$i]['Disciplines'][$j]['isAuthor'] = $row['isAuthor'];
$disciplinesHandled[$i]['Disciplines'][$j]['isMapCreated'] = $row['isMapCreated'];
$disciplinesHandled[$i]['Disciplines'][$j]['ID'] = $discID = $row['DisciplineID']; $disciplinesHandled[$i]['Disciplines'][$j]['ID'] = $discID = $row['DisciplineID'];
$disciplinesHandled[$i]['Disciplines'][$j]['ControlType'] = $this->getControlType($row['DisciplineType']); $disciplinesHandled[$i]['Disciplines'][$j]['ControlType'] = $this->getControlType($row['DisciplineType']);
$disciplinesHandled[$i]['Disciplines'][$j]['Teachers'] = $this->getTeachersForDiscipline($discID); $disciplinesHandled[$i]['Disciplines'][$j]['Teachers'] = $this->getTeachersForDiscipline($discID);
......
...@@ -39,14 +39,26 @@ ...@@ -39,14 +39,26 @@
{% endfor %} {% endfor %}
</td> </td>
<td class='common_cell'> <td class='common_cell'>
{{ HTML.anchor('rating/'~Discipline.ID, {% if Discipline.isMapCreated %}
"Оценивание", {{ HTML.anchor('rating/'~Discipline.ID,
{'title': 'Выставление баллов по дисциплине', 'class': 'disc_button'})|raw }} "Оценивание",
{'title': 'Выставление баллов по дисциплине', 'class': 'disc_button active'})|raw }}
{% else %}
<div class="disc_button inactive" alt="Для дисциплины не создана учебная карта">
Оценивание
</div>
{% endif %}
</td> </td>
<td class='common_cell'> <td class='common_cell'>
{{ HTML.anchor('map/structure/'~Discipline.ID, {% if Discipline.isAuthor %}
"Редактирование", {{ HTML.anchor('map/structure/'~Discipline.ID,
{'title': 'Просмотр и редактирование дисциплины', 'class': 'disc_button'})|raw }} "Редактирование",
{'title': 'Просмотр и редактирование дисциплины', 'class': 'disc_button active'})|raw }}
{% else %}
{{ HTML.anchor('map/show/'~Discipline.ID,
"Просмотр",
{'title': 'Просмотр дисциплины', 'class': 'disc_button active'})|raw }}
{% endif %}
</td> </td>
</tr> </tr>
{% if loop.last %} {% if loop.last %}
......
...@@ -54,23 +54,39 @@ ...@@ -54,23 +54,39 @@
border: 0; border: 0;
padding: 6px 20px; padding: 6px 20px;
max-width: 60%; max-width: 60%;
background: #009933; /*#3A84A6;*/
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
color: #ffffff;
border-radius: 3px; border-radius: 3px;
moz-border-radius: 3px; moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-khtml-border-radius: 3px; -khtml-border-radius: 3px;
} }
.disc_button.active
{
background: #009933; /*#3A84A6;*/
color: #ffffff;
}
.disc_button:hover { .disc_button.active:hover {
text-decoration: none; text-decoration: none;
background: #009900; background: #009900;
cursor: pointer; cursor: pointer;
} }
.disc_button.inactive
{
background: #757575; /*#3A84A6;*/
color: #ffffff;
}
.disc_button.inactive:hover
{
background: #7f7f7f; /*#3A84A6;*/
color: #ffffff;
}
/* ============ Плашка дисциплины ================= */ /* ============ Плашка дисциплины ================= */
.discipline_groups .grade_title .discipline_groups .grade_title
......
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