diff --git a/~dev_rating/application/views/dean_office/index.twig b/~dev_rating/application/views/dean_office/index.twig index 2865914650b346094de292e36038cdb96f6d893b..e3a73a51fa51d43b72f9579e308bb4995f3a8d43 100644 --- a/~dev_rating/application/views/dean_office/index.twig +++ b/~dev_rating/application/views/dean_office/index.twig @@ -39,8 +39,8 @@ <div class="itemBlock"> <div class="title">Курс:</div> <div class="field"> - <select class="SelectGrade default_select" id="SelectGrade"> - <option>-Не выбран-</option> + <select class="SelectGrade defaultForm" id="SelectGrade"> + <option>– Не выбран –</option> {% for Grade in GradesList %} <option value="{{ Grade.ID }}" >{{ Grade.Title }}</option> {% endfor %} @@ -54,12 +54,14 @@ <div class="itemBlock"> <div class="title">Группа:</div> <div class="field"> - <select class="SelectGroup default_select" id="SelectGroup" disabled> - <option>-Не выбрана-</option> + <select class="SelectGroup defaultForm" id="SelectGroup" disabled> + <option>– Не выбрана –</option> </select> </div> </div> - <button class="default_BlueButton" id="DownloadStatement" disabled>Скачать</button> + <div style="margin-top: 15px"> + <button class="defaultForm BlueButton" id="DownloadStatement" disabled="disabled">Скачать</button> + </div> </div> <div class="LayerSection" id="SelectDisciplineDiv" > @@ -67,14 +69,16 @@ <div class="itemBlock"> <div class="title">Дисциплина:</div> <div class="field"> - <select class="SelectDiscipline default_select" id="SelectDiscipline" disabled> - <option>-Не выбрана-</option> + <select class="SelectDiscipline defaultForm" id="SelectDiscipline" disabled> + <option>– Не выбрана –</option> </select> </div> </div> - <button class="default_BlueButton" id="DownloadExamDocument" disabled>Скачать</button> - <button class="default_BlueButton" id="BlockExamDiscipline" disabled>Блокировать</button> - <button class="default_BlueButton" id="BlockAndPrintExam" disabled>Блокировать и Скачать</button> + <div style="margin-top: 20px"> + <button class="defaultForm BlueButton HalfWidth" id="DownloadExamDocument" disabled="disabled">Скачать</button> + <button class="defaultForm BlueButton HalfWidth" id="BlockExamDiscipline" disabled="disabled">Блокировать</button> + <button class="defaultForm BlueButton HalfWidth" id="BlockAndPrintExam" disabled="disabled">Блокировать и Скачать</button> + </div> </div> </div> diff --git a/~dev_rating/media/js/dean_office/dean_office.js b/~dev_rating/media/js/dean_office/dean_office.js index 501aa5d05d5ba7bfbce49acd7fb64b36220382f5..5ff232b93e6a8d43806eedc32693eb6334053b3f 100644 --- a/~dev_rating/media/js/dean_office/dean_office.js +++ b/~dev_rating/media/js/dean_office/dean_office.js @@ -1,4 +1,5 @@ var $ = jQuery; +var langNotChosen = '– Не выбрана –'; $(function() { @@ -39,8 +40,8 @@ $(function() { if(d.success === true) { console.log(d.data); var i = 0; - jSelectGroup.html("<option>-Не выбрана-</option>"); - jSelectDiscipline.html("<option>-Не выбрана-</option>"); + jSelectGroup.html("<option>" + langNotChosen + "</option>"); + jSelectDiscipline.html("<option>" + langNotChosen + "</option>"); for (i in d.data) { group = d.data[i]; @@ -55,11 +56,11 @@ $(function() { else { jSelectGroup.attr("disabled", "disabled"); - jSelectGroup.html("<option>-Не выбрана-</option>"); + jSelectGroup.html("<option>" + langNotChosen + "</option>"); jDownloadStatement.attr("disabled", "disabled"); } - jDownloadExamDocument.attr("disabled", 1); + jDownloadExamDocument.attr("disabled", "disabled"); }); $("#SelectGroup").change(function() { @@ -78,7 +79,7 @@ $(function() { if (d.success === true) { console.log(d.data); var i = 0; - jSelectDiscipline.html("<option>-Не выбрана-</option>"); + jSelectDiscipline.html("<option>" + langNotChosen + "</option>"); for (i in d.data) { discipline = d.data[i]; if (discipline.ExamType !== 'exam') @@ -93,14 +94,14 @@ $(function() { } else jDownloadStatement.attr("disabled", "disabled"); - jDownloadExamDocument.attr("disabled", 1); + jDownloadExamDocument.attr("disabled", "disabled"); }); $("#SelectDiscipline").change(function() { var disciplineID = parseInt($(this).val()) || 0; if (disciplineID > 0) jDownloadExamDocument.removeAttr("disabled"); - else jDownloadExamDocument.attr("disabled", 1); + else jDownloadExamDocument.attr("disabled", "disabled"); }); // Скачать ведомость