From 024a54e29913a5d385e8734735cadaa75610f176 Mon Sep 17 00:00:00 2001
From: Roman Steinberg <roman.accs@gmail.com>
Date: Sun, 22 Jul 2018 21:17:45 +0300
Subject: [PATCH] CHG: semester names in semester switcher
---
media/less/common.less | 2 +-
~dev_rating/application/views/base.twig | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media/less/common.less b/media/less/common.less
index 633ce67ed..ccddfcdde 100644
--- a/media/less/common.less
+++ b/media/less/common.less
@@ -364,10 +364,10 @@ input[type="checkbox"] {
padding: 10px;
overflow: hidden;
.modalWindow(auto);
- min-width: 160px;
margin-top: 5px;
background: @ColorBaseWhite;
border: 1px solid @ColorBaseGrey;
+ right: 2px;
.box-shadow(0 0 5px, @ColorGrey);
.radius(5px);
diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig
index 3b4536867..cef7e97ef 100644
--- a/~dev_rating/application/views/base.twig
+++ b/~dev_rating/application/views/base.twig
@@ -24,8 +24,8 @@
<div class="semesterSwitcherBtn">
<div class="semesterSwitcher" id="semester_{{ User.SemesterID }}" style="display: none;">
<ul>
- {% for i in SemesterList %}
- <li><a href="#" id="S-{{ i.ID }}" class="switchSemester">{{ i.Num }} семестр {{ i.Year }}/{{ i.Year + 1 }}</a></li>
+ {% for sem in SemesterList %}
+ <li><a href="#" id="S-{{ sem.ID }}" class="switchSemester">{{ Rus[sem.Season] }} {{ sem.Num == 1 ? sem.Year : (sem.Year + 1) }}</a></li>
{% endfor %}
</ul>
</div>
--
GitLab