Merge branch 'master' into refactoring_js

~dev_rating/application/classes/Controller/Handler/ErrMessages.php

@@ -26,6 +26,10 @@ class Controller_Handler_ErrMessages extends Controller_Handler {
          	$title = $_POST['title'];
          	$text = $_POST['text'];
 
+         	$to = "it.lab.mmcs@gmail.com";
+         	//$headers = "From: it.lab.mmcs@gmail.com";
+         	mail($to, $title, $text);// $headers);
+
 	        $data = $this->model->newRequest($this->user['AccID'], $title, $text);
             $this->response->body(json_encode($data[0]));
 	    }

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

@@ -2,8 +2,8 @@
 
 {% block title %}Дисциплины{% endblock %} {# head -> title #}
 {% block media %} {# head -> css, js #}
-	{{ HTML.style('media/css/courses_teacher.css')|raw }}
-	{{ HTML.style('media/css/actionButton.css')|raw }}
+    {{ HTML.style('media/css/courses_teacher.css')|raw }}
+    {{ HTML.style('media/css/actionButton.css')|raw }}
 {% endblock %}
 
 {% macro outputSubject(Subject, HTML) %}
@@ -55,9 +55,12 @@
                                         "Редактирование", 
                                         {'title': 'Просмотр и редактирование дисциплины', 'class': 'disc_button active'})|raw }}
                             {% else %}
-                                {{ HTML.anchor('discipline/show/'~Discipline.ID, 
+                                <div class="disc_button inactive" alt="В разработке">
+                                        Просмотр
+                                </div>
+{#                                 {{ HTML.anchor('discipline/show/'~Discipline.ID, 
                                     "Просмотр", 
-                                    {'title': 'Просмотр дисциплины', 'class': 'disc_button active'})|raw }}
+                                    {'title': 'Просмотр дисциплины', 'class': 'disc_button active'})|raw }} #}
                             {% endif %}
                         </td>
                     </tr>