From d0e23404dad2dedf9fa0bee50df6ba0a3545fb5a Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Thu, 3 Sep 2015 12:24:59 +0300
Subject: [PATCH] Single title for all pages at office/

---
 media/less/common.less                                      | 3 ++-
 ~dev_rating/application/views/office/accounts/codes.twig    | 4 ++--
 ~dev_rating/application/views/office/accounts/index.twig    | 5 ++---
 ~dev_rating/application/views/office/base.twig              | 2 +-
 ~dev_rating/application/views/office/credits.twig           | 2 --
 ~dev_rating/application/views/office/disciplines.twig       | 4 ++--
 ~dev_rating/application/views/office/groups/!base.twig      | 1 +
 ~dev_rating/application/views/office/groups/bill.twig       | 4 ++--
 ~dev_rating/application/views/office/sheets/index.twig      | 4 +---
 ~dev_rating/application/views/office/students/!base.twig    | 1 +
 ~dev_rating/application/views/office/students/add.twig      | 6 ++----
 ~dev_rating/application/views/office/students/profile.twig  | 3 +--
 ~dev_rating/application/views/office/students/search.twig   | 2 +-
 ~dev_rating/application/views/office/students/transfer.twig | 5 ++++-
 ~dev_rating/application/views/office/students/upload.twig   | 5 +----
 ~dev_rating/application/views/office/subjects/upload.twig   | 3 ---
 ~dev_rating/application/views/office/teachers/!base.twig    | 4 ++--
 ~dev_rating/application/views/office/teachers/add.twig      | 4 ----
 ~dev_rating/application/views/office/teachers/profile.twig  | 2 --
 ~dev_rating/application/views/office/teachers/search.twig   | 2 --
 ~dev_rating/application/views/office/teachers/upload.twig   | 4 ----
 21 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/media/less/common.less b/media/less/common.less
index 73d09c95b..f00c69e2d 100644
--- a/media/less/common.less
+++ b/media/less/common.less
@@ -303,7 +303,8 @@ input[type="checkbox"] {
         font-size: 1.1em;
         margin: -15px 0px 0px -10px;
         padding: 0.45em 2.5em 0.45em 1.5em;
-        min-width: 15%;
+        min-width: 270px;
+        text-align: center;
         .box-shadow(0 0 5px, @ColorGrey);
         z-index: 1000;
     }
diff --git a/~dev_rating/application/views/office/accounts/codes.twig b/~dev_rating/application/views/office/accounts/codes.twig
index fb006481a..68dfb9bc0 100644
--- a/~dev_rating/application/views/office/accounts/codes.twig
+++ b/~dev_rating/application/views/office/accounts/codes.twig
@@ -9,9 +9,9 @@
 {% endblock %}
 
 
-{% block main_top_title %}Получение кодов активации{% endblock %}
-    
 {% block office_content %}
+    <h2>Получение кодов активации</h2>
+    
     <div class="stepBox" id="FirstStep">
 
         <div class="step_title" >
