diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')
6 files changed, 74 insertions, 74 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig index c002c4c3..1c5e2aab 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig | |||
@@ -1,6 +1,6 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{% trans %}Edit an entry{% endtrans %}{% endblock %} | 3 | {% block title %}{{ 'entry.edit.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | 6 | ||
@@ -10,7 +10,6 @@ | |||
10 | 10 | ||
11 | <form name="entry" method="post" action=""> | 11 | <form name="entry" method="post" action=""> |
12 | <div class="card-content"> | 12 | <div class="card-content"> |
13 | |||
14 | {% if form_errors(form) %} | 13 | {% if form_errors(form) %} |
15 | <span class="black-text">{{ form_errors(form) }}</span> | 14 | <span class="black-text">{{ form_errors(form) }}</span> |
16 | {% endif %} | 15 | {% endif %} |
@@ -25,16 +24,19 @@ | |||
25 | </div> | 24 | </div> |
26 | 25 | ||
27 | <div class="input-field s12"> | 26 | <div class="input-field s12"> |
27 | {{ form_label(form.url) }} | ||
28 | {{ form_widget(form.url) }} | ||
29 | </div> | ||
30 | |||
31 | <div class="input-field s12"> | ||
28 | {{ form_widget(form.is_public) }} | 32 | {{ form_widget(form.is_public) }} |
29 | {{ form_label(form.is_public) }} | 33 | {{ form_label(form.is_public) }} |
30 | </div> | 34 | </div> |
31 | <br> | 35 | <br> |
32 | <button class="btn waves-effect waves-light" type="submit" name="entry[save]"> | 36 | |
33 | {% trans %}Save{% endtrans %} | 37 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
34 | <i class="mdi-content-send right"></i> | ||
35 | </button> | ||
36 | </div> | 38 | </div> |
37 | <div class="hidden">{{ form_rest(form) }}</div> | 39 | {{ form_rest(form) }} |
38 | </form> | 40 | </form> |
39 | 41 | ||
40 | </div> | 42 | </div> |
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 371992df..433b1cae 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 | |||
@@ -4,13 +4,13 @@ | |||
4 | {% set currentRoute = app.request.attributes.get('_route') %} | 4 | {% set currentRoute = app.request.attributes.get('_route') %} |
5 | 5 | ||
6 | {% if currentRoute == 'starred' %} | 6 | {% if currentRoute == 'starred' %} |
7 | {% trans %}starred{% endtrans %} | 7 | {{ 'entry.page_titles.starred'|trans }} |
8 | {% elseif currentRoute == 'archive' %} | 8 | {% elseif currentRoute == 'archive' %} |
9 | {% trans %}archive{% endtrans %} | 9 | {{ 'entry.page_titles.archived'|trans }} |
10 | {% elseif currentRoute == 'all' %} | 10 | {% elseif currentRoute == 'all' %} |
11 | {% trans %}Filtered{% endtrans %} | 11 | {{ 'entry.page_titles.filtered'|trans }} |
12 | {% else %} | 12 | {% else %} |
13 | {% trans %}unread{% endtrans %} | 13 | {{ 'entry.page_titles.unread'|trans }} |
14 | {% endif %} | 14 | {% endif %} |
15 | 15 | ||
16 | {% endblock %} | 16 | {% endblock %} |
@@ -18,7 +18,9 @@ | |||
18 | {% block content %} | 18 | {% block content %} |
19 | {% block pager %} | 19 | {% block pager %} |
20 | <div class="results clearfix"> | 20 | <div class="results clearfix"> |
21 | <div class="nb-results left">{% transchoice entries.count %}{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.{% endtranschoice %}</div> | 21 | <div class="nb-results left"> |
22 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | ||
23 | </div> | ||
22 | <ul class="pagination right"> | 24 | <ul class="pagination right"> |
23 | {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %} | 25 | {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %} |
24 | <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> | 26 | <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> |
@@ -52,9 +54,9 @@ | |||
52 | <span class="tool reading-time"> | 54 | <span class="tool reading-time"> |
53 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 55 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
54 | {% if readingTime > 0 %} | 56 | {% if readingTime > 0 %} |
55 | {% trans with {'%readingTime%': readingTime } %}estimated reading time: %readingTime% min{% endtrans %} | 57 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime}) }} |
56 | {% else %} | 58 | {% else %} |
57 | {% trans with {'%inferior%': '<small class="inferieur"><</small>'} %}estimated reading time: %inferior% 1 min{% endtrans %} | 59 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} |
58 | {% endif %} | 60 | {% endif %} |
59 | </span> | 61 | </span> |
60 | </div> | 62 | </div> |
@@ -72,7 +74,7 @@ | |||
72 | 74 | ||
73 | <div class="estimatedTime grey-text"> | 75 | <div class="estimatedTime grey-text"> |
74 | <span class="tool reading-time"> | 76 | <span class="tool reading-time"> |
75 | {% trans %}estimated reading time{% endtrans %}: | 77 | {{ 'entry.list.reading_time'|trans }} |
76 | {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur"><</small> 1{% endif %} min | 78 | {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur"><</small> 1{% endif %} min |
77 | </span> | 79 | </span> |
78 | </div> | 80 | </div> |
@@ -82,13 +84,15 @@ | |||
82 | {% endif %} | 84 | {% endif %} |
83 | 85 | ||
84 | <div class="card-action"> | 86 | <div class="card-action"> |
85 | <span class="bold"><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a></bold> | 87 | <span class="bold"> |
88 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a> | ||
89 | </bold> | ||
86 | 90 | ||
87 | <ul class="tools links right"> | 91 | <ul class="tools links right"> |
88 | <li> | 92 | <li> |
89 | <a title="{% trans %}Toggle mark as read{% endtrans %}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> | 93 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> |
90 | <a title="{% trans %}Toggle favorite{% endtrans %}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> | 94 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> |
91 | <a title="{% trans %}Delete{% endtrans %}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> | 95 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> |
92 | </li> | 96 | </li> |
93 | </ul> | 97 | </ul> |
94 | </div> | 98 | </div> |
@@ -103,7 +107,7 @@ | |||
103 | {% if currentRoute == 'homepage' %} | 107 | {% if currentRoute == 'homepage' %} |
104 | {% set currentRoute = 'unread' %} | 108 | {% set currentRoute = 'unread' %} |
105 | {% endif %} | 109 | {% endif %} |
106 | <h4 class="center">{% trans %}Export{% endtrans %}</h4> | 110 | <h4 class="center">{{ 'entry.list.export_title'|trans }}</h4> |
107 | <ul> | 111 | <ul> |
108 | {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">EPUB</a></li>{% endif %} | 112 | {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">EPUB</a></li>{% endif %} |
109 | {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">MOBI</a></li>{% endif %} | 113 | {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">MOBI</a></li>{% endif %} |
@@ -119,34 +123,34 @@ | |||
119 | <div id="filters" class="side-nav fixed right-aligned"> | 123 | <div id="filters" class="side-nav fixed right-aligned"> |
120 | <form action="{{ path('all') }}"> | 124 | <form action="{{ path('all') }}"> |
121 | 125 | ||
122 | <h4 class="center">{% trans %}Filters{% endtrans %}</h4> | 126 | <h4 class="center">{{ 'entry.filters.title'|trans }}</h4> |
123 | 127 | ||
124 | <div class="row"> | 128 | <div class="row"> |
125 | <div class="col s12"> | 129 | <div class="col s12"> |
126 | <label>{% trans %}Status{% endtrans %}</label> | 130 | <label>{{ 'entry.filters.status_label'|trans }}</label> |
127 | </div> | 131 | </div> |
128 | 132 | ||
129 | <div class="input-field col s6 with-checkbox"> | 133 | <div class="input-field col s6 with-checkbox"> |
130 | {{ form_widget(form.isArchived) }} | 134 | {{ form_widget(form.isArchived) }} |
131 | <label for="entry_filter_isArchived">{% trans %}Archived{% endtrans %}</label> | 135 | {{ form_label(form.isArchived) }} |
132 | </div> | 136 | </div> |
133 | 137 | ||
134 | <div class="input-field col s6 with-checkbox"> | 138 | <div class="input-field col s6 with-checkbox"> |
135 | {{ form_widget(form.isStarred) }} | 139 | {{ form_widget(form.isStarred) }} |
136 | <label for="entry_filter_isStarred">{% trans %}Starred{% endtrans %}</label> | 140 | {{ form_label(form.isStarred) }} |
137 | </div> | 141 | </div> |
138 | 142 | ||
139 | <div class="col s12"> | 143 | <div class="col s12"> |
140 | <label>{% trans %}Preview picture{% endtrans %}</label> | 144 | <label>{{ 'entry.filters.preview_picture_help'|trans }}</label> |
141 | </div> | 145 | </div> |
142 | 146 | ||
143 | <div class="input-field col s12 with-checkbox"> | 147 | <div class="input-field col s12 with-checkbox"> |
144 | {{ form_widget(form.previewPicture) }} | 148 | {{ form_widget(form.previewPicture) }} |
145 | <label for="entry_filter_previewPicture">{% trans %}Has a preview picture{% endtrans %}</label> | 149 | {{ form_label(form.previewPicture) }} |
146 | </div> | 150 | </div> |
147 | 151 | ||
148 | <div class="col s12"> | 152 | <div class="col s12"> |
149 | <label>{% trans %}Language{% endtrans %}</label> | 153 | {{ form_label(form.language) }} |
150 | </div> | 154 | </div> |
151 | 155 | ||
152 | <div class="input-field col s12"> | 156 | <div class="input-field col s12"> |
@@ -154,43 +158,42 @@ | |||
154 | </div> | 158 | </div> |
155 | 159 | ||
156 | <div class="col s12"> | 160 | <div class="col s12"> |
157 | <label>{% trans %}Reading time in minutes{% endtrans %}</label> | 161 | {{ form_label(form.readingTime) }} |
158 | </div> | 162 | </div> |
159 | <div class="input-field col s6"> | 163 | <div class="input-field col s6"> |
160 | {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} | 164 | {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} |
161 | <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label> | 165 | <label for="entry_filter_readingTime_left_number">{{ 'entry.filters.reading_time.from'|trans }}</label> |
162 | </div> | 166 | </div> |
163 | <div class="input-field col s6"> | 167 | <div class="input-field col s6"> |
164 | {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} | 168 | {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} |
165 | <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label> | 169 | <label for="entry_filter_readingTime_right_number">{{ 'entry.filters.reading_time.to'|trans }}</label> |
166 | </div> | 170 | </div> |
167 | 171 | ||
168 | <div class="input-field col s12"> | 172 | <div class="input-field col s12"> |
169 | {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com' | trans} }) }} | 173 | {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }} |
170 | <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label> | 174 | {{ form_label(form.domainName) }} |
171 | </div> | 175 | </div> |
172 | 176 | ||
173 | <div class="col s12"> | 177 | <div class="col s12"> |
174 | <label>{% trans %}Creation date{% endtrans %}</label> | 178 | {{ form_label(form.createdAt) }} |
175 | </div> | 179 | </div> |
176 | 180 | ||
177 | <div class="input-field col s6"> | 181 | <div class="input-field col s6"> |
178 | {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }} | 182 | {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }} |
179 | <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label> | 183 | <label for="entry_filter_createdAt_left_date" class="active">{{ 'entry.filters.created_at.from'|trans }}</label> |
180 | </div> | 184 | </div> |
181 | <div class="input-field col s6"> | 185 | <div class="input-field col s6"> |
182 | {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }} | 186 | {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }} |
183 | <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label> | 187 | <label for="entry_filter_createdAt_right_date" class="active">{{ 'entry.filters.created_at.to'|trans }}</label> |
184 | </div> | 188 | </div> |
185 | 189 | ||
186 | <div class="col s6"> | 190 | <div class="col s6"> |
187 | <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a> | 191 | <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{{ 'entry.filters.action.clear'|trans }}</a> |
188 | </div> | 192 | </div> |
189 | 193 | ||
190 | <div class="col s6"> | 194 | <div class="col s6"> |
191 | <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filter{% endtrans %}</button> | 195 | <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button> |
192 | </div> | 196 | </div> |
193 | |||
194 | </div> | 197 | </div> |
195 | 198 | ||
196 | </form> | 199 | </form> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig index a39a8dc3..98f7194c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig | |||
@@ -18,9 +18,9 @@ | |||
18 | <description> | 18 | <description> |
19 | <![CDATA[ | 19 | <![CDATA[ |
20 | {%- if entry.readingTime > 0 -%} | 20 | {%- if entry.readingTime > 0 -%} |
21 | {% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min | 21 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} |
22 | {%- else -%} | 22 | {%- else -%} |
23 | {% trans %}estimated reading time :{% endtrans %} < 1 min | 23 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} |
24 | {%- endif %} | 24 | {%- endif %} |
25 | 25 | ||
26 | {{ entry.content|raw -}} | 26 | {{ entry.content|raw -}} |
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 6f33da23..4eebf18f 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 | |||
@@ -2,6 +2,8 @@ | |||
2 | 2 | ||
3 | {% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %} | 3 | {% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %} |
4 | 4 | ||
5 | {% block body_class %}entry{% endblock %} | ||
6 | |||
5 | {% block menu %} | 7 | {% block menu %} |
6 | <div class="progress"> | 8 | <div class="progress"> |
7 | <div class="determinate"></div> | 9 | <div class="determinate"></div> |
@@ -17,12 +19,12 @@ | |||
17 | </ul> | 19 | </ul> |
18 | <ul class="right"> | 20 | <ul class="right"> |
19 | <li> | 21 | <li> |
20 | <a class="waves-effect" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 22 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
21 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> | 23 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> |
22 | </a> | 24 | </a> |
23 | </li> | 25 | </li> |
24 | <li> | 26 | <li> |
25 | <a class="waves-effect" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
26 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> | 28 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> |
27 | </a> | 29 | </a> |
28 | </li> | 30 | </li> |
@@ -38,7 +40,7 @@ | |||
38 | <li class="bold border-bottom hide-on-med-and-down"> | 40 | <li class="bold border-bottom hide-on-med-and-down"> |
39 | <a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> | 41 | <a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> |
40 | <i class="mdi-action-exit-to-app small"></i> | 42 | <i class="mdi-action-exit-to-app small"></i> |
41 | <span>{% trans %}back{% endtrans %}</span> | 43 | <span>{{ 'entry.view.left_menu.back_to_homepage'|trans }}</span> |
42 | </a> | 44 | </a> |
43 | <div class="collapsible-body"></div> | 45 | <div class="collapsible-body"></div> |
44 | </li> | 46 | </li> |
@@ -46,38 +48,38 @@ | |||
46 | <li class="bold border-bottom hide-on-med-and-down"> | 48 | <li class="bold border-bottom hide-on-med-and-down"> |
47 | <a class="waves-effect collapsible-header" href="{{ entry.url|e }}"> | 49 | <a class="waves-effect collapsible-header" href="{{ entry.url|e }}"> |
48 | <i class="mdi-content-link small"></i> | 50 | <i class="mdi-content-link small"></i> |
49 | <span>{% trans %}original article{% endtrans %}</span> | 51 | <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span> |
50 | </a> | 52 | </a> |
51 | <div class="collapsible-body"></div> | 53 | <div class="collapsible-body"></div> |
52 | </li> | 54 | </li> |
53 | 55 | ||
54 | <li class="bold hide-on-med-and-down"> | 56 | <li class="bold hide-on-med-and-down"> |
55 | <a class="waves-effect collapsible-header" title="{% trans %}Re-fetch content{% endtrans %}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> | 57 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> |
56 | <i class="mdi-action-autorenew small"></i> | 58 | <i class="mdi-action-autorenew small"></i> |
57 | <span>{% trans %}Re-fetch content{% endtrans %}</span> | 59 | <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span> |
58 | </a> | 60 | </a> |
59 | <div class="collapsible-body"></div> | 61 | <div class="collapsible-body"></div> |
60 | </li> | 62 | </li> |
61 | 63 | ||
62 | <li class="bold hide-on-med-and-down"> | 64 | <li class="bold hide-on-med-and-down"> |
63 | <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 65 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
64 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> | 66 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> |
65 | <span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span> | 67 | <span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span> |
66 | </a> | 68 | </a> |
67 | <div class="collapsible-body"></div> | 69 | <div class="collapsible-body"></div> |
68 | </li> | 70 | </li> |
69 | 71 | ||
70 | <li class="bold hide-on-med-and-down"> | 72 | <li class="bold hide-on-med-and-down"> |
71 | <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 73 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
72 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> | 74 | <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> |
73 | <span>{% trans %}Favorite{% endtrans %}</span> | 75 | <span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span> |
74 | </a> | 76 | </a> |
75 | <div class="collapsible-body"></div> | 77 | <div class="collapsible-body"></div> |
76 | </li> | 78 | </li> |
77 | <li class="bold border-bottom hide-on-med-and-down"> | 79 | <li class="bold border-bottom hide-on-med-and-down"> |
78 | <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 80 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
79 | <i class="mdi-action-delete small"></i> | 81 | <i class="mdi-action-delete small"></i> |
80 | <span>{% trans %}Delete{% endtrans %}</span> | 82 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
81 | </a> | 83 | </a> |
82 | <div class="collapsible-body"></div> | 84 | <div class="collapsible-body"></div> |
83 | </li> | 85 | </li> |
@@ -85,7 +87,7 @@ | |||
85 | <li class="bold border-bottom hide-on-med-and-down"> | 87 | <li class="bold border-bottom hide-on-med-and-down"> |
86 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> | 88 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> |
87 | <i class="mdi-action-label-outline small"></i> | 89 | <i class="mdi-action-label-outline small"></i> |
88 | <span>{% trans %}Add a tag{% endtrans %}</span> | 90 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> |
89 | </a> | 91 | </a> |
90 | <div class="collapsible-body"></div> | 92 | <div class="collapsible-body"></div> |
91 | </li> | 93 | </li> |
@@ -93,7 +95,7 @@ | |||
93 | <li class="bold"> | 95 | <li class="bold"> |
94 | <a class="waves-effect collapsible-header"> | 96 | <a class="waves-effect collapsible-header"> |
95 | <i class="mdi-social-share small"></i> | 97 | <i class="mdi-social-share small"></i> |
96 | <span>{% trans %}Share{% endtrans %}</span> | 98 | <span>{{ 'entry.view.left_menu.share_content'|trans }}</span> |
97 | </a> | 99 | </a> |
98 | <div class="collapsible-body"> | 100 | <div class="collapsible-body"> |
99 | <ul> | 101 | <ul> |
@@ -127,8 +129,8 @@ | |||
127 | {% endif %} | 129 | {% endif %} |
128 | {% if craue_setting('share_mail') %} | 130 | {% if craue_setting('share_mail') %} |
129 | <li> | 131 | <li> |
130 | <a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"> | 132 | <a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{{ 'entry.view.left_menu.share_email_label'|trans }}"> |
131 | <span>{% trans %}Email{% endtrans %}</span> | 133 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> |
132 | </a> | 134 | </a> |
133 | </li> | 135 | </li> |
134 | {% endif %} | 136 | {% endif %} |
@@ -139,7 +141,7 @@ | |||
139 | <li class="bold"> | 141 | <li class="bold"> |
140 | <a class="waves-effect collapsible-header"> | 142 | <a class="waves-effect collapsible-header"> |
141 | <i class="mdi-file-file-download small"></i> | 143 | <i class="mdi-file-file-download small"></i> |
142 | <span>{% trans %}Download{% endtrans %}</span> | 144 | <span>{{ 'entry.view.left_menu.download'|trans }}</span> |
143 | </a> | 145 | </a> |
144 | <div class="collapsible-body"> | 146 | <div class="collapsible-body"> |
145 | <ul> | 147 | <ul> |
@@ -155,40 +157,33 @@ | |||
155 | </li> | 157 | </li> |
156 | 158 | ||
157 | <li class="bold hide-on-large-only"> | 159 | <li class="bold hide-on-large-only"> |
158 | <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 160 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
159 | <i class="mdi-action-delete small"></i> | 161 | <i class="mdi-action-delete small"></i> |
160 | <span>{% trans %}Delete{% endtrans %}</span> | 162 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
161 | </a> | 163 | </a> |
162 | <div class="collapsible-body"></div> | 164 | <div class="collapsible-body"></div> |
163 | </li> | 165 | </li> |
164 | 166 | ||
165 | <li class="bold"> | 167 | <li class="bold"> |
166 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}"> | 168 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> |
167 | <i class="mdi-alert-error small"></i> | 169 | <i class="mdi-alert-error small"></i> |
168 | <span>{% trans %}Problems?{% endtrans %}</span> | 170 | <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> |
169 | </a> | 171 | </a> |
170 | <div class="collapsible-body"></div> | 172 | <div class="collapsible-body"></div> |
171 | </li> | 173 | </li> |
172 | 174 | ||
173 | </ul> | 175 | </ul> |
174 | 176 | ||
175 | <style> | ||
176 | main { | ||
177 | padding: 0; | ||
178 | } | ||
179 | </style> | ||
180 | |||
181 | {% endblock %} | 177 | {% endblock %} |
182 | 178 | ||
183 | {% block content %} | 179 | {% block content %} |
184 | <div id="article"> | 180 | <div id="article"> |
185 | <header class="mbm"> | 181 | <header class="mbm"> |
186 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1> | 182 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
187 | </header> | 183 | </header> |
188 | <aside> | 184 | <aside> |
189 | <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> | 185 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> |
190 | {% set nbAnnotations = entry.annotations | length %} | 186 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
191 | <span class="tool link mdi-communication-comment"> {% transchoice nbAnnotations %}{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations{% endtranschoice %}</span> | ||
192 | <div id="list"> | 187 | <div id="list"> |
193 | {% for tag in entry.tags %} | 188 | {% for tag in entry.tags %} |
194 | <div class="chip"> | 189 | <div class="chip"> |
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 95ed0785..03768a3d 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} | 3 | {% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} | 6 | {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} |
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 f1e56412..0cf4fb74 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 | |||
@@ -7,7 +7,7 @@ | |||
7 | <span class="black-text">{{ form_errors(form.url) }}</span> | 7 | <span class="black-text">{{ form_errors(form.url) }}</span> |
8 | {% endif %} | 8 | {% endif %} |
9 | 9 | ||
10 | {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }} | 10 | {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }} |
11 | 11 | ||
12 | <div class="hidden">{{ form_rest(form) }}</div> | 12 | {{ form_rest(form) }} |
13 | </form> | 13 | </form> |