From 13d5b0b22fa0936bb8f4c6e053698b29bae07beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=AF=D0=BA=D0=BE=D0=B2=D0=BB=D0=B5=D0=B2?= <vlad309523@gmail.com> Date: Fri, 30 Sep 2016 10:47:34 +0300 Subject: [PATCH] Fix footer dublicate Add RestAPI link --- ~dev_rating/application/views/base.twig | 11 +---------- ~dev_rating/application/views/errors/http.twig | 8 ++------ ~dev_rating/application/views/footer.twig | 11 +++++++++++ ~dev_rating/application/views/sign.twig | 11 +---------- 4 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 ~dev_rating/application/views/footer.twig diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig index 98bdb7bb8..bb93487c5 100644 --- a/~dev_rating/application/views/base.twig +++ b/~dev_rating/application/views/base.twig @@ -146,16 +146,7 @@ {% block main_content %}{% endblock %} </div> </div> - <div class="footer"> - <div class="altFooter"> - {{ HTML.anchor('instructions.pdf', 'Руководство пользователя Сервиса БРС (.pdf)', {'title': 'Открыть руководство', 'target': 'blank'})|raw }} | - {{ HTML.anchor('http://rtf.sfedu.ru/content/pri/pri_248-OD.pdf', 'Положение о порядке применения БРС (.pdf)', {'target': 'blank'})|raw }} - </div> - - <div class="dev"> - <a href="https://vk.com/itlab_mmcs" target="_blank">IT-лаборатория мехмата ЮФУ © 2014 — {{ 'now'|date('Y') }}</a> - </div> - </div> + {% include 'footer' %} </div> </div> {% include 'popup/sign' %} diff --git a/~dev_rating/application/views/errors/http.twig b/~dev_rating/application/views/errors/http.twig index 66f2ffd1e..7ead0d973 100644 --- a/~dev_rating/application/views/errors/http.twig +++ b/~dev_rating/application/views/errors/http.twig @@ -32,12 +32,8 @@ <div><a href="{{ link }}" style='font-size: 1em; color: #0183ce; text-decoration: none;'>Вернуться на главную страницу</a></div> </div> </div> - <div class="footer"> - <div class="dev"> - <a href="https://vk.com/itlab_mmcs" target="_blank">IT-лаборатория мехмата ЮФУ © 2014</a> - </div> - </div> + {% include '../footer' %} </div> </div> </body> -</html> \ No newline at end of file +</html> diff --git a/~dev_rating/application/views/footer.twig b/~dev_rating/application/views/footer.twig new file mode 100644 index 000000000..a68209756 --- /dev/null +++ b/~dev_rating/application/views/footer.twig @@ -0,0 +1,11 @@ +<div class="footer"> + <div class="altFooter"> + {{ HTML.anchor('instructions.pdf', 'Руководство пользователя Сервиса БРС (.pdf)', {'title': 'Открыть руководство', 'target': 'blank'})|raw }} | + {{ HTML.anchor('http://rtf.sfedu.ru/content/pri/pri_248-OD.pdf', 'Положение о порядке применения БРС (.pdf)', {'target': 'blank'})|raw }} | + {{ HTML.anchor('restapi', 'REST API', {'target': 'blanfk'})|raw }} + </div> + + <div class="dev"> + <a href="https://vk.com/itlab_mmcs" target="_blank">IT-лаборатория мехмата ЮФУ © 2014 — {{ 'now'|date('Y') }}</a> + </div> +</div> diff --git a/~dev_rating/application/views/sign.twig b/~dev_rating/application/views/sign.twig index 072990775..3458943fc 100644 --- a/~dev_rating/application/views/sign.twig +++ b/~dev_rating/application/views/sign.twig @@ -82,19 +82,10 @@ {% endfor %} </div> </div> - - </div> - </div> - <div class="footer"> - <div class="altFooter"> - {{ HTML.anchor('instructions.pdf', 'Руководство пользователя Сервиса БРС (.pdf)', {'title': 'Скачать руководство', 'target': '_blank'})|raw }} | - {{ HTML.anchor('http://rtf.sfedu.ru/content/pri/pri_248-OD.pdf', 'Положение о порядке применения БРС (.pdf)', {'target': '_blank'})|raw }} - </div> - <div class="dev"> - <a href="https://vk.com/itlab_mmcs" target="_blank">IT-лаборатория мехмата ЮФУ © 2014</a> </div> </div> + {% include 'footer' %} </div> </div> </body> -- GitLab