diff --git a/~dev_rating/application/views/office/accounts/index.twig b/~dev_rating/application/views/office/accounts/index.twig
index 3a3a57dfe..9033d5e52 100644
--- a/~dev_rating/application/views/office/accounts/index.twig
+++ b/~dev_rating/application/views/office/accounts/index.twig
@@ -7,10 +7,9 @@
     {# {{ HTML.script('static/js/admin/students/index.js')|raw }} #}
 {% endblock %}
 
-
-{% block main_top_title %}Управление аккаунтами{% endblock %}
-
 {% block office_content %}
+    <h2>Управление аккаунтами</h2>
+    
     <div class="action_bar">
         {{ admin.action(URL.site('admin/accounts/getActivationCodes'), URL.site('static/img/codes.png'), 'Получить коды активации',
         'Получить коды активации для неактивированных аккаунтов. '~
diff --git a/~dev_rating/application/views/office/base.twig b/~dev_rating/application/views/office/base.twig
index 536691f2f..bb26dad39 100644
--- a/~dev_rating/application/views/office/base.twig
+++ b/~dev_rating/application/views/office/base.twig
@@ -22,7 +22,7 @@
 {% endblock %}
 
 {% block main_top_title %}
-    CБРС: Панель управления
+    Панель управления
 {% endblock %}
 
 {% block main_content %}
diff --git a/~dev_rating/application/views/office/credits.twig b/~dev_rating/application/views/office/credits.twig
index 3a7dc1d1f..fcdfee91a 100644
--- a/~dev_rating/application/views/office/credits.twig
+++ b/~dev_rating/application/views/office/credits.twig
@@ -13,8 +13,6 @@
 {% endblock %}
 
 
-{% block main_top_title %}Деканат > Зачеты{% endblock %}
-
 {% block office_content %}
     <h2>Этапы зачета для дисциплин</h2>
     <div style="margin-top: 10px;">
diff --git a/~dev_rating/application/views/office/disciplines.twig b/~dev_rating/application/views/office/disciplines.twig
index eee03acd0..79ec6a6f6 100644
--- a/~dev_rating/application/views/office/disciplines.twig
+++ b/~dev_rating/application/views/office/disciplines.twig
@@ -1,6 +1,6 @@
 {% extends "office/base" %}
 
-{% block main_top_title %}Дисциплины{% endblock %}
+{% block page_label %}Дисциплины{% endblock %}
 
 {% block office_tabs %}
     <div class="tabsWrapper noTopMargin">
@@ -9,4 +9,4 @@
             <div class="tab">{{ HTML.anchor('office/disciplines/compound', 'Составные дисциплины')|raw }}</div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/~dev_rating/application/views/office/groups/!base.twig b/~dev_rating/application/views/office/groups/!base.twig
index aeeda2b9d..14de74a96 100644
--- a/~dev_rating/application/views/office/groups/!base.twig
+++ b/~dev_rating/application/views/office/groups/!base.twig
@@ -1,5 +1,6 @@
 {% extends "office/base" %}
 
+{% block title %}Сводная ведомость{% endblock %}
 
 {% block office_tabs %}
     <div class="tabsWrapper noTopMargin">
diff --git a/~dev_rating/application/views/office/groups/bill.twig b/~dev_rating/application/views/office/groups/bill.twig
index 08c0fea9c..58af8009f 100644
--- a/~dev_rating/application/views/office/groups/bill.twig
+++ b/~dev_rating/application/views/office/groups/bill.twig
@@ -19,7 +19,7 @@
         </select>
 
         <select class="defaultForm" id="gradeSelect">
-            <option value="-1">-- Выберите курс --</option>
+            <option value="-1">— Выберите курс —</option>
             {% for Grade in Grades %}
                 <option value="{{ Grade.ID }}">
                     {{ Grade.Num }} РєСѓСЂСЃ
@@ -28,7 +28,7 @@
         </select>
 
         <select class="defaultForm" id="groupSelect">
-            <option value="-1">-- Выберите группу --</option>
+            <option value="-1">— Выберите группу —</option>
         </select>
     </div>
 
diff --git a/~dev_rating/application/views/office/sheets/index.twig b/~dev_rating/application/views/office/sheets/index.twig
index 9a101edf6..fe0dfdd3c 100644
--- a/~dev_rating/application/views/office/sheets/index.twig
+++ b/~dev_rating/application/views/office/sheets/index.twig
@@ -1,6 +1,6 @@
 {% extends 'office/base' %}
 
-{% block title %}Деканат > Ведомости{% endblock %}
+{% block title %}Ведомости{% endblock %}
 
 {% block office_media %} {# head -> css, js #}
     {#{{ parent() }}#}   {# fixme #}
@@ -11,8 +11,6 @@
 {% endblock %}
 
 
-{% block main_top_title %}Ведомости{% endblock %}
-
 {% block office_content %}
 
     <div data-role="page" id="dean_office" style="text-align: center">
diff --git a/~dev_rating/application/views/office/students/!base.twig b/~dev_rating/application/views/office/students/!base.twig
index 84ccdc9ff..d726b12a3 100644
--- a/~dev_rating/application/views/office/students/!base.twig
+++ b/~dev_rating/application/views/office/students/!base.twig
@@ -1,5 +1,6 @@
 {% extends "office/base" %}
 
+{% block title %}Студенты{% endblock %}
 
 {% block office_tabs %}
     <div class="tabsWrapper noTopMargin">
diff --git a/~dev_rating/application/views/office/students/add.twig b/~dev_rating/application/views/office/students/add.twig
index deead0c53..f2457e192 100644
--- a/~dev_rating/application/views/office/students/add.twig
+++ b/~dev_rating/application/views/office/students/add.twig
@@ -1,15 +1,13 @@
 {% extends "office/students/!base" %}
 
-{% block title %}Студенты{% endblock %}
-
 {% block office_media %}
     {{ HTML.style('static/css/admin/inputGroup.css')|raw }}
     {{ HTML.script('static/js/admin/students/add.js')|raw }}
 {% endblock %}
 
-{% block main_top_title %}Добавление студента{% endblock %}
-
 {% block office_content %}
+    <h2>Добавление студента</h2>
+    
     <div class="inputGroupMessages">
         <div class="success_message">
             <div class="success_text">
diff --git a/~dev_rating/application/views/office/students/profile.twig b/~dev_rating/application/views/office/students/profile.twig
index d41244209..0e489d023 100644
--- a/~dev_rating/application/views/office/students/profile.twig
+++ b/~dev_rating/application/views/office/students/profile.twig
@@ -10,9 +10,8 @@
     </script>
 {% endblock %}
 
-{% block main_top_title %}Профиль студента{% endblock %}
-
 {% block office_content %}
+    <h2>Профиль студента</h2>
 
     <div class="profilePage ">
         <div class="profile_clearFix">
diff --git a/~dev_rating/application/views/office/students/search.twig b/~dev_rating/application/views/office/students/search.twig
index 2b67c76e6..87008a102 100644
--- a/~dev_rating/application/views/office/students/search.twig
+++ b/~dev_rating/application/views/office/students/search.twig
@@ -8,7 +8,7 @@
     {{ search.head("URLdir + 'handler/students/search'") }}   {# todo: this is not a good sign #}
 {% endblock %}
 
-{% block _ResultPrototype %}
+{% block _ResultPrototype %}    
     <div class="goodClearFix">
         <div class="defaultForm FLeft">
             <div class="FirstLine">
diff --git a/~dev_rating/application/views/office/students/transfer.twig b/~dev_rating/application/views/office/students/transfer.twig
index 999c1479f..ad9791068 100644
--- a/~dev_rating/application/views/office/students/transfer.twig
+++ b/~dev_rating/application/views/office/students/transfer.twig
@@ -1,9 +1,12 @@
 {% extends 'office/students/!base' %}
 {% import 'controls/transfer' as transfer %}
+
+{% block title %}Перевод{% endblock %}
+
 {% block office_media %} {# head -> css, js #}
     {{ transfer.head() }}
 {% endblock %}
-{% block title %}Перевод{% endblock %}
+
 {% block office_content %}
     <h2 class="defaultForm marginBetween">Перевод студентов</h2>
     <div class="defaultForm marginBetween">{{ transfer.control(SemestersList, GradesList) }}</div>
diff --git a/~dev_rating/application/views/office/students/upload.twig b/~dev_rating/application/views/office/students/upload.twig
index 9af16426a..32741402b 100644
--- a/~dev_rating/application/views/office/students/upload.twig
+++ b/~dev_rating/application/views/office/students/upload.twig
@@ -1,11 +1,8 @@
 {% extends "office/students/!base" %}
 
-{% block title %}Добавление студентов{% endblock %}
-
-{% block main_top_title %}Студенты{% endblock %}
+{% block title %}Загрузка студентов{% endblock %}
 
 {% block office_content %}
-
     <h2 class="defaultForm marginBetween">Пакетная загрузка студентов</h2>
     {% if Errors is not empty %}
         {% set res %}
diff --git a/~dev_rating/application/views/office/subjects/upload.twig b/~dev_rating/application/views/office/subjects/upload.twig
index 2cf1e3d1b..54082e757 100644
--- a/~dev_rating/application/views/office/subjects/upload.twig
+++ b/~dev_rating/application/views/office/subjects/upload.twig
@@ -2,10 +2,7 @@
 
 {% block title %}Загрузка предметов{% endblock %}
 
-{% block main_top_title %}Предметы{% endblock %}
-
 {% block office_content %}
-
     <h2 class="Margin10 Bottom">Добавление предмета</h2>
 
     <div class="ClearFix Margin10 Bottom">
diff --git a/~dev_rating/application/views/office/teachers/!base.twig b/~dev_rating/application/views/office/teachers/!base.twig
index ff96b0833..8e2b4efdc 100644
--- a/~dev_rating/application/views/office/teachers/!base.twig
+++ b/~dev_rating/application/views/office/teachers/!base.twig
@@ -1,6 +1,6 @@
 {% extends "office/base" %}
 
-{% block main_top_title %}Студенты{% endblock %}
+{% block title %}Преподаватели{% endblock %}
 
 {% block office_tabs %}
     <div class="tabsWrapper noTopMargin">
@@ -9,4 +9,4 @@
             <div class="tab">{{ HTML.anchor('office/teachers/upload', 'Добавление')|raw }}</div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/~dev_rating/application/views/office/teachers/add.twig b/~dev_rating/application/views/office/teachers/add.twig
index d6258b9e9..39cbba95d 100644
--- a/~dev_rating/application/views/office/teachers/add.twig
+++ b/~dev_rating/application/views/office/teachers/add.twig
@@ -5,10 +5,6 @@
     {{ HTML.script('static/js/admin/teachers/add.js')|raw }}
 {% endblock %}
 
-{% block title %}Преподаватели{% endblock %}
-
-{% block main_top_title %}Добавление преподавателя{% endblock %}
-
 {% block office_content %}
     <div class="inputGroupMessages"></div>
     <div class="inputGroup">
diff --git a/~dev_rating/application/views/office/teachers/profile.twig b/~dev_rating/application/views/office/teachers/profile.twig
index 828519853..b62935e36 100644
--- a/~dev_rating/application/views/office/teachers/profile.twig
+++ b/~dev_rating/application/views/office/teachers/profile.twig
@@ -7,8 +7,6 @@
 {% endblock %}
 
 
-{% block main_top_title %}Профиль преподавателя{% endblock %}
-
 {% block office_content %}
     <div class="profilePage">
         <div class="profile_clearFix">
diff --git a/~dev_rating/application/views/office/teachers/search.twig b/~dev_rating/application/views/office/teachers/search.twig
index 553048e9c..a2162146a 100644
--- a/~dev_rating/application/views/office/teachers/search.twig
+++ b/~dev_rating/application/views/office/teachers/search.twig
@@ -8,8 +8,6 @@
     {{ search.head("URLdir + 'handler/teachers/search'") }}
 {% endblock %}
 
-{% block main_top_title %}Преподаватели{% endblock %}
-
 {% block _ResultPrototype %}
     <div class="goodClearFix">
         <div class="defaultForm FLeft Width65">
diff --git a/~dev_rating/application/views/office/teachers/upload.twig b/~dev_rating/application/views/office/teachers/upload.twig
index 0a6c72d0e..0aeb4d224 100644
--- a/~dev_rating/application/views/office/teachers/upload.twig
+++ b/~dev_rating/application/views/office/teachers/upload.twig
@@ -1,7 +1,5 @@
 {% extends "office/teachers/!base" %}
 
-{% block title %}Преподаватели{% endblock %}
-
 {% block media %}
     {{ parent() }}
     {{ HTML.style('static/components/office/dropzone/dz.css')|raw }}
@@ -50,8 +48,6 @@
     </script>
 {% endblock %}
 
-{% block main_top_title %}Преподаватели{% endblock %}
-
 {% block office_content %}
     <h2 class="defaultForm">Пакетная загрузка преподавателей</h2>
 
-- 
GitLab