diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |
parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 58 |
1 files changed, 26 insertions, 32 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index f1ef01df..d9fb5d73 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -19,8 +19,6 @@ | |||
19 | Materialize.toast('{{ flashMessage|trans }}', 4000); | 19 | Materialize.toast('{{ flashMessage|trans }}', 4000); |
20 | </script> | 20 | </script> |
21 | {% endfor %} | 21 | {% endfor %} |
22 | |||
23 | {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} | ||
24 | {% endblock %} | 22 | {% endblock %} |
25 | 23 | ||
26 | {% block menu %} | 24 | {% block menu %} |
@@ -82,37 +80,33 @@ | |||
82 | {% block title %} | 80 | {% block title %} |
83 | {% endblock %} | 81 | {% endblock %} |
84 | </div> | 82 | </div> |
85 | <div class="input-field nav-panel-buttom"> | 83 | <ul class="input-field nav-panel-buttom"> |
86 | <ul> | 84 | <li class="bold"> |
87 | <li class="bold"> | 85 | <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add"> |
88 | <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add"> | 86 | <i class="material-icons">add</i> |
89 | <i class="material-icons">add</i> | 87 | </a> |
90 | </a> | 88 | </li> |
91 | </li> | 89 | <li> |
92 | <!--<li> | 90 | <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.search'|trans }}" href="javascript: void(null);" id="nav-btn-search"> |
93 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> | 91 | <i class="material-icons">search</i> |
94 | <i class="material-icons">search</i> | 92 | </a> |
95 | </a> | 93 | </li> |
96 | </li>--> | 94 | <li id="button_filters"> |
97 | <li id="button_filters"> | 95 | <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> |
98 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> | 96 | <i class="material-icons">filter_list</i> |
99 | <i class="material-icons">filter_list</i> | 97 | </a> |
100 | </a> | 98 | </li> |
101 | </li> | 99 | <li id="button_export"> |
102 | <li id="button_export"> | 100 | <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export"> |
103 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export"> | 101 | <i class="material-icons">file_download</i> |
104 | <i class="material-icons">file_download</i> | 102 | </a> |
105 | </a> | 103 | </li> |
106 | </li> | 104 | </ul> |
107 | </ul> | 105 | <div class="input-field nav-panel-search" style="display: none"> |
106 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} | ||
107 | <label for="search" class="active"><i class="material-icons search">search</i></label> | ||
108 | <i class="material-icons close">clear</i> | ||
108 | </div> | 109 | </div> |
109 | <form method="get" action="index.php"> | ||
110 | <div class="input-field nav-panel-search" style="display: none"> | ||
111 | <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> | ||
112 | <label for="search"><i class="material-icons search">search</i></label> | ||
113 | <i class="material-icons close">clear</i> | ||
114 | </div> | ||
115 | </form> | ||
116 | <div class="input-field nav-panel-add" style="display: none"> | 110 | <div class="input-field nav-panel-add" style="display: none"> |
117 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 111 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
118 | <label for="add" class="active"><i class="material-icons add">add</i></label> | 112 | <label for="add" class="active"><i class="material-icons add">add</i></label> |