diff --git a/media/less/common.less b/media/less/common.less index 73d09c95b28971a256be48a74237b88e1a16e54e..f00c69e2d0d949bbcf4f5335216e1350823e85d0 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 fb006481a6267b690683d4c50b5f1e66c0b03eb6..68dfb9bc0cf43eba9a596032ef4e05803eec74d9 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 3a3a57dfe2cb1855fe37536a11e255d549386bd9..9033d5e5232aa17a05790a836c6900fcad70a0e6 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 536691f2fa79b5b8ae44b36d9e9e6586b4b07d67..bb26dad39e6f00b04fa8c8da894a639c2099b810 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 3a7dc1d1f72c1e544ab86bd3646da4c8d39d2fd6..fcdfee91aff7116a9f8b57876ec8ce663edc0966 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 eee03acd0279a42bc39a8b234dce15086cc7f055..79ec6a6f621c8f34aa10c4f755e99255307e77be 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 aeeda2b9d29165d6d8ff62a6d87be7d8f47a25c4..14de74a964bb3197258af77e905a6bec8537f571 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 08c0fea9cd5d1f8c9fd0acab29bf901f5dd2bd15..58af8009f41c62c66a9649d41eb9d2e28f42fcd6 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 9a101edf6687d8ec080253e09ea4e9addf52f3d9..fe0dfdd3c8c0334701c2262d1aa7719e3cbad8e2 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 84ccdc9ff5efa341568d4d8a77ed9179d88ddcee..d726b12a36a806a9eca571f34e73325d14085cd8 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 deead0c531c40dc0e5fc404c638db737c1d80f36..f2457e19234b5c4ab878c8348924245f94e375ce 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 d4124420919a353c180b422d5253793012e2e504..0e489d023f91783f02cfe8d65650917470858da0 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 2b67c76e635699967e5e876ab92c050da627458d..87008a102fe8d1e9d5cce3ef5f0ccc0c480c0dff 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 999c1479f50c475d2d518bc3c2510b53fd96657b..ad9791068c353a272ebd33922c5d01e0a5523de0 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 9af16426a6df1e55021590b2a0bd286ee798d923..32741402b09d2f6e1382b1df91737e2eeb19c2fa 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 2cf1e3d1b2510993649528027d8ef88bc4f8437e..54082e7578a7503026a0ef9cb64be2678198c304 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 ff96b0833250d52cd1930bec32b862a80f66862c..8e2b4efdcb39f2286de7a4d69d99c1490d41ba0a 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 d6258b9e9d7465f2fda3fda0463a8e5474f58141..39cbba95d4e8f0fc190cad03b7f7b2fbbd00a0c3 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 828519853ddc1672757b3147f38bb38fa98d74a2..b62935e36d95c0368e8e79def42139eca8e1275d 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 553048e9cf95e4074082f28619e1d7c71640fd31..a2162146a26856544a2a98d3b22e9f00130d0522 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 0a6c72d0ec170e3b34138cce7e9c69f6ea41c99e..0aeb4d224a2e59ba2ec694aaf00946057efeef63 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>