diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
16 files changed, 96 insertions, 88 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig index bf3caf09..7629ef35 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig | |||
@@ -21,11 +21,12 @@ | |||
21 | {% if entries is empty %} | 21 | {% if entries is empty %} |
22 | <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div> | 22 | <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div> |
23 | {% else %} | 23 | {% else %} |
24 | <div><form>{{ form_rest(form) }}<button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">Filter</button></form></div> | ||
24 | {% for entry in entries %} | 25 | {% for entry in entries %} |
25 | <div id="entry-{{ entry.id|e }}" class="entrie"> | 26 | <div id="entry-{{ entry.id|e }}" class="entry"> |
26 | <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> | 27 | <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> |
27 | {% if entry.content| readingTime > 0 %} | 28 | {% if entry.readingTime > 0 %} |
28 | <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} {{ entry.content| readingTime }} min</span></div> | 29 | <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min</span></div> |
29 | {% else %} | 30 | {% else %} |
30 | <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} <small class="inferieur"><</small> 1 min</span></div> | 31 | <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} <small class="inferieur"><</small> 1 min</span></div> |
31 | {% endif %} | 32 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig index 5ec9bc03..a39a8dc3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig | |||
@@ -17,8 +17,8 @@ | |||
17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> | 17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> |
18 | <description> | 18 | <description> |
19 | <![CDATA[ | 19 | <![CDATA[ |
20 | {%- if entry.content|readingTime > 0 -%} | 20 | {%- if entry.readingTime > 0 -%} |
21 | {% trans %}estimated reading time :{% endtrans %} {{ entry.content|readingTime }} min | 21 | {% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min |
22 | {%- else -%} | 22 | {%- else -%} |
23 | {% trans %}estimated reading time :{% endtrans %} < 1 min | 23 | {% trans %}estimated reading time :{% endtrans %} < 1 min |
24 | {%- endif %} | 24 | {%- endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig index b11512a4..95ed0785 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig | |||
@@ -3,5 +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 | {{ form(form) }} | 6 | {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} |
7 | {% endblock %} | 7 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig new file mode 100644 index 00000000..d182d552 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig | |||
@@ -0,0 +1,15 @@ | |||
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_label(form.url) }} | ||
12 | {{ form_widget(form.url) }} | ||
13 | |||
14 | <div class="hidden">{{ form_rest(form) }}</div> | ||
15 | </form> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig index f25acb5d..58cb316b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | <p>{% trans %}There are several ways to save an article:{% endtrans %}</p> | 8 | <p>{% trans %}There are several ways to save an article:{% endtrans %}</p> |
9 | <ul> | 9 | <ul> |
10 | <li><a href="{{ path('about') }}">{% trans %}Thanks to this form{% endtrans %}</a></li> | 10 | <li><a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a></li> |
11 | </ul> | 11 | </ul> |
12 | <h3>{% trans %}Browser Addons{% endtrans %}</h3> | 12 | <h3>{% trans %}Browser Addons{% endtrans %}</h3> |
13 | <ul> | 13 | <ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 162fb463..c381a08c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -72,7 +72,7 @@ | |||
72 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> | 72 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> |
73 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> | 73 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> |
74 | <li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li> | 74 | <li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li> |
75 | <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li> | 75 | <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li> |
76 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> | 76 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> |
77 | <div id="search-form" class="messages info popup-form"> | 77 | <div id="search-form" class="messages info popup-form"> |
78 | <form method="get" action="index.php"> | 78 | <form method="get" action="index.php"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css index e3069b86..ffd9d022 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css | |||
@@ -121,7 +121,7 @@ a:visited { | |||
121 | font-size: 1.3em; | 121 | font-size: 1.3em; |
122 | } | 122 | } |
123 | 123 | ||
124 | #main #content .entrie { | 124 | #main #content .entry { |
125 | margin-top: 15px; | 125 | margin-top: 15px; |
126 | padding-bottom: 15px; | 126 | padding-bottom: 15px; |
127 | border-bottom: 1px dashed #222; | 127 | border-bottom: 1px dashed #222; |
@@ -129,19 +129,19 @@ a:visited { | |||
129 | } | 129 | } |
130 | 130 | ||
131 | /* First entry */ | 131 | /* First entry */ |
132 | #main #content .results + .entrie { | 132 | #main #content .results + .entry { |
133 | clear: both; | 133 | clear: both; |
134 | margin-top: 0; | 134 | margin-top: 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | #main .entrie .tools { | 137 | #main .entry .tools { |
138 | float: right; | 138 | float: right; |
139 | text-align: right; | 139 | text-align: right; |
140 | list-style-type: none; | 140 | list-style-type: none; |
141 | opacity: 0.5; | 141 | opacity: 0.5; |
142 | } | 142 | } |
143 | 143 | ||
144 | #main .entrie .tools .tool span { | 144 | #main .entry .tools .tool span { |
145 | display: inline-block; | 145 | display: inline-block; |
146 | width: 16px; | 146 | width: 16px; |
147 | height: 16px; | 147 | height: 16px; |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css index e2844ccc..6090face 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css | |||
@@ -322,7 +322,7 @@ footer a { | |||
322 | letter-spacing:-5px; | 322 | letter-spacing:-5px; |
323 | } | 323 | } |
324 | 324 | ||
325 | .listmode .entrie { | 325 | .listmode .entry { |
326 | width: 100%!important; | 326 | width: 100%!important; |
327 | margin-left: 0!important; | 327 | margin-left: 0!important; |
328 | } | 328 | } |
@@ -343,7 +343,7 @@ footer a { | |||
343 | top: -1px; | 343 | top: -1px; |
344 | } | 344 | } |
345 | 345 | ||
346 | .entrie { | 346 | .entry { |
347 | background-color: #FFF; | 347 | background-color: #FFF; |
348 | letter-spacing:normal; | 348 | letter-spacing:normal; |
349 | box-shadow: 0 3px 7px rgba(0,0,0,0.3); | 349 | box-shadow: 0 3px 7px rgba(0,0,0,0.3); |
@@ -366,7 +366,7 @@ footer a { | |||
366 | /* transition: all 0.5s ease; */ | 366 | /* transition: all 0.5s ease; */ |
367 | } | 367 | } |
368 | 368 | ||
369 | .entrie:before { | 369 | .entry:before { |
370 | content: ""; | 370 | content: ""; |
371 | width: 0; | 371 | width: 0; |
372 | height: 0; | 372 | height: 0; |
@@ -384,7 +384,7 @@ footer a { | |||
384 | transition: all 0.5s ease; | 384 | transition: all 0.5s ease; |
385 | } | 385 | } |
386 | 386 | ||
387 | .entrie:after { | 387 | .entry:after { |
388 | content: ""; | 388 | content: ""; |
389 | position: absolute; | 389 | position: absolute; |
390 | height: 7px; | 390 | height: 7px; |
@@ -399,34 +399,34 @@ footer a { | |||
399 | transition: all 0.5s ease; | 399 | transition: all 0.5s ease; |
400 | } | 400 | } |
401 | 401 | ||
402 | .entrie:hover { | 402 | .entry:hover { |
403 | box-shadow: 0 3px 10px rgba(0,0,0,1); | 403 | box-shadow: 0 3px 10px rgba(0,0,0,1); |
404 | } | 404 | } |
405 | 405 | ||
406 | .entrie:hover:after { | 406 | .entry:hover:after { |
407 | height: 40px; | 407 | height: 40px; |
408 | } | 408 | } |
409 | 409 | ||
410 | .entrie:hover:before { | 410 | .entry:hover:before { |
411 | bottom: 2.4em; | 411 | bottom: 2.4em; |
412 | } | 412 | } |
413 | 413 | ||
414 | .entrie:hover h2 a { | 414 | .entry:hover h2 a { |
415 | color: #666; | 415 | color: #666; |
416 | } | 416 | } |
417 | 417 | ||
418 | .entrie h2 { | 418 | .entry h2 { |
419 | text-transform: none; | 419 | text-transform: none; |
420 | margin-bottom: 0; | 420 | margin-bottom: 0; |
421 | line-height: 1.2; | 421 | line-height: 1.2; |
422 | } | 422 | } |
423 | 423 | ||
424 | .entrie h2:after { | 424 | .entry h2:after { |
425 | content: none; | 425 | content: none; |
426 | } | 426 | } |
427 | 427 | ||
428 | 428 | ||
429 | .entrie h2 a { | 429 | .entry h2 a { |
430 | display: block; | 430 | display: block; |
431 | text-decoration: none; | 431 | text-decoration: none; |
432 | color: #000; | 432 | color: #000; |
@@ -438,7 +438,7 @@ footer a { | |||
438 | transition: all 0.5s ease; | 438 | transition: all 0.5s ease; |
439 | } | 439 | } |
440 | /* | 440 | /* |
441 | .entrie h2 a:after { | 441 | .entry h2 a:after { |
442 | content: ""; | 442 | content: ""; |
443 | position: absolute; | 443 | position: absolute; |
444 | top: 0; | 444 | top: 0; |
@@ -448,21 +448,21 @@ footer a { | |||
448 | } | 448 | } |
449 | */ | 449 | */ |
450 | 450 | ||
451 | .entrie p { | 451 | .entry p { |
452 | color: #666; | 452 | color: #666; |
453 | font-size: 0.9em; | 453 | font-size: 0.9em; |
454 | line-height: 1.7; | 454 | line-height: 1.7; |
455 | } | 455 | } |
456 | 456 | ||
457 | .entrie h2 a:first-letter { | 457 | .entry h2 a:first-letter { |
458 | text-transform: uppercase; | 458 | text-transform: uppercase; |
459 | } | 459 | } |
460 | 460 | ||
461 | .entrie:hover .tools { | 461 | .entry:hover .tools { |
462 | bottom: 0; | 462 | bottom: 0; |
463 | } | 463 | } |
464 | 464 | ||
465 | .entrie .tools { | 465 | .entry .tools { |
466 | position: absolute; | 466 | position: absolute; |
467 | bottom: -50px; | 467 | bottom: -50px; |
468 | left: 0; | 468 | left: 0; |
@@ -477,22 +477,22 @@ footer a { | |||
477 | transition: all 0.5s ease; | 477 | transition: all 0.5s ease; |
478 | } | 478 | } |
479 | 479 | ||
480 | .entrie .tools a { | 480 | .entry .tools a { |
481 | color: #666; | 481 | color: #666; |
482 | text-decoration: none; | 482 | text-decoration: none; |
483 | display: block; | 483 | display: block; |
484 | padding: 0.4em; | 484 | padding: 0.4em; |
485 | } | 485 | } |
486 | 486 | ||
487 | .entrie .tools a:hover { | 487 | .entry .tools a:hover { |
488 | color: #FFF; | 488 | color: #FFF; |
489 | } | 489 | } |
490 | 490 | ||
491 | .entrie .tools li { | 491 | .entry .tools li { |
492 | display: inline-block; | 492 | display: inline-block; |
493 | } | 493 | } |
494 | 494 | ||
495 | .entrie:nth-child(3n+1) { | 495 | .entry:nth-child(3n+1) { |
496 | margin-left: 0; | 496 | margin-left: 0; |
497 | } | 497 | } |
498 | 498 | ||
@@ -941,13 +941,13 @@ pre code { | |||
941 | ========================================================================== */ | 941 | ========================================================================== */ |
942 | 942 | ||
943 | @media screen and (max-width: 1050px) { | 943 | @media screen and (max-width: 1050px) { |
944 | .entrie { | 944 | .entry { |
945 | width: 49%; | 945 | width: 49%; |
946 | } | 946 | } |
947 | .entrie:nth-child(3n+1) { | 947 | .entry:nth-child(3n+1) { |
948 | margin-left: 1.5%; | 948 | margin-left: 1.5%; |
949 | } | 949 | } |
950 | .entrie:nth-child(2n+1) { | 950 | .entry:nth-child(2n+1) { |
951 | margin-left: 0; | 951 | margin-left: 0; |
952 | } | 952 | } |
953 | } | 953 | } |
@@ -962,7 +962,7 @@ pre code { | |||
962 | } | 962 | } |
963 | 963 | ||
964 | @media screen and (max-width: 700px) { | 964 | @media screen and (max-width: 700px) { |
965 | .entrie { | 965 | .entry { |
966 | width: 100%; | 966 | width: 100%; |
967 | margin-left: 0; | 967 | margin-left: 0; |
968 | } | 968 | } |
@@ -972,7 +972,7 @@ pre code { | |||
972 | } | 972 | } |
973 | 973 | ||
974 | @media screen and (max-width: 500px) { | 974 | @media screen and (max-width: 500px) { |
975 | .entrie { | 975 | .entry { |
976 | width: 100%; | 976 | width: 100%; |
977 | margin-left: 0; | 977 | margin-left: 0; |
978 | } | 978 | } |
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 | }); |