diff --git a/~dev_rating/application/views/teacher/map/EditGroups.twig b/~dev_rating/application/views/teacher/map/EditGroups.twig index eaecda42b635c35288fbcd9a27d333acc3bb5f51..16abc8aa917520c4bc27adaf905057bf4a9324e7 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> @@ -16,6 +15,7 @@ <button class="AttachGroupButton default_BlueButton">Прикрепить группу</button> </div> <div class="AttachedGroupsList"> + <h2 class="BlueTitle">Прикрепленные группы</h2> {% for Group in GroupsForDiscipline %} <div class="AttachedGroup" id="{{ Group.GroupID }}"> <div class="StudyGroupInfo">Курс {{ Group.GroupGrade }}, Группа {{ Group.GroupNum }} - {{ Group.SpecName }}</div> 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/application/views/teacher/map/MapBase.twig b/~dev_rating/application/views/teacher/map/MapBase.twig index 2c0b49c75f22923547b9aeb101a7842d5d8cfcd9..062e426881a3d45bc877a839f299de4f6277a986 100644 --- a/~dev_rating/application/views/teacher/map/MapBase.twig +++ b/~dev_rating/application/views/teacher/map/MapBase.twig @@ -11,7 +11,7 @@ {{ HTML.script('media/js/construct/edit.js')|raw }} {% endblock %} -{% block main_top_title %}Редактирование УКД{% endblock %} +{% block main_top_title %}Редактирование дисциплины{% endblock %} {% block main_content %} <div class="tabs"> <div class="tab {% block step_1 %}{% endblock %}">{{ HTML.anchor('map/discipline/'~Discipline.DisciplineID, 'Базовые настройки УКД', {'title': 'Базовые настройки УКД'})|raw }}</div> diff --git a/~dev_rating/application/views/teacher/map/create.twig b/~dev_rating/application/views/teacher/map/create.twig index 8f551d04b445259823a98cf2480e26dee34c52d6..7de920a1cb62e432d8bb30a90a341ad25a3e4d01 100644 --- a/~dev_rating/application/views/teacher/map/create.twig +++ b/~dev_rating/application/views/teacher/map/create.twig @@ -11,7 +11,7 @@ {{ HTML.script('media/js/construct/create.js')|raw }} {% endblock %} -{% block main_top_title %}Добавление УКД{% endblock %} +{% block main_top_title %}Добавление дисциплины{% endblock %} {% block main_content %} <div class="guide" style="display: none"> <p>Обратите внимание, что добавление Учебной Карты Дисциплины (далее УКД) происходит в 3 этапа:</p> 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..1fdf146c5970811b70ca7871caa6536f5ffecbc6 100644 --- a/~dev_rating/media/css/construct.css +++ b/~dev_rating/media/css/construct.css @@ -170,8 +170,8 @@ /* КОНЕЦ Общие... */ /* Модуль */ .moduleHead { - background-color: #e4f2fd; - padding: 6px 15px; + background-color: #CDE8FD; + padding: 6px 21px; } /* Список мероприятий (подмодулей) */ @@ -179,9 +179,9 @@ } /* Мероприятие (Подмодуль) */ .subModule { - background-color: #f1f1f1; + background-color: #e4e4e4; padding: 6px 15px; - margin: 5px 0 + margin: 5px 8px } /* Кнопка добавления модуля */ @@ -207,7 +207,9 @@ .ChangeStudyGroupDIV button{ float: right } -.AttachedGroupsList {} +.AttachedGroupsList { + margin-top: 20px; +} .AttachedGroupsList .AttachedGroup { margin: 10px 0; padding: 7px 10px; @@ -234,13 +236,20 @@ /* Прикрипление студентов */ .StudentsList {} .StudentsList .GradeAndGroupTitle { + background: #f1f1f1; + padding: 5px 10px; margin-top: 20px; font-weight: bold; - font-size: 15px; + font-size: 14px; 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..8b1f549dd2fd9204977765f9953b4d0a2840aac2 100644 --- a/~dev_rating/media/js/construct/edit.js +++ b/~dev_rating/media/js/construct/edit.js @@ -107,7 +107,7 @@ $(function() { if (thisObj.val() != '') NewMaxRate = parseInt(thisObj.val()); - + /* // Ограничение 100 баллов var currentControl = 0; $('.moduleHead .currentControl').each(function(){ @@ -127,7 +127,7 @@ $(function() { thisObj.val(OldMaxRate); return 0; } - + */ // Меняем max балл if (NewMaxRate != OldMaxRate) { @@ -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(); + } }); // Добавить преподавателя