From 4b7d6a15495f3aefd9edbe8960c2a1b61e8e454d Mon Sep 17 00:00:00 2001
From: Andrew Rudenets <andrey.rudenets@gmail.com>
Date: Mon, 31 Aug 2015 14:54:54 +0300
Subject: [PATCH] Switcher location is changed
---
media/less/common.less | 6 +++---
.../application/classes/Controller/Teacher/Index.php | 1 -
~dev_rating/application/classes/Twig.php | 1 +
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media/less/common.less b/media/less/common.less
index f7c7d5590..903f2fa7c 100644
--- a/media/less/common.less
+++ b/media/less/common.less
@@ -305,12 +305,10 @@ input[type="checkbox"] {
.semesterLayer {
display: inline-block;
width: auto;
- position: absolute;
- left: 45%;
.semesterChanger, .semesterSwitcherBtn {
+ //margin-left: 0px;
font-family: @FontFamily;
font-size: 1em;
- color: @ColorText;
}
.semesterSwitcher {
display: block;
@@ -323,6 +321,8 @@ input[type="checkbox"] {
.box-shadow(0 0 5px, @ColorGrey);
.radius(5px);
li {
+ margin-bottom: 5px;
+ &:last-child { margin-bottom: 0; }
}
}
}
diff --git a/~dev_rating/application/classes/Controller/Teacher/Index.php b/~dev_rating/application/classes/Controller/Teacher/Index.php
index d6e7c9d7a..b76c8e1e0 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Index.php
+++ b/~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');
}
diff --git a/~dev_rating/application/classes/Twig.php b/~dev_rating/application/classes/Twig.php
index d15315009..cd455668e 100644
--- a/~dev_rating/application/classes/Twig.php
+++ b/~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;
}
--
GitLab