aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig14
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig9
2 files changed, 13 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index 955420ba..9b0503d6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -1,6 +1,9 @@
1<!DOCTYPE html>
1<html> 2<html>
2 <head> 3 <head>
4 <meta charset="utf-8">
3 <title>{{ entry.title|e|raw }}</title> 5 <title>{{ entry.title|e|raw }}</title>
6 <meta name="viewport" content="initial-scale=1.0">
4 <meta property="og:title" content="{{ entry.title|e|raw }}" /> 7 <meta property="og:title" content="{{ entry.title|e|raw }}" />
5 <meta property="og:type" content="article" /> 8 <meta property="og:type" content="article" />
6 <meta property="og:url" content="{{ app.request.uri }}" /> 9 <meta property="og:url" content="{{ app.request.uri }}" />
@@ -22,16 +25,15 @@
22 25
23 </head> 26 </head>
24 <body> 27 <body>
25 <header> 28 <header class="block">
26 <h1>{{ entry.title|e|raw }}</h1> 29 <h1>{{ entry.title|e|raw }}</h1>
27 <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div> 30 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a>
28 <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</div> 31 <p class="shared-by">{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</p>
29
30 {% if entry.previewPicture is not null %} 32 {% if entry.previewPicture is not null %}
31 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div> 33 <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" />
32 {% endif %} 34 {% endif %}
33 </header> 35 </header>
34 <article> 36 <article class="block">
35 {{ entry.content | raw }} 37 {{ entry.content | raw }}
36 </article> 38 </article>
37 </body> 39 </body>
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 9d6fb3f5..e883503e 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
@@ -21,8 +21,8 @@
21{% block content %} 21{% block content %}
22 {% set listMode = app.user.config.listMode %} 22 {% set listMode = app.user.config.listMode %}
23 {% set currentRoute = app.request.attributes.get('_route') %} 23 {% set currentRoute = app.request.attributes.get('_route') %}
24 <div class="results clearfix"> 24 <div class="results">
25 <div class="nb-results left"> 25 <div class="nb-results">
26 {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} 26 {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
27 <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a> 27 <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
28 {% if app.user.config.rssToken %} 28 {% if app.user.config.rssToken %}
@@ -34,7 +34,6 @@
34 {% endif %} 34 {% endif %}
35 </div> 35 </div>
36 36
37 <br />
38 <ul class="{% if listMode == 1 %}collection{% else %}row data{% endif %}"> 37 <ul class="{% if listMode == 1 %}collection{% else %}row data{% endif %}">
39 {% for entry in entries %} 38 {% for entry in entries %}
40 <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12"> 39 <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12">
@@ -52,7 +51,9 @@
52 </ul> 51 </ul>
53 52
54 {% if entries.getNbPages > 1 %} 53 {% if entries.getNbPages > 1 %}
55 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} 54 <div class="results">
55 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
56 </div>
56 {% endif %} 57 {% endif %}
57 58
58 <!-- Export --> 59 <!-- Export -->