diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')
3 files changed, 18 insertions, 36 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index fbdc1ffd..b9f1be49 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -18,6 +18,7 @@ | |||
18 | {% if entries is not empty %} | 18 | {% if entries is not empty %} |
19 | <div class="results clearfix"> | 19 | <div class="results clearfix"> |
20 | <div class="nb-results left">{{ entries.count }} {% trans %}entries{% endtrans %}</div> | 20 | <div class="nb-results left">{{ entries.count }} {% trans %}entries{% endtrans %}</div> |
21 | <div class="left"><form>{{ form_rest(form) }}<button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">Filter</button></form></div> | ||
21 | <ul class="pagination right"> | 22 | <ul class="pagination right"> |
22 | {% for p in range(1, entries.nbPages) %} | 23 | {% for p in range(1, entries.nbPages) %} |
23 | <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> | 24 | <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> |
@@ -38,8 +39,8 @@ | |||
38 | <div class="card"> | 39 | <div class="card"> |
39 | <div class="card-content"> | 40 | <div class="card-content"> |
40 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> | 41 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> |
41 | {% if entry.content| readingTime > 0 %} | 42 | {% if entry.readingTime > 0 %} |
42 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} {{ entry.content| readingTime }} min</span></div> | 43 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} {{ entry.readingTime }} min</span></div> |
43 | {% else %} | 44 | {% else %} |
44 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur"><</small> 1 min</span></div> | 45 | <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur"><</small> 1 min</span></div> |
45 | {% endif %} | 46 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig index cac9a96b..95ed0785 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig | |||
@@ -3,38 +3,5 @@ | |||
3 | {% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} | 3 | {% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | <div class="row"> | 6 | {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} |
7 | <div class="col s12"> | ||
8 | <div class="card-panel"> | ||
9 | |||
10 | <form name="entry" method="post" action=""> | ||
11 | <div class="card-content"> | ||
12 | |||
13 | {% if form_errors(form) %} | ||
14 | <span class="black-text">{{ form_errors(form) }}</span> | ||
15 | {% endif %} | ||
16 | |||
17 | {% if form_errors(form.url) %} | ||
18 | <span class="black-text">{{ form_errors(form.url) }}</span> | ||
19 | {% endif %} | ||
20 | |||
21 | <div class="input-field s12"> | ||
22 | {{ form_label(form.url) }} | ||
23 | {{ form_widget(form.url) }} | ||
24 | </div> | ||
25 | |||
26 | <button class="btn waves-effect waves-light" type="submit" name="entry[save]"> | ||
27 | {% trans %}Save{% endtrans %} | ||
28 | <i class="mdi-content-send right"></i> | ||
29 | </button> | ||
30 | </div> | ||
31 | <div class="hidden">{{ form_rest(form) }}</div> | ||
32 | </form> | ||
33 | |||
34 | |||
35 | {{ form(form) }} | ||
36 | |||
37 | </div> | ||
38 | </div> | ||
39 | </div> | ||
40 | {% endblock %} | 7 | {% endblock %} |
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 new file mode 100644 index 00000000..1a3ab86d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig | |||
@@ -0,0 +1,14 @@ | |||
1 | <form name="entry" method="post" action="{{ path('new_entry')}}"> | ||
2 | |||
3 | {% if form_errors(form) %} | ||
4 | <span class="black-text">{{ form_errors(form) }}</span> | ||
5 | {% endif %} | ||
6 | |||
7 | {% if form_errors(form.url) %} | ||
8 | <span class="black-text">{{ form_errors(form.url) }}</span> | ||
9 | {% endif %} | ||
10 | |||
11 | {{ form_widget(form.url) }} | ||
12 | |||
13 | <div class="hidden">{{ form_rest(form) }}</div> | ||
14 | </form> | ||