diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
8 files changed, 43 insertions, 51 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> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig index 7d7fea6f..9750f8ba 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig | |||
@@ -43,6 +43,9 @@ | |||
43 | {{ form_rest(form) }} | 43 | {{ form_rest(form) }} |
44 | </form> | 44 | </form> |
45 | </div> | 45 | </div> |
46 | <div class="center"> | ||
47 | <a href="{{ path('login') }}">{% trans %}Back to login{% endtrans %}</a> | ||
48 | </div> | ||
46 | </div> | 49 | </div> |
47 | </main> | 50 | </main> |
48 | <style> | 51 | <style> |
@@ -53,4 +56,4 @@ | |||
53 | {% endblock %} | 56 | {% endblock %} |
54 | 57 | ||
55 | {% block footer %} | 58 | {% block footer %} |
56 | {% endblock %} \ No newline at end of file | 59 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 245d14e3..6f98ba99 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | 21 | ||
22 | <div id="set1" class="col s12"> | 22 | <div id="set1" class="col s12"> |
23 | <a href="{{ path('about') }}">{% trans %}Thanks to this form{% endtrans %}</a> | 23 | <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a> |
24 | </div> | 24 | </div> |
25 | 25 | ||
26 | 26 | ||
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 2b32c2f9..5a1f7001 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -58,7 +58,7 @@ | |||
58 | </div> | 58 | </div> |
59 | <div class="input-field nav-panel-buttom"> | 59 | <div class="input-field nav-panel-buttom"> |
60 | <ul> | 60 | <ul> |
61 | <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li> | 61 | <li class="bold"><a class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li> |
62 | <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a> | 62 | <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a> |
63 | </ul> | 63 | </ul> |
64 | </div> | 64 | </div> |
@@ -69,6 +69,11 @@ | |||
69 | <i class="mdi-navigation-close"></i> | 69 | <i class="mdi-navigation-close"></i> |
70 | </div> | 70 | </div> |
71 | </form> | 71 | </form> |
72 | <div class="input-field nav-panel-add" style="display: none"> | ||
73 | {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} | ||
74 | <label for="add"><i class="mdi-content-add"></i></label> | ||
75 | <i class="mdi-navigation-close"></i> | ||
76 | </div> | ||
72 | <!--<form name="entry" method="post" action="{{ path('new_entry') }}"> | 77 | <!--<form name="entry" method="post" action="{{ path('new_entry') }}"> |
73 | <div class="input-field nav-panel-add" style="display: none"> | 78 | <div class="input-field nav-panel-add" style="display: none"> |
74 | <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}"> | 79 | <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}"> |
@@ -113,4 +118,4 @@ | |||
113 | </div> | 118 | </div> |
114 | </div> | 119 | </div> |
115 | </footer> | 120 | </footer> |
116 | {% endblock %} \ No newline at end of file | 121 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/print.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/print.css index 9dd6d295..2a799c44 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/print.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/print.css | |||
@@ -25,7 +25,7 @@ body > footer, | |||
25 | div.tools, | 25 | div.tools, |
26 | header div, | 26 | header div, |
27 | .messages, | 27 | .messages, |
28 | .entrie + .results { | 28 | .entry + .results { |
29 | display: none !important; | 29 | display: none !important; |
30 | } | 30 | } |
31 | 31 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js index eee3903e..9341cb5a 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js | |||
@@ -6,21 +6,23 @@ $(document).ready(function(){ | |||
6 | accordion : false | 6 | accordion : false |
7 | }); | 7 | }); |
8 | 8 | ||
9 | //$('#nav-btn-add').click(function(){ | 9 | $('#nav-btn-add').click(function(){ |
10 | // $(".nav-panel-buttom").hide(100); | 10 | $(".nav-panel-buttom").hide(100); |
11 | // $(".nav-panel-add").show(100); | 11 | $(".nav-panel-add").show(100); |
12 | // $(".nav-panel-menu").hide(100); | 12 | $(".nav-panel-menu").hide(100); |
13 | // $(".nav-panels .action").hide(100); | 13 | $(".nav-panels .action").hide(100); |
14 | // $(".nav-panel-menu").addClass('hidden'); | 14 | $(".nav-panel-menu").addClass('hidden'); |
15 | // $(".nav-panels").css('background', 'white'); | 15 | $(".nav-panels").css('background', 'white'); |
16 | // return false; | 16 | $("#entry_url").focus(); |
17 | //}); | 17 | return false; |
18 | }); | ||
18 | $('#nav-btn-search').click(function(){ | 19 | $('#nav-btn-search').click(function(){ |
19 | $(".nav-panel-buttom").hide(100); | 20 | $(".nav-panel-buttom").hide(100); |
20 | $(".nav-panel-search").show(100); | 21 | $(".nav-panel-search").show(100); |
21 | $(".nav-panels .action").hide(100); | 22 | $(".nav-panels .action").hide(100); |
22 | $(".nav-panel-menu").addClass('hidden'); | 23 | $(".nav-panel-menu").addClass('hidden'); |
23 | $(".nav-panels").css('background', 'white'); | 24 | $(".nav-panels").css('background', 'white'); |
25 | $("#searchfield").focus(); | ||
24 | return false; | 26 | return false; |
25 | }); | 27 | }); |
26 | $('.mdi-navigation-close').click(function(){ | 28 | $('.mdi-navigation-close').click(function(){ |
@@ -32,4 +34,4 @@ $(document).ready(function(){ | |||
32 | $(".nav-panels").css('background', 'transparent'); | 34 | $(".nav-panels").css('background', 'transparent'); |
33 | return false; | 35 | return false; |
34 | }); | 36 | }); |
35 | }); \ No newline at end of file | 37 | }); |