diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-23 19:13:19 +0200 |
|---|---|---|
| committer | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-23 20:11:37 +0200 |
| commit | 66038eda14d5d4e624b6636a6156570e3e940e49 (patch) | |
| tree | 6e4b7557b7d91786ef47f22f7ddef85eed1dfb42 /resources/views/layouts/app.twig | |
| parent | 590adffa9316b98544cb8d67b03b80e44ba9c8b7 (diff) | |
| parent | 9d34f371cb9c5ab0d60bd3158678b9cc9da6cc80 (diff) | |
Merge branch 'twig-templates'
Diffstat (limited to 'resources/views/layouts/app.twig')
| -rw-r--r-- | resources/views/layouts/app.twig | 60 |
1 files changed, 17 insertions, 43 deletions
diff --git a/resources/views/layouts/app.twig b/resources/views/layouts/app.twig index aa45484d..d8f8d10f 100644 --- a/resources/views/layouts/app.twig +++ b/resources/views/layouts/app.twig @@ -11,8 +11,12 @@ <link rel="stylesheet" type="text/css" href="{{ asset('assets/theme' ~ theme ~ '.css') }}"/> <script type="text/javascript" src="{{ asset('assets/vendor.js') }}"></script> - {% if atom_feed -%} - <link href="{{ url('atom', atom_feed) }}" type="application/atom+xml" rel="alternate" title="Atom Feed"> + {% if page() in ['news', 'user-meetings', '/'] and is_user() -%} + {% set parameters = {'key': user.api_key} -%} + {% if page() == 'user-meetings' -%} + {% set parameters = parameters|merge({'meetings': 1}) -%} + {% endif %} + <link href="{{ url('atom', parameters) }}" type="application/atom+xml" rel="alternate" title="Atom Feed"> {% endif %} {% endblock %} @@ -20,54 +24,24 @@ <body> {% block body %} - <div class="navbar navbar-default navbar-fixed-top"> - {% block header %} - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" - data-toggle="collapse" data-target="#navbar-collapse-1"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="{{ url('/') }}"> - <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong> - </a> - </div> - - {% block navbar %} - <div class="collapse navbar-collapse" id="navbar-collapse-1"> - {{ menu|raw }} - {{ header_toolbar|raw }} - </div> - {% endblock %} - </div> - {% endblock %} - </div> + {% block header %} + {% include "layouts/parts/navbar.twig" %} + {% endblock %} <div class="container-fluid"> - <div class="row">{% block content %}{{ content|raw }}{% endblock %}</div> + <div class="row" id="content"> + {% block content %} + {{ content|raw }} + {% endblock %} + </div> <div class="row" id="footer"> {% block footer %} - <div class="col-md-12"> - <hr/> - <div class="text-center footer" style="margin-bottom: 10px;"> - {% block eventinfo %} - {{ event_info|raw }} - {% endblock %} - <a href="{{ config('faq_url') }}">FAQ</a> - · <a href="{{ config('contact_email') }}"> - <span class="glyphicon glyphicon-envelope"></span>Contact - </a> - · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a> - · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</a> - · <a href="{{ url('credits') }}">Credits</a> - </div> - </div> + {% include "layouts/parts/footer.twig" %} {% endblock %} </div> </div> + + {% block scripts %}{% endblock %} {% endblock %} </body> |