diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2018-01-12 23:10:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-12 23:10:21 +0100 |
commit | fd637b9a5af28d432f775297ff19ba3f779d55b2 (patch) | |
tree | dc8fc13c8b09019cf0b5ac00f05a0f4a9656e5d0 /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry | |
parent | 99e8c2785b9fc0cd9cc8674cb297a13a1035238f (diff) | |
parent | 5614df19cf3ed2be9d56853e5441412d4d09cff4 (diff) | |
download | wallabag-fd637b9a5af28d432f775297ff19ba3f779d55b2.tar.gz wallabag-fd637b9a5af28d432f775297ff19ba3f779d55b2.tar.zst wallabag-fd637b9a5af28d432f775297ff19ba3f779d55b2.zip |
Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttons
Nav actions updated
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')
3 files changed, 7 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 54066e95..8abf90c1 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -9,7 +9,7 @@ | |||
9 | <div class="determinate"></div> | 9 | <div class="determinate"></div> |
10 | </div> | 10 | </div> |
11 | <nav class="hide-on-large-only"> | 11 | <nav class="hide-on-large-only"> |
12 | <div class="nav-wrapper cyan darken-1"> | 12 | <div class="nav-panel-item cyan darken-1"> |
13 | <ul> | 13 | <ul> |
14 | <li> | 14 | <li> |
15 | <a href="#" data-activates="slide-out" class="button-collapse"> | 15 | <a href="#" data-activates="slide-out" class="button-collapse"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig index 0cf4fb74..e0d5e794 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig | |||
@@ -1,13 +1,15 @@ | |||
1 | <form name="entry" method="post" action="{{ path('new_entry')}}"> | 1 | <form class="input-field nav-panel-item nav-panel-add" style="display: none" name="entry" method="post" action="{{ path('new_entry')}}"> |
2 | {% if form_errors(form) %} | 2 | {% if form_errors(form) %} |
3 | <span class="black-text">{{ form_errors(form) }}</span> | 3 | <span class="black-text">{{ form_errors(form) }}</span> |
4 | {% endif %} | 4 | {% endif %} |
5 | <button type="submit" class="nav-form-button"><i class="material-icons add">add</i></button> | ||
5 | 6 | ||
6 | {% if form_errors(form.url) %} | 7 | {% if form_errors(form.url) %} |
7 | <span class="black-text">{{ form_errors(form.url) }}</span> | 8 | <span class="black-text">{{ form_errors(form.url) }}</span> |
8 | {% endif %} | 9 | {% endif %} |
9 | 10 | ||
10 | {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }} | 11 | {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }} |
12 | <i class="material-icons close">clear</i> | ||
11 | 13 | ||
12 | {{ form_rest(form) }} | 14 | {{ form_rest(form) }} |
13 | </form> | 15 | </form> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig index f25de94d..ba1b3aac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig | |||
@@ -1,7 +1,8 @@ | |||
1 | <form name="search" method="GET" action="{{ path('search')}}"> | 1 | <form class="input-field nav-panel-item nav-panel-search" style="display: none" name="search" method="GET" action="{{ path('search')}}"> |
2 | {% if form_errors(form) %} | 2 | {% if form_errors(form) %} |
3 | <span class="black-text">{{ form_errors(form) }}</span> | 3 | <span class="black-text">{{ form_errors(form) }}</span> |
4 | {% endif %} | 4 | {% endif %} |
5 | <button type="submit" class="nav-form-button"><i class="material-icons search">search</i></button> | ||
5 | 6 | ||
6 | {% if form_errors(form.term) %} | 7 | {% if form_errors(form.term) %} |
7 | <span class="black-text">{{ form_errors(form.term) }}</span> | 8 | <span class="black-text">{{ form_errors(form.term) }}</span> |
@@ -10,6 +11,7 @@ | |||
10 | <input type="hidden" name="currentRoute" value="{{ currentRoute }}" /> | 11 | <input type="hidden" name="currentRoute" value="{{ currentRoute }}" /> |
11 | 12 | ||
12 | {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} | 13 | {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} |
14 | <i class="material-icons close">clear</i> | ||
13 | 15 | ||
14 | {{ form_rest(form) }} | 16 | {{ form_rest(form) }} |
15 | </form> | 17 | </form> |