Skip to content
Snippets Groups Projects
Commit d0e23404 authored by xamgore's avatar xamgore
Browse files

Single title for all pages at office/

parent 4169cf0b
Branches
Tags
No related merge requests found
Showing
with 25 additions and 41 deletions
...@@ -303,7 +303,8 @@ input[type="checkbox"] { ...@@ -303,7 +303,8 @@ input[type="checkbox"] {
font-size: 1.1em; font-size: 1.1em;
margin: -15px 0px 0px -10px; margin: -15px 0px 0px -10px;
padding: 0.45em 2.5em 0.45em 1.5em; padding: 0.45em 2.5em 0.45em 1.5em;
min-width: 15%; min-width: 270px;
text-align: center;
.box-shadow(0 0 5px, @ColorGrey); .box-shadow(0 0 5px, @ColorGrey);
z-index: 1000; z-index: 1000;
} }
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
{% endblock %} {% endblock %}
{% block main_top_title %}Получение кодов активации{% endblock %}
{% block office_content %} {% block office_content %}
<h2>Получение кодов активации</h2>
<div class="stepBox" id="FirstStep"> <div class="stepBox" id="FirstStep">
<div class="step_title" > <div class="step_title" >
......
...@@ -7,10 +7,9 @@ ...@@ -7,10 +7,9 @@
{# {{ HTML.script('static/js/admin/students/index.js')|raw }} #} {# {{ HTML.script('static/js/admin/students/index.js')|raw }} #}
{% endblock %} {% endblock %}
{% block main_top_title %}Управление аккаунтами{% endblock %}
{% block office_content %} {% block office_content %}
<h2>Управление аккаунтами</h2>
<div class="action_bar"> <div class="action_bar">
{{ admin.action(URL.site('admin/accounts/getActivationCodes'), URL.site('static/img/codes.png'), 'Получить коды активации', {{ admin.action(URL.site('admin/accounts/getActivationCodes'), URL.site('static/img/codes.png'), 'Получить коды активации',
'Получить коды активации для неактивированных аккаунтов. '~ 'Получить коды активации для неактивированных аккаунтов. '~
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
{% endblock %} {% endblock %}
{% block main_top_title %} {% block main_top_title %}
CБРС: Панель управления Панель управления
{% endblock %} {% endblock %}
{% block main_content %} {% block main_content %}
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
{% endblock %} {% endblock %}
{% block main_top_title %}Деканат > Зачеты{% endblock %}
{% block office_content %} {% block office_content %}
<h2>Этапы зачета для дисциплин</h2> <h2>Этапы зачета для дисциплин</h2>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
......
{% extends "office/base" %} {% extends "office/base" %}
{% block main_top_title %}Дисциплины{% endblock %} {% block page_label %}Дисциплины{% endblock %}
{% block office_tabs %} {% block office_tabs %}
<div class="tabsWrapper noTopMargin"> <div class="tabsWrapper noTopMargin">
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
<div class="tab">{{ HTML.anchor('office/disciplines/compound', 'Составные дисциплины')|raw }}</div> <div class="tab">{{ HTML.anchor('office/disciplines/compound', 'Составные дисциплины')|raw }}</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
\ No newline at end of file
{% extends "office/base" %} {% extends "office/base" %}
{% block title %}Сводная ведомость{% endblock %}
{% block office_tabs %} {% block office_tabs %}
<div class="tabsWrapper noTopMargin"> <div class="tabsWrapper noTopMargin">
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</select> </select>
<select class="defaultForm" id="gradeSelect"> <select class="defaultForm" id="gradeSelect">
<option value="-1">-- Выберите курс --</option> <option value="-1"> Выберите курс </option>
{% for Grade in Grades %} {% for Grade in Grades %}
<option value="{{ Grade.ID }}"> <option value="{{ Grade.ID }}">
{{ Grade.Num }} курс {{ Grade.Num }} курс
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</select> </select>
<select class="defaultForm" id="groupSelect"> <select class="defaultForm" id="groupSelect">
<option value="-1">-- Выберите группу --</option> <option value="-1"> Выберите группу </option>
</select> </select>
</div> </div>
......
{% extends 'office/base' %} {% extends 'office/base' %}
{% block title %}Деканат > Ведомости{% endblock %} {% block title %}Ведомости{% endblock %}
{% block office_media %} {# head -> css, js #} {% block office_media %} {# head -> css, js #}
{#{{ parent() }}#} {# fixme #} {#{{ parent() }}#} {# fixme #}
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
{% endblock %} {% endblock %}
{% block main_top_title %}Ведомости{% endblock %}
{% block office_content %} {% block office_content %}
<div data-role="page" id="dean_office" style="text-align: center"> <div data-role="page" id="dean_office" style="text-align: center">
......
{% extends "office/base" %} {% extends "office/base" %}
{% block title %}Студенты{% endblock %}
{% block office_tabs %} {% block office_tabs %}
<div class="tabsWrapper noTopMargin"> <div class="tabsWrapper noTopMargin">
......
{% extends "office/students/!base" %} {% extends "office/students/!base" %}
{% block title %}Студенты{% endblock %}
{% block office_media %} {% block office_media %}
{{ HTML.style('static/css/admin/inputGroup.css')|raw }} {{ HTML.style('static/css/admin/inputGroup.css')|raw }}
{{ HTML.script('static/js/admin/students/add.js')|raw }} {{ HTML.script('static/js/admin/students/add.js')|raw }}
{% endblock %} {% endblock %}
{% block main_top_title %}Добавление студента{% endblock %}
{% block office_content %} {% block office_content %}
<h2>Добавление студента</h2>
<div class="inputGroupMessages"> <div class="inputGroupMessages">
<div class="success_message"> <div class="success_message">
<div class="success_text"> <div class="success_text">
......
...@@ -10,9 +10,8 @@ ...@@ -10,9 +10,8 @@
</script> </script>
{% endblock %} {% endblock %}
{% block main_top_title %}Профиль студента{% endblock %}
{% block office_content %} {% block office_content %}
<h2>Профиль студента</h2>
<div class="profilePage "> <div class="profilePage ">
<div class="profile_clearFix"> <div class="profile_clearFix">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{{ search.head("URLdir + 'handler/students/search'") }} {# todo: this is not a good sign #} {{ search.head("URLdir + 'handler/students/search'") }} {# todo: this is not a good sign #}
{% endblock %} {% endblock %}
{% block _ResultPrototype %} {% block _ResultPrototype %}
<div class="goodClearFix"> <div class="goodClearFix">
<div class="defaultForm FLeft"> <div class="defaultForm FLeft">
<div class="FirstLine"> <div class="FirstLine">
......
{% extends 'office/students/!base' %} {% extends 'office/students/!base' %}
{% import 'controls/transfer' as transfer %} {% import 'controls/transfer' as transfer %}
{% block title %}Перевод{% endblock %}
{% block office_media %} {# head -> css, js #} {% block office_media %} {# head -> css, js #}
{{ transfer.head() }} {{ transfer.head() }}
{% endblock %} {% endblock %}
{% block title %}Перевод{% endblock %}
{% block office_content %} {% block office_content %}
<h2 class="defaultForm marginBetween">Перевод студентов</h2> <h2 class="defaultForm marginBetween">Перевод студентов</h2>
<div class="defaultForm marginBetween">{{ transfer.control(SemestersList, GradesList) }}</div> <div class="defaultForm marginBetween">{{ transfer.control(SemestersList, GradesList) }}</div>
......
{% extends "office/students/!base" %} {% extends "office/students/!base" %}
{% block title %}Добавление студентов{% endblock %} {% block title %}Загрузка студентов{% endblock %}
{% block main_top_title %}Студенты{% endblock %}
{% block office_content %} {% block office_content %}
<h2 class="defaultForm marginBetween">Пакетная загрузка студентов</h2> <h2 class="defaultForm marginBetween">Пакетная загрузка студентов</h2>
{% if Errors is not empty %} {% if Errors is not empty %}
{% set res %} {% set res %}
......
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
{% block title %}Загрузка предметов{% endblock %} {% block title %}Загрузка предметов{% endblock %}
{% block main_top_title %}Предметы{% endblock %}
{% block office_content %} {% block office_content %}
<h2 class="Margin10 Bottom">Добавление предмета</h2> <h2 class="Margin10 Bottom">Добавление предмета</h2>
<div class="ClearFix Margin10 Bottom"> <div class="ClearFix Margin10 Bottom">
......
{% extends "office/base" %} {% extends "office/base" %}
{% block main_top_title %}Студенты{% endblock %} {% block title %}Преподаватели{% endblock %}
{% block office_tabs %} {% block office_tabs %}
<div class="tabsWrapper noTopMargin"> <div class="tabsWrapper noTopMargin">
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
<div class="tab">{{ HTML.anchor('office/teachers/upload', 'Добавление')|raw }}</div> <div class="tab">{{ HTML.anchor('office/teachers/upload', 'Добавление')|raw }}</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
{{ HTML.script('static/js/admin/teachers/add.js')|raw }} {{ HTML.script('static/js/admin/teachers/add.js')|raw }}
{% endblock %} {% endblock %}
{% block title %}Преподаватели{% endblock %}
{% block main_top_title %}Добавление преподавателя{% endblock %}
{% block office_content %} {% block office_content %}
<div class="inputGroupMessages"></div> <div class="inputGroupMessages"></div>
<div class="inputGroup"> <div class="inputGroup">
......
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
{% endblock %} {% endblock %}
{% block main_top_title %}Профиль преподавателя{% endblock %}
{% block office_content %} {% block office_content %}
<div class="profilePage"> <div class="profilePage">
<div class="profile_clearFix"> <div class="profile_clearFix">
......
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
{{ search.head("URLdir + 'handler/teachers/search'") }} {{ search.head("URLdir + 'handler/teachers/search'") }}
{% endblock %} {% endblock %}
{% block main_top_title %}Преподаватели{% endblock %}
{% block _ResultPrototype %} {% block _ResultPrototype %}
<div class="goodClearFix"> <div class="goodClearFix">
<div class="defaultForm FLeft Width65"> <div class="defaultForm FLeft Width65">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment