diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-03-16 22:02:36 +0100 |
|---|---|---|
| committer | Igor Scheller <igor.scheller@igorshp.de> | 2019-11-29 18:42:20 +0100 |
| commit | 15e6740e12df3fa53c4b0f3e85e3d91590f0ef60 (patch) | |
| tree | ab90961b0e5915f35de61518f684426410a96d05 /resources | |
| parent | f8e1f8508957dfb2f4db1485f3e17358f9a72a31 (diff) | |
Twig update to > 2.11: Fixed namespaces, warnings and cleanup
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/views/layouts/parts/navbar.twig | 12 | ||||
| -rw-r--r-- | resources/views/pages/login.twig | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/resources/views/layouts/parts/navbar.twig b/resources/views/layouts/parts/navbar.twig index 0b2eee63..9045601b 100644 --- a/resources/views/layouts/parts/navbar.twig +++ b/resources/views/layouts/parts/navbar.twig @@ -1,5 +1,3 @@ -{% import _self as elements %} - {% macro toolbar_item(label, link, active_page, icon) %} <li{% if page() == active_page %} class="active"{% endif %}> <a href="{{ link }}"> @@ -36,23 +34,23 @@ <ul class="nav navbar-nav navbar-right"> {% if is_user() %} - {{ elements.toolbar_item(menuUserShiftState(user), url('shifts', {'action': 'next'}), '', 'glyphicon-time') }} + {{ _self.toolbar_item(menuUserShiftState(user), url('shifts', {'action': 'next'}), '', 'glyphicon-time') }} {% elseif has_permission_to('register') and config('registration_enabled') %} - {{ elements.toolbar_item(__('Register'), url('register'), 'register', 'glyphicon-plus') }} + {{ _self.toolbar_item(__('Register'), url('register'), 'register', 'glyphicon-plus') }} {% endif %} {% if has_permission_to('login') %} - {{ elements.toolbar_item(__('Login'), url('login'), 'login', 'glyphicon-log-in') }} + {{ _self.toolbar_item(__('Login'), url('login'), 'login', 'glyphicon-log-in') }} {% endif %} {% if is_user() and has_permission_to('user_messages') %} - {{ elements.toolbar_item(menuUserMessages(), url('user-messages'), 'user-messages', 'glyphicon-envelope') }} + {{ _self.toolbar_item(menuUserMessages(), url('user-messages'), 'user-messages', 'glyphicon-envelope') }} {% endif %} {{ menuUserHints() }} {% if has_permission_to('user_myshifts') %} - {{ elements.toolbar_item(user.name, url('users', {'action': 'view'}), 'users', 'icon icon-icon_angel') }} + {{ _self.toolbar_item(user.name, url('users', {'action': 'view'}), 'users', 'icon icon-icon_angel') }} {% endif %} <li class="dropdown"> diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig index d8a9bd4e..fdb5b116 100644 --- a/resources/views/pages/login.twig +++ b/resources/views/pages/login.twig @@ -17,7 +17,7 @@ (__('Event starts')): config('event_start'), (__('Event ends')): config('event_end'), (__('Teardown ends')): config('teardown_end') - } if date %} + } | filter(date => date) %} {% if date > date() %} <div class="col-sm-3 text-center hidden-xs"> <h4>{{ name }}</h4> |