Merge branch 'develop' of http://itlab.mmcs.sfedu.ru/git/grade-rating into develop

~dev_rating/application/classes/Controller/Teacher/Discipline.php

@@ -65,7 +65,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvironment {
         $twig->User = $this->user;
         $twig->Discipline = $this->GetDisciplineInfo($id);
         $twig->GradesList = Model_Grades::toArray();
-        $twig->Groups = Model_Groups::orderByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID']);
+        $twig->GroupsList = Model_Groups::orderByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID']);
 
         $students = Model_Students::ofDiscipline($id);
         $stdHandled = array();

~dev_rating/application/views/teacher/discipline/EditStudents.twig

@@ -74,7 +74,7 @@
             </select>
             <select class="SelectStudyGroup defaultForm">
                 <option value="0">Выберите группу:</option>
-                {% for Group in Groups %}
+                {% for Group in GroupsList %}
                     <option value="{{ Group.ID }}">Группа {{ Group.GroupNum }} - {{ Group.SpecName }}</option>
                 {% endfor %}
             </select>

~dev_rating/media/js/discipline/EditStudents.js

@@ -22,7 +22,7 @@ $(function() {
     var jStudentEmptyPrototype = $($.parseHTML(
     		"<p class='notification'>Нет результатов... Возможно, студенты, соответствующие критериям поиска, уже прикреплены.</p>"));
 
-    var jGroupWrapPrototype = 	$($.parseHTML(	"<select class='SelectStudyGroup default_select'>\
+    var jGroupWrapPrototype = 	$($.parseHTML(	"<select class='SelectStudyGroup defaultForm'>\
                 								<option value='0'>Выберите группу:</option>"));
 
 

~dev_rating/media/less/teacher/discipline/EditStudents.css

@@ -67,7 +67,7 @@
 }
 .StudentsList .GroupContainerAttached .Student {
   float: right;
-  width: 880px;
+  /*width: 880px;*/
   margin-top: 10px;
   padding: 7px 10px;
 }

~dev_rating/media/less/teacher/discipline/EditStudents.less

@@ -76,7 +76,7 @@
 
 .StudentsList .GroupContainerAttached .Student {
   float: right;
-  width: 880px;
+  /*width: 880px;*/
   margin-top: 10px;
   padding: 7px 10px;
 }