1. Цвета кружочков

2. Ссылка в Base

~dev_rating/application/classes/Controller/Student/Index.php

@@ -13,7 +13,6 @@ class Controller_Student_Index extends Controller_UserEnvi {
         foreach($disciplines as $row)
         {
             $i++;
-            $color = 0;
             $disciplinesHandled[$i]['ID'] = $row['ID'];
             if($row['ExamType'] == 'exam')
             {
@@ -73,7 +72,7 @@ class Controller_Student_Index extends Controller_UserEnvi {
                 $color = 5;
             elseif($percent >= 0.85 AND $percent <= 0.94)
                 $color = 6;
-            elseif($percent >= 0.95 AND $percent <= 1)
+            elseif($percent >= 0.95)
                 $color = 7;
             if($examRate !== NULL AND $examRate < 22)
                 $color = 2;

~dev_rating/application/views/base.twig

@@ -70,9 +70,12 @@
                                     {{ User.First }} {{ User.Last }}
 					</div>
 					| 
-                                {% if User.RoleMark == 4 %}
-                                {{ HTML.anchor('admin', 'Администрирование', {'title': 'Перейти в панель управления системой'})|raw }}
-                                {% endif %}
+					{% if User.RoleMark == 16 %}
+					{{ HTML.anchor('dean_office', 'Деканат')|raw }}
+					{% endif %}
+					{% if User.RoleMark == 4 %}
+						{{ HTML.anchor('admin', 'Администрирование', {'title': 'Перейти в панель управления системой'})|raw }}
+					{% endif %}
 				{{ HTML.anchor('/', 'Главная страница', {'title': 'Перейти на главную страницу'})|raw }}
 				{{ HTML.anchor('settings', 'Настройки', {'title': 'Настроить аккаунт'})|raw }}
 				{{ HTML.anchor('sign/out', 'Выход', {'title': 'Выйти из системы'})|raw }}

~dev_rating/application/views/student/index.twig

 {% extends 'base' %} 
  
 {% macro subject(i, HTML) %}
-	<tr class="course_content">
-                <td class="{{ i.ColorScheme }}">
-                    <div class='Circle'></div>
-                </td>
-		<td class = "course_name">
-                    {{ HTML.anchor('subject/' ~ i.ID, i.Title)|raw }}
-		</td>
+<tr class="course_content">
+    <td class="{{ i.ColorScheme }}">
+        <div class='Circle'></div>
+    </td>
+    <td class = "course_name">
+        {{ HTML.anchor('subject/' ~ i.ID, i.Title)|raw }}
+    </td>
 
-		<td class="course_teacher">
-                    {% for teacher in i.Teachers %}
-                        <div>{{ teacher }}</div>
-                    {% else %}
-                        ---
-                    {% endfor %}
-		</td>
+    <td class="course_teacher">
+        {% for teacher in i.Teachers %}
+            <div>{{ teacher }}</div>
+        {% else %}
+            ---
+        {% endfor %}
+    </td>
 
-		<td  class="course_form_control">
-                    {{ i.Control }}
-		</td>	
+    <td  class="course_form_control">
+        {{ i.Control }}
+    </td>
 
-		<td class="course_rating_value">
-                    {{ i.Rate|default('0') }} / {{ i.MaxCurrentRate|default('0') }} / {{ i.MaxRate }}
-		</td>
+    <td class="course_rating_value">
+        {{ i.Rate|default('0') }} / {{ i.MaxCurrentRate|default('0') }} / {{ i.MaxRate }}
+    </td>
 
-		<td class="course_rating_percent">
-                    {% if i.MaxCurrentRate != 0 %}
-						{% if i.Rate > i.MaxCurrentRate %}
-							100%
-						{% else %}
-							{{ (100 * i.Rate) // i.MaxCurrentRate }} %
-						{% endif %}
-                    {% else %}
-                        ---
-                    {% endif %}
-		</td>
-	</tr>	
+    <td class="course_rating_percent">
+        {% if i.MaxCurrentRate != 0 %}
+            {% if i.Rate > i.MaxCurrentRate %}
+                100%
+            {% else %}
+                {{ (100 * i.Rate) // i.MaxCurrentRate }} %
+            {% endif %}
+        {% else %}
+            ---
+        {% endif %}
+    </td>
+</tr>
 {% endmacro %}
 {% import 'student/index' as res %}
 

~dev_rating/media/css/student/index.css

@@ -96,27 +96,27 @@ tr.course_content td {
 }
 
 .ECTS-F > .Circle { 
-    background: #f60;
+    background: #8A2E15;
 }
 
 .ECTS-FX > .Circle { 
-    background: #e56800;
+    background: #D46141;
 }
 
 .ECTS-E > .Circle { 
-    background: #ffb100;
+    background: #EDEC51;
 }
 .ECTS-D > .Circle {
-    background: #ffd000;
+    background: #7EBA3C;
 }
 .ECTS-C > .Circle { 
-    background: #70c300;
+    background: #28AE57;
 }
 .ECTS-B > .Circle { 
-    background: #059e00;
+    background: #349920;
 }
 .ECTS-A > .Circle {
-    background: #009404;
+    background: #367F27;
 }
 
 .course_rating_percent > div