Merge branch 'SemesterSwitcher'

media/less/common.less

@@ -334,10 +334,11 @@ input[type="checkbox"] {
 
 .semesterLayer {
     display: inline-block;
-    width: 70%;
-    .semesterName, .semesterSwitcherBtn {
-        display: inline-block;
-        vertical-align: middle;
+    width: auto;
+    .semesterChanger, .semesterSwitcherBtn {
+        //margin-left: 0px;
+        font-family: @FontFamily;
+        font-size: 1em;
     }
     .semesterSwitcher {
         display: block;
@@ -350,13 +351,14 @@ input[type="checkbox"] {
         .box-shadow(0 0 5px, @ColorGrey);
         .radius(5px);
         li {
-            padding: 5px;
+            margin-bottom: 5px;
+            &:last-child { margin-bottom: 0; }
         }
     }
 }
 
 .helpLink {
-    width: 29%;
+    width: 100%;
     display: inline-block;
     text-align: right;
 }

media/less/teacher/index.less

@@ -17,7 +17,7 @@
 .discipline_groups .grade_title
 {
   color: @ColorBlue;
-  padding: 5px 0;
+  padding: 8px 0;
   text-align: left;
 }
 

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

@@ -41,7 +41,6 @@ class Controller_Teacher_Index extends Controller_Environment_Teacher
             'Subjects'     => $subjects,
             'Teachers'     => $teachers,
             'Groups'       => $groups,
-            'SemesterList' => Model_Semesters::loadAll(),
         ])->set_filename('teacher/index');
     }
 

~dev_rating/application/classes/Twig.php

@@ -27,6 +27,7 @@ class Twig extends Kohana_Twig
             'Arr' => new Arr,
             'Inflector' => new Inflector,
             'System' => array('Title' => ASSEMBLY_SYSTEM_NAME, 'Version' => ASSEMBLY_VERSION),
+            'SemesterList' => Model_Semesters::loadAll()
         ]);
         return $twig;
     }

~dev_rating/application/views/base.twig

@@ -15,14 +15,12 @@
 {% endmacro %}
 
 {% macro SemesterSwitcher(SemesterList) %}
-	<div class="semesterName">
-        <h2 class="Blue">
-            {% set Semester = SemesterList[User.SemesterID] %}
-            Семестр: {{ Rus[Semester.Season] }} {{ Semester.Num == 1 ? Semester.Year : (Semester.Year + 1) }}
-        </h2>
-    </div>
+	<a href="#" id="changeSemester" class="semesterChanger" title="Сменить семестр">
+		{% set Semester = SemesterList[User.SemesterID] %}
+		Семестр: {{ Rus[Semester.Season] }} {{ Semester.Num == 1 ? Semester.Year : (Semester.Year + 1) }}
+		<i class="fa fa-angle-down"></i>
+	</a>
 	<div class="semesterSwitcherBtn">
-		<a href="#" id="changeSemester" title="Сменить семестр">&#x25BC;</a>
 		<div class="semesterSwitcher" style="display: none;">
 			<ul>
 				{% for i in SemesterList %}
@@ -98,6 +96,9 @@
 			<div class="logotype alignLeft">
 				{{ HTML.anchor('/', '<i class="fa fa-home fa-bg fa-fw"></i>&nbsp;' ~ System.Title, {'title': 'Перейти на главную'})|raw }}
 			</div>
+			<div class="semesterLayer">
+				{{ base.SemesterSwitcher(SemesterList) }}
+			</div>
 			<div class="navigation">
 				{# todo: internal messages #}
 				{# <div id = "top_user_messages">

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

@@ -62,13 +62,8 @@
 {% block main_content_classes %}sidePadding{% endblock %}
 {% block main_top_title %}Дисциплины{% endblock %}
 {% block main_content %}
-	<div>
-		<div class="semesterLayer">
-			{{ base.SemesterSwitcher(SemesterList) }}
-		</div>
-		<div class="helpLink">
-			<a href="#" id="openHelp">Справка</a>
-		</div>
+	<div class="helpLink">
+		<a href="#" id="openHelp">Справка</a>
 	</div>
 	<table class="disciplinesList">
 		<tr class="tableHeader">

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

@@ -87,15 +87,9 @@
                         'Создать курсовую работу',
                         'Добавить в систему '~System.Title~' дисциплину типа курсовая научная работа '~
                         'или курсовая работа по дисциплине.') }}
-
-        <div class="semesterMargin">
-            <div class="semesterLayer">
-                {{ base.SemesterSwitcher(SemesterList) }}
-            </div>
             {#<div class="helpLink">
                 <a href="#">Справка</a>
             </div>#}
-        </div>
         {#<table cellspacing="0" border="0" width="100%">
             <tr class="header_block">
                 <td class='info_cell'>Учебные группы</td>