diff --git a/~dev_rating/application/views/teacher/map/EditGroups.twig b/~dev_rating/application/views/teacher/map/EditGroups.twig index eaecda42b635c35288fbcd9a27d333acc3bb5f51..f900191e5de89d2dd060f57a8c7913b0e7235967 100644 --- a/~dev_rating/application/views/teacher/map/EditGroups.twig +++ b/~dev_rating/application/views/teacher/map/EditGroups.twig @@ -5,7 +5,6 @@ {% block step_4 %}active{% endblock %} {% block map_content %} - <p class="notification">Обратите внимание, если вам нужно прикрепить 1-ого или максимум 4-х студентов из группы, то удобней это сделать на странице 'Прикрепление студентов'</p> <div class="ChangeStudyGroupDIV"> <select class="SelectStudyGroup default_select"> <option value="0">Выберите группу:</option> diff --git a/~dev_rating/application/views/teacher/map/EditStudents.twig b/~dev_rating/application/views/teacher/map/EditStudents.twig index 950e4c7e80636d0ba6a4d09c30499beb7ba7793e..15c5cd7b64ca34148cf29a1e4b8e2aa601bdb894 100644 --- a/~dev_rating/application/views/teacher/map/EditStudents.twig +++ b/~dev_rating/application/views/teacher/map/EditStudents.twig @@ -17,7 +17,7 @@ {% endif %} <div class="GradeAndGroupTitle" id="{{ Student.Grade }}_{{ Student.GroupNum }}"> <span class="info">Курс {{ Student.Grade }}, Группа {{ Student.GroupNum }}</span> - <span class="ActionShowHideGroupContainer">Открыть список студентов</span> + <span class="ActionShowHideGroupContainer">Открыть список ▼</span> </div> <div class="GroupContainer"> {% set NowGroupNum = Student.GroupNum %} diff --git a/~dev_rating/media/css/base.css b/~dev_rating/media/css/base.css index 33491461c35c29866f0b33115e39728f950892f6..51f4ddbfe262f1f1fcac3b72eb3baee7b476f6d0 100644 --- a/~dev_rating/media/css/base.css +++ b/~dev_rating/media/css/base.css @@ -201,8 +201,8 @@ p.notification{ font-size: 16px; } h2.BlueTitle{ - font-size: 18px; - font-weight: normal; + font-size: 15px; + font-weight: bold; color: #3399CC; } diff --git a/~dev_rating/media/css/construct.css b/~dev_rating/media/css/construct.css index 828537250289635c7dd637e9c340fda776dc394f..511e2dca7a66662a6166ae9e1305ded5033ea059 100644 --- a/~dev_rating/media/css/construct.css +++ b/~dev_rating/media/css/construct.css @@ -234,13 +234,20 @@ /* Прикрипление студентов */ .StudentsList {} .StudentsList .GradeAndGroupTitle { + background: #f1f1f1; + padding: 5px 10px; margin-top: 20px; font-weight: bold; font-size: 15px; color: #333; } + .GradeAndGroupTitle .ActionShowHideGroupContainer{ + margin-left: 40px; + font-size: 13px; + cursor: pointer + } .StudentsList .GroupContainer { - + display: none; } .StudentsList .Student { margin: 10px 0; diff --git a/~dev_rating/media/js/construct/edit.js b/~dev_rating/media/js/construct/edit.js index 1357ddf723200cafe2989d499188f82188904647..425a78c58161f1844a75bad49efffb04db19303e 100644 --- a/~dev_rating/media/js/construct/edit.js +++ b/~dev_rating/media/js/construct/edit.js @@ -663,10 +663,14 @@ $('.StudentsList').on('click', '.Action_UnbindStudent', function(){ }); $('.StudentsList').on('click', '.ActionShowHideGroupContainer', function(){ - if ($(this).parent().next('.GroupContainer').attr('class') == 'block') - $(this).parent().next('.GroupContainer').hide(); - if ($(this).parent().next('.GroupContainer').attr('class') == 'none') + if ($(this).parent().next('.GroupContainer').css('display') == 'none') { + $(this).text('Скрыть список ▲'); $(this).parent().next('.GroupContainer').show(); + } + else { + $(this).text('Открыть список ▼'); + $(this).parent().next('.GroupContainer').hide(); + } }); // Добавить преподавателя