From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Mar 2016 17:02:34 +0100
Subject: manage assets through npm

first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
---
 .../views/themes/baggy/Config/index.html.twig      | 84 ++++++++++++++++++
 .../views/themes/baggy/Entry/entries.html.twig     | 27 +++++-
 .../views/themes/baggy/Entry/entry.html.twig       | 99 +++-------------------
 .../views/themes/baggy/Entry/pager.html.twig       |  3 +-
 .../views/themes/baggy/Static/about.html.twig      |  1 -
 .../Resources/views/themes/baggy/layout.html.twig  | 16 +---
 .../views/themes/material/Config/index.html.twig   |  2 +-
 .../views/themes/material/Entry/entries.html.twig  | 17 ++--
 .../views/themes/material/Entry/entry.html.twig    | 74 ++++++++--------
 .../views/themes/material/layout.html.twig         | 33 +++-----
 10 files changed, 188 insertions(+), 168 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index c51f90d2..f1ed63c0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -204,6 +204,90 @@
 
         {{ form_rest(form.new_tagging_rule) }}
     </form>
+    <div class="row">
+                            <div class="input-field col s12">
+                                <h4>{{ 'config.form_rules.faq.title'|trans }}</h4>
+
+                                <h5>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h5>
+                                <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
+
+                                <h5>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h5>
+                                <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
+
+                                <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5>
+                                <p class="help">
+                                    {{ 'config.form_rules.faq.variables_available_description'|trans }}
+
+                                    <table class="bordered">
+                                        <thead>
+                                            <tr>
+                                                <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
+                                                <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                                                <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
+                                                <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                                            </tr>
+                                        </thead>
+
+                                        <tbody>
+                                            <tr>
+                                                <td>title</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
+                                                <td>&lt;=</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>url</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
+                                                <td>&lt;</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>isArchived</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
+                                                <td>=&gt;</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>isStarred</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
+                                                <td>&gt;</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>content</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
+                                                <td>=</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>language</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
+                                                <td>!=</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>mimetype</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
+                                                <td>OR</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>readingTime</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
+                                                <td>AND</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>domainName</td>
+                                                <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
+                                                <td>matches</td>
+                                                <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </p>
+                            </div>
+                        </div>
 
     <div class="row">
         <div class="input-field col s12">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index a2caaebf..8636e3be 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -34,7 +34,27 @@
         </div>
     {% endfor %}
 
-    <aside id="filter-form" class="">
+
+    <!-- Export -->
+    <aside id="download-form">
+    {% set currentRoute = app.request.attributes.get('_route') %}
+    {% if currentRoute == 'homepage' %}
+        {% set currentRoute = 'unread' %}
+    {% endif %}
+        <h2>{{ 'entry.list.export_title'|trans }}</h2>
+        <a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">&times;</a>
+        <ul>
+            {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">EPUB</a></li>{% endif %}
+            {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">MOBI</a></li>{% endif %}
+            {% if craue_setting('export_pdf') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">PDF</a></li>{% endif %}
+            {% if craue_setting('export_csv') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">JSON</a></li>{% endif %}
+            {% if craue_setting('export_json') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">CSV</a></li>{% endif %}
+            {% if craue_setting('export_txt') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">TXT</a></li>{% endif %}
+            {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">XML</a></li>{% endif %}
+        </ul>
+    </aside>
+    <!-- Filter -->
+    <aside id="filter-form">
         <form method="get" action="{{ path('all') }}">
             <h2>{{ 'entry.filters.title'|trans }}</h2>
             <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
@@ -53,6 +73,11 @@
                     {{ form_label(form.isStarred) }}
                 </div>
 
+                <div class="input-field">
+                    {{ form_widget(form.isUnread) }}
+                    {{ form_label(form.isUnread) }}
+                </div>
+
                 <div class="input-field">
                     {{ form_widget(form.previewPicture) }}
                     {{ form_label(form.previewPicture) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 5a800332..8c06cf11 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -5,7 +5,7 @@
 {% block content %}
     <div id="article">
         <header class="mbm">
-            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
+            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
         </header>
 
         <div id="article_toolbar">
@@ -30,10 +30,10 @@
         </ul>
     </div>
         {% set nbAnnotations = entry.annotations | length %}
-        <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
+        <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
         <aside class="tags">
             {% for tag in entry.tags %}
-                <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a>
+                <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a>
             {% endfor %}
             <div class="input-field nav-panel-add-tag" style="display: none">
                 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
@@ -46,87 +46,16 @@
             {{ entry.content | raw }}
         </article>
     </div>
-    <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script>
-    <script type="text/javascript">
-        $(document).ready(function() {
-
-            // toggle read property of current article
-          /*  $('#markAsRead').click(function(){
-                $("body").css("cursor", "wait");
-                $.ajax( { url: '{{ path('archive_entry', { 'id': entry.id }) }}' }).done(
-                        function( data ) {
-                            if ( data == '1' ) {
-                                if ( $('#markAsRead').hasClass("archive-off") ) {
-                                    $('#markAsRead').removeClass("archive-off");
-                                    $('#markAsRead').addClass("archive");
-                                }
-                                else {
-                                    $('#markAsRead').removeClass("archive");
-                                    $('#markAsRead').addClass("archive-off");
-                                }
-                            }
-                            else {
-                                alert('Error! Pls check if you are logged in.');
-                            }
-                        });
-                $("body").css("cursor", "auto");
-            });*/
-
-            // toggle favorite property of current article
-          /*  $('#setFav').click(function(){
-                $("body").css("cursor", "wait");
-                $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done(
-                        function( data ) {
-                            if ( data == '1' ) {
-                                if ( $('#setFav').hasClass("fav-off") ) {
-                                    $('#setFav').removeClass("fav-off");
-                                    $('#setFav').addClass("fav");
-                                }
-                                else {
-                                    $('#setFav').removeClass("fav");
-                                    $('#setFav').addClass("fav-off");
-                                }
-                            }
-                            else {
-                                alert('Error! Pls check if you are logged in.');
-                            }
-                        });
-                $("body").css("cursor", "auto");
-            });*/
-
-            $(window).scroll(function(e){
-                var scrollTop = $(window).scrollTop();
-                var docHeight = $(document).height();
-                var scrollPercent = (scrollTop) / (docHeight);
-                var scrollPercentRounded = Math.round(scrollPercent*100)/100;
-                savePercent({{ entry.id }}, scrollPercentRounded);
-            });
-
-            retrievePercent({{ entry.id }});
-
-            $(window).resize(function(){
-                retrievePercent({{ entry.id }});
-            });
-        });
-
-        var app = new annotator.App();
-        app.include(annotator.ui.main, {
-            element: document.querySelector('article')
-        });
-        app.include(annotator.storage.http, {
-            prefix: '',
-            urls: {
-                create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}',
-                update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}',
-                destroy: '{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}',
-                search: '{{ path('annotations_get_annotations', { 'entry': entry.id }) }}'
-            }
-        });
-        app
-            .start()
-            .then(function () {
-                app.annotations.load({entry: {{ entry.id }}});
-            });
+    <script id="annotationroutes" type="application/json">
+    {
+        "prefix": "",
+        "urls": {
+            "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}",
+            "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}",
+            "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}",
+            "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}"
+        },
+        "entryId": "{{ entry.id }}"
+    }
     </script>
-
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
index ac74676a..faaa21a8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
@@ -2,7 +2,8 @@
     <div class="results">
         <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
         <div class="pagination">
-            <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
+            <i class="btn-clickable download-btn material-icons md-36">file_download</i>
+            <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
             {% if entries.getNbPages > 1 %}
                 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
             {% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
index 404d2857..918249dc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
@@ -37,7 +37,6 @@
     <p>{{ 'about.helping.description'|trans }}</p>
 
     <dl>
-        <dt>{{ 'about.helping.description'|trans }}</dt>
         <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
         <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
     </dl>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index 2c15ad95..4fd4d317 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -2,29 +2,19 @@
 
 {% block css %}
     {{ parent() }}
-
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/ratatouille.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/font.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/main.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/messages.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/print.css') }}" media="print">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/style.min.css') }}"  media="screen,projection,print"/>
 {% endblock %}
 
 {% block scripts %}
     {{ parent() }}
-
-    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/init.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/closeMessage.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/autoClose.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/saveLink.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/popupForm.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/baggy.min.js') }}"></script>
 {% endblock %}
 
 {% block header %}
     <header class="w600p center mbm">
         <h1 class="logo">
             {% block logo %}
-                <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />
+                <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" />
             {% endblock %}
         </h1>
     </header>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 5a90f227..9fb92d3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -206,7 +206,7 @@
                                         {{ 'config.form_rules.then_tag_as_label'|trans }}
                                         « {{ tagging_rule.tags|join(', ') }} »
                                         <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}">
-                                            <i class="tool grey-text delete mdi-action-delete"></i>
+                                            <i class="tool grey-text delete material-icons">delete</i>
                                         </a>
                                     </li>
                                     {% endfor %}
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 1d569226..98616635 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
@@ -32,7 +32,7 @@
 
                         <div class="card-content">
                             {% if not entry.previewPicture is null %}
-                                <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i>
+                                <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
                             {% endif %}
 
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
@@ -56,7 +56,7 @@
 
                     {% if not entry.previewPicture is null %}
                         <div class="card-reveal">
-                            <i class="card-title grey-text text-darken-4 mdi-card-close right"></i>
+                            <i class="card-title grey-text text-darken-4 material-icons right">clear</i>
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span>
 
                             <div class="estimatedTime grey-text">
@@ -74,11 +74,11 @@
                             <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>
                         </bold>
 
-                        <ul class="tools links right">
+                        <ul class="tools right">
                             <li>
-                                <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>
-                                <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>
-                                <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a>
+                                <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
+                                <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}favorite_border{% else %}favorite{% endif %}</i></a>
+                                <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
                             </li>
                         </ul>
                     </div>
@@ -126,6 +126,11 @@
                     {{ form_label(form.isStarred) }}
                 </div>
 
+                <div class="input-field col s6 with-checkbox">
+                    {{ form_widget(form.isUnread) }}
+                    {{ form_label(form.isUnread) }}
+                </div>
+
                 <div class="col s12">
                     <label>{{ 'entry.filters.preview_picture_help'|trans }}</label>
                 </div>
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 e89aea3a..7fc7a552 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
@@ -13,24 +13,24 @@
             <ul>
                 <li>
                     <a class="waves-effect" href="{{ path('homepage') }}">
-                        <i class="mdi-action-exit-to-app"></i>
+                        <i class="material-icons">exit_to_app</i>
                     </a>
                 </li>
             </ul>
             <ul class="right">
                 <li>
                     <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
-                        <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
+                        <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}"</i>
                     </a>
                 </li>
                 <li>
                     <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
-                        <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
+                        <i class="material-icons small">{% if entry.isStarred == 0 %}favorite_outline{% else %}favorite{% endif %}</i>
                     </a>
                 </li>
                 <li>
                     <a href="#" data-activates="slide-out" class="button-collapse right">
-                        <i class="mdi-navigation-menu"></i>
+                        <i class="material-icons">navigation_menu</i>
                     </a>
                 </li>
             </ul>
@@ -39,7 +39,7 @@
     <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion">
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" href="{{ path('homepage') }}">
-                <i class="mdi-action-exit-to-app small"></i>
+                <i class="material-icons small">exit_to_app</i>
                 <span>{{ 'entry.view.left_menu.back_to_homepage'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -47,7 +47,7 @@
 
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" href="{{ entry.url|e }}">
-                <i class="mdi-content-link small"></i>
+                <i class="material-icons small">link</i>
                 <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -55,7 +55,7 @@
 
         <li class="bold hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload">
-                <i class="mdi-action-autorenew small"></i>
+                <i class="material-icons small">autorenew</i>
                 <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -63,7 +63,7 @@
 
         <li class="bold hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
-                <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
+                <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i>
                 <span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -71,14 +71,14 @@
 
         <li class="bold hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
-                <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
+                <i class="material-icons spall">{% if entry.isStarred == 0 %}favorite_outline{% else %}favorite{% endif %}</i>
                 <span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
         </li>
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
-                <i class="mdi-action-delete small"></i>
+                <i class="material-icons small">delete</i>
                 <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -86,7 +86,7 @@
 
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" id="nav-btn-add-tag">
-                <i class="mdi-action-label-outline small"></i>
+                <i class="material-icons small">label_outline</i>
                 <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -94,7 +94,7 @@
 
         <li class="bold">
             <a class="waves-effect collapsible-header">
-                <i class="mdi-social-share small"></i>
+                <i class="material-icons small">share</i>
                 <span>{{ 'entry.view.left_menu.share_content'|trans }}</span>
             </a>
             <div class="collapsible-body">
@@ -129,7 +129,8 @@
                     {% endif %}
                     {% if craue_setting('share_mail') %}
                         <li>
-                            <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{{ 'entry.view.left_menu.share_email_label'|trans }}">
+                            <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}">
+                                <i class="material-icons">email</i>
                                 <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span>
                             </a>
                         </li>
@@ -141,7 +142,7 @@
         {% if craue_setting('show_printlink') %}
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();">
-                <i class="mdi-action-print small"></i>
+                <i class="material-icons small">print</i>
                 <span>{{ 'entry.view.left_menu.print'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -151,7 +152,7 @@
 
         <li class="bold">
             <a class="waves-effect collapsible-header">
-                <i class="mdi-file-file-download small"></i>
+                <i class="material-icons small">file_download</i>
                 <span>{{ 'entry.view.left_menu.download'|trans }}</span>
             </a>
             <div class="collapsible-body">
@@ -169,7 +170,7 @@
 
         <li class="bold hide-on-large-only">
             <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
-                <i class="mdi-action-delete small"></i>
+                <i class="material-icons small">delete</i>
                 <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -177,7 +178,7 @@
 
         <li class="bold">
             <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}">
-                <i class="mdi-alert-error small"></i>
+                <i class="material-icons small">error</i>
                 <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -193,12 +194,13 @@
             <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
         </header>
         <aside>
-            <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>
-            <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
+            <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
+            <span class="link"><i class="material-icons link">link</i> {{ entry.domainName|removeWww }}</span></a>
+            <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
             <div id="list">
                 {% for tag in entry.tags %}
                     <div class="chip">
-                    {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="mdi-action-delete"></i></a>
+                    {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a>
                     </div>
                 {% endfor %}
             </div>
@@ -217,27 +219,17 @@
         </article>
     </div>
 
-<script type="text/javascript">
-
-var app = new annotator.App();
-app.include(annotator.ui.main, {
-    element: document.querySelector('article')
-});
-app.include(annotator.storage.http, {
-    prefix: '',
-    urls: {
-        create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}',
-        update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}',
-        destroy: '{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}',
-        search: '{{ path('annotations_get_annotations', { 'entry': entry.id }) }}'
-    }
-});
-app
-.start()
-.then(function () {
-     app.annotations.load({entry: {{ entry.id }}});
-});
-</script>
+<script id="annotationroutes" type="application/json">
+{
+    "prefix": "",
+    "urls": {
+        "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}",
+        "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}",
+        "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}",
+        "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}"
+    },
+    "entryId": "{{ entry.id }}"
+}</script>
 
 {% endblock %}
 
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 25ad23dd..ed0ad2f6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -2,17 +2,12 @@
 
 {% block css %}
     {{ parent() }}
-
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/materialize.min.css') }}"  media="screen,projection"/>
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/main.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/print.css') }}" media="print">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/style.min.css') }}"  media="screen,projection,print"/>
 {% endblock %}
 
 {% block scripts %}
     {{ parent() }}
-
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script>
 {% endblock %}
 
 {% block header %}
@@ -31,8 +26,8 @@
         <ul id="slide-out" class="side-nav fixed">
             {% block logo %}
                 <li class="logo border-bottom">
-                    <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
-                        <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" />
+                    <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
+                        <img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }}" alt="wallabag logo" />
                     </a>
                 </li>
             {% endblock %}
@@ -76,7 +71,7 @@
             </li>
         </ul>
         <div class="nav-wrapper nav-panels">
-            <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
+            <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a>
             <div class="left action">
                 {% block title %}
                 {% endblock %}
@@ -85,22 +80,22 @@
                 <ul>
                     <li class="bold">
                         <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add">
-                            <i class="mdi-content-add"></i>
+                            <i class="material-icons">add</i>
                         </a>
                     </li>
                     <!--<li>
                         <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search">
-                            <i class="mdi-action-search"></i>
+                            <i class="material-icons">search</i>
                         </a>
                     </li>-->
                     <li id="button_filters">
                         <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right">
-                            <i class="mdi-content-filter-list"></i>
+                            <i class="material-icons">filter_list</i>
                         </a>
                     </li>
                     <li id="button_export">
-                        <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export" class="nav-panel-menu button-collapse-right">
-                            <i class="mdi-file-file-download"></i>
+                        <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export">
+                            <i class="material-icons">file_download</i>
                         </a>
                     </li>
                 </ul>
@@ -108,14 +103,14 @@
             <form method="get" action="index.php">
                 <div class="input-field nav-panel-search" style="display: none">
                     <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}">
-                    <label for="search"><i class="mdi-action-search"></i></label>
-                    <i class="mdi-navigation-close"></i>
+                    <label for="search"><i class="material-icons search">search</i></label>
+                    <i class="material-icons close">clear</i>
                 </div>
             </form>
             <div class="input-field nav-panel-add" style="display: none">
                 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
-                <label for="add" class="active"><i class="mdi-content-add"></i></label>
-                <i class="mdi-navigation-close"></i>
+                <label for="add" class="active"><i class="material-icons add">add</i></label>
+                <i class="material-icons close">clear</i>
             </div>
         </div>
     </nav>
-- 
cgit v1.2.3


From 2e24d1202727483dc93b3e6a76de4f7c0be5e3d7 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 9 Jun 2016 19:07:41 +0200
Subject: remove block added twice

---
 .../views/themes/baggy/Config/index.html.twig      | 85 ----------------------
 1 file changed, 85 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index f1ed63c0..40f0ae16 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -204,91 +204,6 @@
 
         {{ form_rest(form.new_tagging_rule) }}
     </form>
-    <div class="row">
-                            <div class="input-field col s12">
-                                <h4>{{ 'config.form_rules.faq.title'|trans }}</h4>
-
-                                <h5>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h5>
-                                <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
-
-                                <h5>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h5>
-                                <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
-
-                                <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5>
-                                <p class="help">
-                                    {{ 'config.form_rules.faq.variables_available_description'|trans }}
-
-                                    <table class="bordered">
-                                        <thead>
-                                            <tr>
-                                                <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
-                                                <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
-                                                <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
-                                                <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
-                                            </tr>
-                                        </thead>
-
-                                        <tbody>
-                                            <tr>
-                                                <td>title</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
-                                                <td>&lt;=</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>url</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
-                                                <td>&lt;</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>isArchived</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
-                                                <td>=&gt;</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>isStarred</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
-                                                <td>&gt;</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>content</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
-                                                <td>=</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>language</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
-                                                <td>!=</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>mimetype</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
-                                                <td>OR</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>readingTime</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
-                                                <td>AND</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>domainName</td>
-                                                <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
-                                                <td>matches</td>
-                                                <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </p>
-                            </div>
-                        </div>
-
     <div class="row">
         <div class="input-field col s12">
             <h3>{{ 'config.form_rules.faq.title'|trans }}</h3>
-- 
cgit v1.2.3


From 25dc07d3c9d88dcb84444d69fd0b4822315c3fac Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 23 Jun 2016 09:06:54 +0200
Subject: Add tags on entries view

Should be tested on old browsers
---
 .../views/themes/material/Entry/entries.html.twig     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 98616635..d245c8fd 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
@@ -26,6 +26,11 @@
                     <div class="card-body">
                         {% if not entry.previewPicture is null %}
                             <div class="card-image waves-effect waves-block waves-light">
+                                <ul class="card-entry-labels">
+                                {% for tag in entry.tags | slice(0, 3) %}
+                                    <li>{{ tag.label }}</li>
+                                {% endfor %}
+                                </ul>
                                 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
                             </div>
                         {% endif %}
@@ -50,6 +55,11 @@
 
                             {% if entry.previewPicture is null %}
                                 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
+                                <ul class="card-entry-labels-hidden">
+                                {% for tag in entry.tags | slice(0, 2) %}
+                                    <li>{{ tag.label }}</li>
+                                {% endfor %}
+                            </ul>
                             {% endif %}
                         </div>
                     </div>
@@ -66,6 +76,15 @@
                             </div>
 
                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
+
+                            <ul class="card-entry-labels-hidden">
+                                {% for tag in entry.tags | slice(0, 2) %}
+                                    <li>{{ tag.label }}</li>
+                                {% endfor %}
+                            </ul>
+                            {% if entry.tags | length > 2 %}
+                                {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }}
+                            {% endif %}
                         </div>
                     {% endif %}
 
-- 
cgit v1.2.3


From 91826e3ca2605d8280db16e62ebd0f2d79f4216c Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 23 Jun 2016 22:51:09 +0200
Subject: fix typo on icons

---
 .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 7fc7a552..2a5cdfac 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
@@ -20,7 +20,7 @@
             <ul class="right">
                 <li>
                     <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
-                        <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}"</i>
+                        <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i>
                     </a>
                 </li>
                 <li>
@@ -30,7 +30,7 @@
                 </li>
                 <li>
                     <a href="#" data-activates="slide-out" class="button-collapse right">
-                        <i class="material-icons">navigation_menu</i>
+                        <i class="material-icons">menu</i>
                     </a>
                 </li>
             </ul>
-- 
cgit v1.2.3


From a15022db96fb031f7a9bccbdcc9420a8ca94174c Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 23 Jun 2016 23:13:25 +0200
Subject: minor ui fixes

---
 .../Resources/views/themes/material/Entry/entries.html.twig        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 d245c8fd..d1cadea9 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
@@ -40,7 +40,7 @@
                                 <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
                             {% endif %}
 
-                            <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
+                            <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|striptags }}">{{ entry.title|striptags|raw }}</a></span>
 
                             <div class="estimatedTime grey-text">
                                 <span class="tool reading-time">
@@ -78,13 +78,10 @@
                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
 
                             <ul class="card-entry-labels-hidden">
-                                {% for tag in entry.tags | slice(0, 2) %}
+                                {% for tag in entry.tags %}
                                     <li>{{ tag.label }}</li>
                                 {% endfor %}
                             </ul>
-                            {% if entry.tags | length > 2 %}
-                                {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }}
-                            {% endif %}
                         </div>
                     {% endif %}
 
-- 
cgit v1.2.3


From 1d4d9aaf2971e5b4d00a28f935c815e88bcf1487 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 1 Jul 2016 13:59:30 +0200
Subject: Bring tags on entries view to baggy

Also, a couple of UI improvement and CSS fixing
---
 .../Resources/views/themes/baggy/Entry/entries.html.twig       | 10 ++++++++++
 .../Resources/views/themes/material/Entry/entries.html.twig    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 8636e3be..92eecb9b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -28,7 +28,17 @@
             </ul>
             {% if entry.previewPicture is null %}
                 <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                <ul class="card-entry-tags">
+                    {% for tag in entry.tags %}
+                        <li>{{ tag.label }}</li>
+                    {% endfor %}
+                </ul>
             {% else %}
+                <ul class="card-entry-labels">
+                {% for tag in entry.tags | slice(0, 3) %}
+                    <li>{{ tag.label }}</li>
+                {% endfor %}
+                </ul>
                 <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
             {% endif %}
         </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 d1cadea9..e9a2b183 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
@@ -77,7 +77,7 @@
 
                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
 
-                            <ul class="card-entry-labels-hidden">
+                            <ul class="card-entry-tags">
                                 {% for tag in entry.tags %}
                                     <li>{{ tag.label }}</li>
                                 {% endfor %}
-- 
cgit v1.2.3


From 9c545fe028013b30417c1a932cd6b9027bff752d Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 21 May 2016 18:09:38 +0200
Subject: Added name on client

- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
---
 .../Resources/views/themes/baggy/Developer/client.html.twig       | 6 ++++++
 .../views/themes/baggy/Developer/client_parameters.html.twig      | 1 +
 .../Resources/views/themes/baggy/Developer/index.html.twig        | 8 ++++----
 .../Resources/views/themes/material/Developer/client.html.twig    | 6 ++++++
 .../views/themes/material/Developer/client_parameters.html.twig   | 1 +
 .../Resources/views/themes/material/Developer/index.html.twig     | 8 ++++----
 6 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
index 78a9dc04..8a5da71a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
@@ -12,6 +12,12 @@
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
 
+                <div class="input-field col s12">
+                    {{ form_label(form.name) }}
+                    {{ form_errors(form.name) }}
+                    {{ form_widget(form.name) }}
+                </div>
+
                 <div class="input-field col s12">
                     {{ form_label(form.redirect_uris) }}
                     {{ form_errors(form.redirect_uris) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
index b615fa3b..b498cceb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
@@ -9,6 +9,7 @@
             <div class="row">
                 <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
                 <ul>
+                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
                     <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
                     <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
                 </ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
index 001c5cbb..3430c0d4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
@@ -28,7 +28,7 @@
                     <ul class="collapsible" data-collapsible="expandable">
                         {% for client in clients %}
                             <li>
-                                <div class="collapsible-header">#{{ client.id }}</div>
+                                <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
                                 <div class="collapsible-body">
                                     <table class="striped">
                                         <tr>
@@ -49,9 +49,9 @@
                                         </tr>
                                     </table>
                                     <p>
-                                        {{ 'developer.remove.warn_message_1'|trans }}<br/>
-                                        {{ 'developer.remove.warn_message_2'|trans }}<br/>
-                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans }}</a>
+                                        {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
+                                        {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
+                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
                                     </p>
                                 </div>
                             </li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
index 78a9dc04..8a5da71a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
@@ -12,6 +12,12 @@
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
 
+                <div class="input-field col s12">
+                    {{ form_label(form.name) }}
+                    {{ form_errors(form.name) }}
+                    {{ form_widget(form.name) }}
+                </div>
+
                 <div class="input-field col s12">
                     {{ form_label(form.redirect_uris) }}
                     {{ form_errors(form.redirect_uris) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
index b615fa3b..b498cceb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
@@ -9,6 +9,7 @@
             <div class="row">
                 <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
                 <ul>
+                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
                     <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
                     <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
                 </ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
index 001c5cbb..3430c0d4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
@@ -28,7 +28,7 @@
                     <ul class="collapsible" data-collapsible="expandable">
                         {% for client in clients %}
                             <li>
-                                <div class="collapsible-header">#{{ client.id }}</div>
+                                <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
                                 <div class="collapsible-body">
                                     <table class="striped">
                                         <tr>
@@ -49,9 +49,9 @@
                                         </tr>
                                     </table>
                                     <p>
-                                        {{ 'developer.remove.warn_message_1'|trans }}<br/>
-                                        {{ 'developer.remove.warn_message_2'|trans }}<br/>
-                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans }}</a>
+                                        {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
+                                        {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
+                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
                                     </p>
                                 </div>
                             </li>
-- 
cgit v1.2.3


From 891456ba9a592a200d8b23029e8f4514d9803080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 14 Apr 2016 15:03:22 +0200
Subject: Links on each tag in Tags view

---
 .../Resources/views/themes/material/Entry/entries.html.twig           | 4 +++-
 .../CoreBundle/Resources/views/themes/material/Tag/tags.html.twig     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 eca8924e..a0a0b02f 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
@@ -122,6 +122,7 @@
     </div>
 
     <!-- Filters -->
+    {% if form is not null %}
     <div id="filters" class="side-nav fixed right-aligned">
         <form action="{{ path('all') }}">
 
@@ -205,5 +206,6 @@
 
         </form>
     </div>
-    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
+    {% endif %}
+
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index d958c4b8..9495f543 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -9,7 +9,7 @@
     <br />
     <ul class="row data">
     {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li>
+        <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li>
     {% endfor %}
     </ul>
 {% endblock %}
-- 
cgit v1.2.3


From 371bcca0f6b18951a15e56daae5bca2558c01851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 20 Apr 2016 10:04:32 +0200
Subject: Translations and baggy view for tags

---
 .../views/themes/baggy/Entry/entries.html.twig     | 34 ++++++++++++++++++++--
 .../views/themes/baggy/Tag/tags.html.twig          |  2 +-
 .../views/themes/material/Entry/entries.html.twig  |  3 +-
 3 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 92eecb9b..a07285bd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,10 +1,36 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %}
+{% block title %}
+    {% set currentRoute = app.request.attributes.get('_route') %}
+
+    {% if currentRoute == 'starred' %}
+        {{ 'entry.page_titles.starred'|trans }}
+    {% elseif currentRoute == 'archive' %}
+        {{ 'entry.page_titles.archived'|trans }}
+    {% elseif currentRoute == 'all' %}
+        {{ 'entry.page_titles.filtered'|trans }}
+    {% elseif currentRoute == 'tag_entries' %}
+        {{ 'entry.page_titles.filtered_tags'|trans }}
+    {% else %}
+        {{ 'entry.page_titles.unread'|trans }}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
     {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 
+    {% block pager %}
+        <div class="results">
+            <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
+            <div class="pagination">
+                {% if form is not null %}<a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>{% endif %}
+                {% if entries.getNbPages > 1 %}
+                    {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+                {% endif %}
+            </div>
+        </div>
+    {% endblock %}
+
     {% for entry in entries %}
         <div id="entry-{{ entry.id|e }}" class="entry">
             <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2>
@@ -44,7 +70,6 @@
         </div>
     {% endfor %}
 
-
     <!-- Export -->
     <aside id="download-form">
     {% set currentRoute = app.request.attributes.get('_route') %}
@@ -63,8 +88,10 @@
             {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">XML</a></li>{% endif %}
         </ul>
     </aside>
+
     <!-- Filter -->
-    <aside id="filter-form">
+    {% if form is not null %}
+    <aside id="filter-form" class="">
         <form method="get" action="{{ path('all') }}">
             <h2>{{ 'entry.filters.title'|trans }}</h2>
             <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
@@ -145,6 +172,7 @@
             </div>
         </form>
     </aside>
+    {% endif %}
 
     {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
index 524a1d23..739e1486 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
@@ -9,7 +9,7 @@
 
     <ul>
     {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li>
+        <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li>
     {% endfor %}
     </ul>
 {% endblock %}
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 a0a0b02f..2a972e1c 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
@@ -9,10 +9,11 @@
     {{ 'entry.page_titles.archived'|trans }}
   {% elseif currentRoute == 'all' %}
     {{ 'entry.page_titles.filtered'|trans }}
+  {% elseif currentRoute == 'tag_entries' %}
+      {{ 'entry.page_titles.filtered_tags'|trans }}
   {% else %}
     {{ 'entry.page_titles.unread'|trans }}
   {% endif %}
-
 {% endblock %}
 
 {% block content %}
-- 
cgit v1.2.3


From 97e7ad4dc7bfc26cea334bc880a39e388d6848f3 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 23 Aug 2016 07:36:43 +0200
Subject: Remove duplicate pager on baggy

---
 .../Resources/views/themes/baggy/Entry/entries.html.twig   | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index a07285bd..9380e67a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -19,18 +19,6 @@
 {% block content %}
     {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 
-    {% block pager %}
-        <div class="results">
-            <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
-            <div class="pagination">
-                {% if form is not null %}<a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>{% endif %}
-                {% if entries.getNbPages > 1 %}
-                    {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-                {% endif %}
-            </div>
-        </div>
-    {% endblock %}
-
     {% for entry in entries %}
         <div id="entry-{{ entry.id|e }}" class="entry">
             <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2>
@@ -173,6 +161,4 @@
         </form>
     </aside>
     {% endif %}
-
-    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}
-- 
cgit v1.2.3


From 8315130a75c8f411f76134b6205a017409583d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 21 Apr 2016 22:30:50 +0200
Subject: Display entries number for each category

---
 .../CoreBundle/Resources/views/themes/material/layout.html.twig   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 50134357..f64c3da2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -35,16 +35,16 @@
             {% set currentRoute = app.request.attributes.get('_route') %}
 
             <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a>
+                <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }} <span class="numberItems grey-text">{{ unreadEntries }}</span></a>
             </li>
             <li class="bold {% if currentRoute == 'starred' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a>
+                <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }} <span class="numberItems grey-text">{{ starredEntries }}</span></a>
             </li>
             <li class="bold {% if currentRoute == 'archive' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a>
+                <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ archivedEntries }}</span></a>
             </li>
             <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a>
+                <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ allEntries }}</span></a>
             </li>
             <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a>
-- 
cgit v1.2.3


From f3d0cb91063840f2b05c63954d3fef3e5b8943fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Sun, 10 Apr 2016 17:33:15 +0200
Subject: Share entry with a public URL

---
 .../views/themes/material/Entry/entry.html.twig    |  8 ++++-
 .../Resources/views/themes/share.html.twig         | 39 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 5dd2afb3..b634dd40 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
@@ -99,6 +99,13 @@
             </a>
             <div class="collapsible-body">
                 <ul>
+                    {% if craue_setting('share_twitter') %}
+                        <li>
+                            <a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public">
+                                <span>public</span>
+                            </a>
+                        </li>
+                    {% endif %}
                     {% if craue_setting('share_twitter') %}
                         <li>
                             <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="twitter">
@@ -149,7 +156,6 @@
         </li>
         {% endif %}
 
-
         <li class="bold">
             <a class="waves-effect collapsible-header">
                 <i class="material-icons small">file_download</i>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
new file mode 100644
index 00000000..37ca14f1
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
@@ -0,0 +1,39 @@
+<html>
+    <head>
+        <title>{{ entry.title | raw }}</title>
+        <style>
+            body {
+                margin: 10px;
+                font-family: 'Roboto',Verdana,Geneva,sans-serif;
+                font-size: 16px;
+                color: #000;
+            }
+            header {
+                text-align: center;
+            }
+
+            header h1 {
+                font-size: 1.3em;
+            }
+
+            a,
+            a:hover,
+            a:visited {
+                color: #000;
+            }
+
+            article {
+                margin: 0 auto;
+                width: 600px;
+            }
+        </style>
+    </head>
+    <body>
+        <header>
+            <h1>{{ entry.title | raw }}</h1>
+        </header>
+        <article>
+            {{ entry.content | raw }}
+        </article>
+    </body>
+</html>
-- 
cgit v1.2.3


From d0545b6bd6edc38bf06604900b1e20a60e7c8583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Sun, 10 Apr 2016 21:48:11 +0200
Subject: Add migration

---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig      | 3 +++
 .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index ce47a677..61b871f0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -17,6 +17,9 @@
                 <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                 <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
+                {% if craue_setting('share_public') %}
+                    <li><a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public"><span>public</span></a></li>
+                {% endif %}
                 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
                 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
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 b634dd40..d05bdd08 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
@@ -99,7 +99,7 @@
             </a>
             <div class="collapsible-body">
                 <ul>
-                    {% if craue_setting('share_twitter') %}
+                    {% if craue_setting('share_public') %}
                         <li>
                             <a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public">
                                 <span>public</span>
-- 
cgit v1.2.3


From 222e09f140099f3b1b8f6db1846d35e6810d43a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 13 Apr 2016 22:26:02 +0200
Subject: Add Cache on Share Action

---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 61b871f0..aa3d6cdc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -17,9 +17,7 @@
                 <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                 <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
-                {% if craue_setting('share_public') %}
-                    <li><a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public"><span>public</span></a></li>
-                {% endif %}
+                {% if craue_setting('share_public') %}<li><a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public"><span>public</span></a></li>{% endif %}
                 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
                 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
-- 
cgit v1.2.3


From 3377c938f8e5bd6af2cd4430494f39a517a7e910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 27 Apr 2016 21:31:12 +0200
Subject: Add translations

---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig     | 2 +-
 .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index aa3d6cdc..725295c3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -17,7 +17,7 @@
                 <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                 <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
-                {% if craue_setting('share_public') %}<li><a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public"><span>public</span></a></li>{% endif %}
+                {% if craue_setting('share_public') %}<li><a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li>{% endif %}
                 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
                 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
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 d05bdd08..585e4dd5 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
@@ -101,8 +101,8 @@
                 <ul>
                     {% if craue_setting('share_public') %}
                         <li>
-                            <a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public">
-                                <span>public</span>
+                            <a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
+                                <span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
                             </a>
                         </li>
                     {% endif %}
-- 
cgit v1.2.3


From f1be7af446052c6fed7033664c6c6350f558961b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 23 Aug 2016 16:49:12 +0200
Subject: Change share entry behavior

---
 .../Resources/views/themes/material/Entry/entry.html.twig          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 585e4dd5..05bb378d 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
@@ -101,10 +101,15 @@
                 <ul>
                     {% if craue_setting('share_public') %}
                         <li>
-                            <a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
+                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
                                 <span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
                             </a>
                         </li>
+                        <li>
+                            <a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}">
+                                <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span>
+                            </a>
+                        </li>
                     {% endif %}
                     {% if craue_setting('share_twitter') %}
                         <li>
-- 
cgit v1.2.3


From 3e860ff1ce19d045b4d5af4e30bd3d56300a683c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 23 Aug 2016 16:55:49 +0200
Subject: Change links on baggy theme

---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 725295c3..6c46f91f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -17,7 +17,7 @@
                 <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                 <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
-                {% if craue_setting('share_public') %}<li><a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li>{% endif %}
+                {% if craue_setting('share_public') %}<li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li>{% endif %}
                 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
                 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
-- 
cgit v1.2.3


From 9415bc992e9e2061917f5534fac16c88036c1630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 25 Aug 2016 14:39:33 +0200
Subject: Add original link in public view of the article

---
 src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
index 37ca14f1..5979d12d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
@@ -31,6 +31,7 @@
     <body>
         <header>
             <h1>{{ entry.title | raw }}</h1>
+            <span>{{ 'entry.view.left_menu.view_original_article'|trans }}: <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span>
         </header>
         <article>
             {{ entry.content | raw }}
-- 
cgit v1.2.3


From 0a512eaf5795b49aeb2a758e6b49c5b7688375e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 25 Aug 2016 15:32:38 +0200
Subject: Remove text about original URL in public view

---
 src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
index 5979d12d..b82b3d3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
@@ -31,7 +31,7 @@
     <body>
         <header>
             <h1>{{ entry.title | raw }}</h1>
-            <span>{{ 'entry.view.left_menu.view_original_article'|trans }}: <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span>
+            <span><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span>
         </header>
         <article>
             {{ entry.content | raw }}
-- 
cgit v1.2.3


From 8e06720ff3bce85838e9ef76263d51ef8cdf1469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 25 Aug 2016 16:19:21 +0200
Subject: Add icon for public share link

---
 .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 05bb378d..eb5d88e3 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
@@ -101,7 +101,7 @@
                 <ul>
                     {% if craue_setting('share_public') %}
                         <li>
-                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
+                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="public icon-link" title="{{ 'entry.view.left_menu.public_link'|trans }}">
                                 <span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
                             </a>
                         </li>
-- 
cgit v1.2.3


From 52ef49709918809d6fbe40bc68e4ff090b84e6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 26 Aug 2016 14:26:47 +0200
Subject: Fix print / article views

---
 .../Resources/views/themes/material/Entry/entry.html.twig        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 eb5d88e3..9b587c34 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
@@ -206,17 +206,18 @@
         </header>
         <aside>
             {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
-            <span class="link mdi-action-query-builder">
+            <span class="mdi-action-query-builder"></span>
+            <span class="link">
                 {% if readingTime > 0 %}
                     {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
                 {% else %}
                     {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
                 {% endif %}
             </span>
-            <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span>
+            <span class="mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> </span> <span class="link">{{ entry.createdAt|date('Y-m-d') }}</span>
             <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
-            <span class="link"><i class="material-icons link">link</i> {{ entry.domainName|removeWww }}</span></a>
-            <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
+            <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span></a>
+            <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
             <div id="list">
                 {% for tag in entry.tags %}
                     <div class="chip">
-- 
cgit v1.2.3


From add0e14cffa6d36affc5fe2e815d069a1ecfc258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 26 Aug 2016 21:20:02 +0200
Subject: Fixed print view for baggy theme

---
 .../views/themes/baggy/Entry/entry.html.twig       | 43 ++++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 6c46f91f..675168bb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -30,29 +30,32 @@
                 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li>
             </ul>
         </div>
-        <div class="link mdi-action-today">
-            {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
-        </div>
 
-        <div class="link mdi-action-query-builder">
-            {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
-            {% if readingTime > 0 %}
-                {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }}
-            {% else %}
-                {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
-            {% endif %}
-        </div>
+        <div id="article-informations">
+            <div class="link mdi-action-today">
+                {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
+            </div>
 
-        {% set nbAnnotations = entry.annotations | length %}
-        <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
-        <aside class="tags">
-            {% for tag in entry.tags %}
-                <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a>
-            {% endfor %}
-            <div class="input-field nav-panel-add-tag" style="display: none">
-                {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
+            <div class="link mdi-action-query-builder">
+                {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
+                {% if readingTime > 0 %}
+                    {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }}
+                {% else %}
+                    {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
+                {% endif %}
             </div>
-        </aside>
+
+            {% set nbAnnotations = entry.annotations | length %}
+            <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
+            <aside class="tags">
+                {% for tag in entry.tags %}
+                    <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a>
+                {% endfor %}
+                <div class="input-field nav-panel-add-tag" style="display: none">
+                    {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
+                </div>
+            </aside>
+        </div>
         {% if entry.previewPicture is not null %}
             <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
         {% endif %}
-- 
cgit v1.2.3


From 74d68fbf25e313ef5cc8af17812387a8ae813df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 26 Aug 2016 21:26:21 +0200
Subject: Changed where page title is displayed

---
 .../CoreBundle/Resources/views/themes/_title.html.twig     | 13 +++++++++++++
 .../Resources/views/themes/baggy/Entry/entries.html.twig   | 14 +-------------
 .../views/themes/material/Entry/entries.html.twig          | 14 +-------------
 3 files changed, 15 insertions(+), 26 deletions(-)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
new file mode 100644
index 00000000..525e2a20
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
@@ -0,0 +1,13 @@
+{% set currentRoute = app.request.attributes.get('_route') %}
+
+{% if currentRoute == 'starred' %}
+    {{ 'entry.page_titles.starred'|trans }}
+{% elseif currentRoute == 'archive' %}
+    {{ 'entry.page_titles.archived'|trans }}
+{% elseif currentRoute == 'all' %}
+    {{ 'entry.page_titles.filtered'|trans }}
+{% elseif currentRoute == 'tag_entries' %}
+    {{ 'entry.page_titles.filtered_tags'|trans }}
+{% else %}
+    {{ 'entry.page_titles.unread'|trans }}
+{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 9380e67a..1554cce4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,19 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-    {% set currentRoute = app.request.attributes.get('_route') %}
-
-    {% if currentRoute == 'starred' %}
-        {{ 'entry.page_titles.starred'|trans }}
-    {% elseif currentRoute == 'archive' %}
-        {{ 'entry.page_titles.archived'|trans }}
-    {% elseif currentRoute == 'all' %}
-        {{ 'entry.page_titles.filtered'|trans }}
-    {% elseif currentRoute == 'tag_entries' %}
-        {{ 'entry.page_titles.filtered_tags'|trans }}
-    {% else %}
-        {{ 'entry.page_titles.unread'|trans }}
-    {% endif %}
+    {% include "@WallabagCore/themes/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
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 2a972e1c..a061bdc3 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
@@ -1,19 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-  {% set currentRoute = app.request.attributes.get('_route') %}
-
-  {% if currentRoute == 'starred' %}
-    {{ 'entry.page_titles.starred'|trans }}
-  {% elseif currentRoute == 'archive' %}
-    {{ 'entry.page_titles.archived'|trans }}
-  {% elseif currentRoute == 'all' %}
-    {{ 'entry.page_titles.filtered'|trans }}
-  {% elseif currentRoute == 'tag_entries' %}
-      {{ 'entry.page_titles.filtered_tags'|trans }}
-  {% else %}
-    {{ 'entry.page_titles.unread'|trans }}
-  {% endif %}
+  {% include "@WallabagCore/themes/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
-- 
cgit v1.2.3


From b6520f0b15ac35215e2d94d16a31ea971874dce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 26 Aug 2016 16:55:41 +0200
Subject: Add untagged entries Fix #1631

---
 src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig       | 2 ++
 .../CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig        | 4 ++++
 .../CoreBundle/Resources/views/themes/material/Tag/tags.html.twig     | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
index 525e2a20..d1c2f203 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
@@ -8,6 +8,8 @@
     {{ 'entry.page_titles.filtered'|trans }}
 {% elseif currentRoute == 'tag_entries' %}
     {{ 'entry.page_titles.filtered_tags'|trans }}
+{% elseif currentRoute == 'untagged' %}
+    {{ 'entry.page_titles.untagged'|trans }}
 {% else %}
     {{ 'entry.page_titles.unread'|trans }}
 {% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
index 739e1486..50043907 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
@@ -12,4 +12,8 @@
         <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li>
     {% endfor %}
     </ul>
+
+    <div>
+        <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a>
+    </div>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index 9495f543..1690633a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -12,4 +12,7 @@
         <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li>
     {% endfor %}
     </ul>
+    <div>
+        <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a>
+    </div>
 {% endblock %}
-- 
cgit v1.2.3


From a374ac0fd34d8fe6eb5540617ab3f5b0a8b81095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 30 Aug 2016 13:52:28 +0200
Subject: Fixed last merge who caused CSS/JS bugs

---
 .../CoreBundle/Resources/views/themes/material/layout.html.twig       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 6e95345c..50134357 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -7,9 +7,7 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script>
 {% endblock %}
 
 {% block header %}
-- 
cgit v1.2.3


From 209ec7cedd8bcf050223b869a54940c9f2d03899 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 1 Sep 2016 12:07:35 +0200
Subject: Add Readability to Quickstart page

---
 .../CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig  | 1 +
 .../Resources/views/themes/material/Static/quickstart.html.twig          | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
index b3d3d5a0..ea1c1cbe 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
@@ -39,6 +39,7 @@
         <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
         <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
         <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
+        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
     </ul>
 
     <h4>{{ 'quickstart.developer.title'|trans }}</h4>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
index 59dd037b..8cbf4ab4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
@@ -44,6 +44,7 @@
                         <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
                         <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
                         <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
+                        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
                     </ul>
 
                     <h4>{{ 'quickstart.developer.title'|trans }}</h4>
-- 
cgit v1.2.3


From b1e0a586e8222ca1fc59bcff0a57e2a3f8c11534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 2 Sep 2016 10:53:22 +0200
Subject: Fixed different font-size for labels in config screen Fix #1788

---
 .../CoreBundle/Resources/views/themes/material/Config/index.html.twig   | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 11b02294..bf390e89 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -196,6 +196,7 @@
                     </div>
 
                     <div id="set5" class="col s12">
+                        {% if app.user.config.taggingRules is not empty %}
                         <div class="row">
                             <div class="input-field col s12">
                                 <ul>
@@ -213,6 +214,7 @@
                                 </ul>
                             </div>
                         </div>
+                        {% endif %}
 
                         {{ form_start(form.new_tagging_rule) }}
                             {{ form_errors(form.new_tagging_rule) }}
-- 
cgit v1.2.3


From 59ddb9ae99b97a1a8fa3aa3770a4a2afef333699 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 3 Sep 2016 19:09:28 +0200
Subject: Remove Twig globals

Twig Global function are called globally. This means even on a query to the api.

Using a function we can decide when we want to call it.

Also, remove previous `COUNT(e.id)` since it doesn't work on PostgreSQL ...
---
 .../CoreBundle/Resources/views/themes/material/layout.html.twig   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 f64c3da2..06ecbf3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -35,16 +35,16 @@
             {% set currentRoute = app.request.attributes.get('_route') %}
 
             <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }} <span class="numberItems grey-text">{{ unreadEntries }}</span></a>
+                <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }} <span class="numberItems grey-text">{{ count_entries('unread') }}</span></a>
             </li>
             <li class="bold {% if currentRoute == 'starred' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }} <span class="numberItems grey-text">{{ starredEntries }}</span></a>
+                <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }} <span class="numberItems grey-text">{{ count_entries('starred') }}</span></a>
             </li>
             <li class="bold {% if currentRoute == 'archive' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ archivedEntries }}</span></a>
+                <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ count_entries('archive') }}</span></a>
             </li>
             <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ allEntries }}</span></a>
+                <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a>
             </li>
             <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a>
-- 
cgit v1.2.3


From 429d86f388da856c9d8d9a649147c5212bee4258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Sun, 4 Sep 2016 20:53:28 +0200
Subject: Added tags counter in sidebar (material theme)

---
 .../CoreBundle/Resources/views/themes/material/layout.html.twig         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 06ecbf3d..b70198da 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -47,7 +47,7 @@
                 <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a>
             </li>
             <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a>
+                <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }} <span class="numberItems grey-text">{{ count_tags() }}</span></a>
             </li>
             <li class="bold {% if currentRoute == 'config' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a>
-- 
cgit v1.2.3


From d49c88f15adfc97399e12b96283bb412b41a6d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 13 Sep 2016 20:31:06 +0200
Subject: Remove footer part

---
 .../views/themes/material/footer.html.twig         | 33 ----------------------
 1 file changed, 33 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
index 7cb19966..977f2e02 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
@@ -1,37 +1,4 @@
 <footer class="page-footer cyan darken-2">
-    <div class="container">
-        <div class="row">
-            <div class="col l6 s12">
-                <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5>
-                <p class="grey-text text-lighten-4">
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.google_play }}" title="Android">
-                        <span class="icon-android"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.ios }}" title="iOS">
-                        <span class="icon-apple"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.firefox }}" title="Firefox">
-                        <span class="icon-firefox"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.chrome }}" title="Chrome">
-                        <span class="icon-chrome"></span>
-                    </a>
-                </p>
-            </div>
-            <div class="col l4 offset-l2 s12">
-                <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5>
-                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.twitter }}" title="Twitter">
-                    <span class="icon-twitter"></span>
-                </a>
-                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.google_plus }}" title="Google+">
-                    <span class="icon-google-plus2"></span>
-                </a>
-                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.facebook }}" title="Facebook">
-                    <span class="icon-facebook2"></span>
-                </a>
-            </div>
-        </div>
-    </div>
     <div class="footer-copyright">
         <div class="container">
             <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
-- 
cgit v1.2.3


From e01a3c98d6908e95121b5ade0161f40af1b05ca6 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 13 Sep 2016 20:31:32 +0200
Subject: Display how many messages are queue

- update the docker-composer to add Redis
- add migrations
---
 .../CoreBundle/Resources/views/themes/material/layout.html.twig         | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 b70198da..23938b21 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -19,6 +19,8 @@
             Materialize.toast('{{ flashMessage|trans }}', 4000);
         </script>
     {% endfor %}
+
+    {{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
 {% endblock %}
 
 {% block menu %}
-- 
cgit v1.2.3


From e77cde4531e6fe167c2bc42f18b19c191df2beca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 15 Sep 2016 11:11:24 +0200
Subject: Remove FooterController

---
 .../CoreBundle/Resources/views/themes/material/footer.html.twig  | 8 --------
 .../CoreBundle/Resources/views/themes/material/layout.html.twig  | 9 ++++++++-
 2 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
deleted file mode 100644
index 977f2e02..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<footer class="page-footer cyan darken-2">
-    <div class="footer-copyright">
-        <div class="container">
-            <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
-            <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
-        </div>
-    </div>
-</footer>
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 b70198da..72becfa4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -117,5 +117,12 @@
 {% endblock %}
 
 {% block footer %}
-    {{ render(controller("WallabagCoreBundle:Footer:index")) }}
+    <footer class="page-footer cyan darken-2">
+        <div class="footer-copyright">
+            <div class="container">
+                <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
+                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
+            </div>
+        </div>
+    </footer>
 {% endblock %}
-- 
cgit v1.2.3


From 458beef0a95d5c56ac1d8d753078222d471d9af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 15 Sep 2016 15:32:01 +0200
Subject: Fixed label for mark as read link in entry view Fix #2286

---
 .../Resources/views/themes/baggy/Entry/entry.html.twig           | 8 +++++++-
 .../Resources/views/themes/material/Entry/entry.html.twig        | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 675168bb..bec4b70f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -13,7 +13,13 @@
                 <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li>
                 <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li>
-                <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li>
+
+                {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %}
+                {% if entry.isArchived == 0 %}
+                    {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %}
+                {% endif %}
+
+                <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                 <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
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 9b587c34..209e9e89 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
@@ -61,10 +61,15 @@
             <div class="collapsible-body"></div>
         </li>
 
+        {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %}
+        {% if entry.isArchived == 0 %}
+            {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %}
+        {% endif %}
+
         <li class="bold hide-on-med-and-down">
-            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
+            <a class="waves-effect collapsible-header" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
                 <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i>
-                <span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span>
+                <span>{{ markAsReadLabel|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
         </li>
-- 
cgit v1.2.3


From ebe0787e093f4f2934430033015d6ebad1c64dca Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 16 Sep 2016 22:22:25 +0200
Subject: Moved Pocket token to user config

---
 .../Resources/views/themes/baggy/Config/index.html.twig      | 12 ++++++++++++
 .../Resources/views/themes/material/Config/index.html.twig   | 12 ++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index f89265d4..6446cf2c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -44,6 +44,18 @@
             </div>
         </fieldset>
 
+        <fieldset class="w500p inline">
+            <div class="row">
+                {{ form_label(form.config.pocket_consumer_key) }}
+                {{ form_errors(form.config.pocket_consumer_key) }}
+                {{ form_widget(form.config.pocket_consumer_key) }}
+                <p>
+                    &raquo;
+                    <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
+                </p>
+            </div>
+        </fieldset>
+
         {{ form_rest(form.config) }}
     </form>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index bf390e89..5330c353 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -62,6 +62,18 @@
                                 </div>
                             </div>
 
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    {{ form_label(form.config.pocket_consumer_key) }}
+                                    {{ form_errors(form.config.pocket_consumer_key) }}
+                                    {{ form_widget(form.config.pocket_consumer_key) }}
+                                    <p>
+                                        &raquo;
+                                        <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
+                                    </p>
+                                </div>
+                            </div>
+
                             {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
                             {{ form_rest(form.config) }}
                         </form>
-- 
cgit v1.2.3


From 389d55f86b962a448d7a5052a5c0cf438d161c41 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 21 Sep 2016 19:51:19 +0200
Subject: fix feeds not syncing on android app

---
 .../Resources/views/themes/baggy/Entry/entries.xml.twig        | 10 +---------
 .../Resources/views/themes/material/Entry/entries.xml.twig     | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
index 6cabcf44..288bb54f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
@@ -16,15 +16,7 @@
                 <guid>{{ entry.url }}</guid>
                 <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
                 <description>
-                    <![CDATA[
-                    {%- if entry.readingTime > 0 -%}
-                        {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}
-                    {%- else -%}
-                        {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
-                    {%- endif %}
-
-                    {{ entry.content|raw -}}
-                    ]]>
+                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
                 </description>
             </item>
 
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 6cabcf44..288bb54f 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
@@ -16,15 +16,7 @@
                 <guid>{{ entry.url }}</guid>
                 <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
                 <description>
-                    <![CDATA[
-                    {%- if entry.readingTime > 0 -%}
-                        {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}
-                    {%- else -%}
-                        {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
-                    {%- endif %}
-
-                    {{ entry.content|raw -}}
-                    ]]>
+                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
                 </description>
             </item>
 
-- 
cgit v1.2.3


From c146f6940a176142084b4fc3c610d13aca60d90e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 28 Sep 2016 10:30:18 +0200
Subject: Assets work

* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
---
 .../views/themes/baggy/Entry/entries.html.twig         |  4 ++--
 .../Resources/views/themes/baggy/Entry/entry.html.twig | 18 ------------------
 .../views/themes/material/Entry/entries.html.twig      |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 1554cce4..8d841b4c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -67,7 +67,7 @@
 
     <!-- Filter -->
     {% if form is not null %}
-    <aside id="filter-form" class="">
+    <div id="filters" class="">
         <form method="get" action="{{ path('all') }}">
             <h2>{{ 'entry.filters.title'|trans }}</h2>
             <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
@@ -147,6 +147,6 @@
                 <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button>
             </div>
         </form>
-    </aside>
+    </div>
     {% endif %}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index bec4b70f..be1e3647 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -82,22 +82,4 @@
         "entryId": "{{ entry.id }}"
     }
     </script>
-    <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script>
-    <script type="text/javascript">
-        $(document).ready(function() {
-            $(window).scroll(function(e){
-                var scrollTop = $(window).scrollTop();
-                var docHeight = $(document).height();
-                var scrollPercent = (scrollTop) / (docHeight);
-                var scrollPercentRounded = Math.round(scrollPercent*100)/100;
-                savePercent({{ entry.id }}, scrollPercentRounded);
-            });
-
-            retrievePercent({{ entry.id }});
-
-            $(window).resize(function(){
-                retrievePercent({{ entry.id }});
-            });
-        });
-    </script>
 {% endblock %}
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 806a4eef..1c5057dd 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
@@ -66,7 +66,7 @@
 
                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
 
-                            <ul class="card-entry-tags">
+                            <ul class="card-entry-labels-hidden">
                                 {% for tag in entry.tags %}
                                     <li>{{ tag.label }}</li>
                                 {% endfor %}
-- 
cgit v1.2.3


From 2ff9991a1dfac0d3463662b96f529aac70c66f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 30 Sep 2016 09:38:08 +0200
Subject: Removed duplicated templates files

---
 .../Resources/views/themes/_title.html.twig        |  15 --
 .../views/themes/baggy/Developer/client.html.twig  |  37 ----
 .../baggy/Developer/client_parameters.html.twig    |  23 ---
 .../themes/baggy/Developer/howto_app.html.twig     |  63 -------
 .../views/themes/baggy/Developer/index.html.twig   |  69 --------
 .../views/themes/baggy/Entry/entries.html.twig     |   2 +-
 .../views/themes/baggy/Entry/entries.xml.twig      |  26 ---
 .../views/themes/baggy/Static/about.html.twig      | 169 -------------------
 .../views/themes/baggy/Static/howto.html.twig      |  28 ----
 .../views/themes/baggy/Static/quickstart.html.twig |  67 --------
 .../views/themes/common/Developer/client.html.twig |  37 ++++
 .../common/Developer/client_parameters.html.twig   |  23 +++
 .../themes/common/Developer/howto_app.html.twig    |  63 +++++++
 .../views/themes/common/Developer/index.html.twig  |  69 ++++++++
 .../views/themes/common/Entry/_title.html.twig     |  15 ++
 .../views/themes/common/Entry/entries.xml.twig     |  26 +++
 .../views/themes/common/Entry/share.html.twig      |  40 +++++
 .../themes/common/Mail/forgotPassword.txt.twig     |   6 +
 .../themes/common/Static/_bookmarklet.html.twig    |   1 +
 .../views/themes/common/Static/about.html.twig     | 186 +++++++++++++++++++++
 .../views/themes/common/Static/howto.html.twig     |  46 +++++
 .../themes/common/Static/quickstart.html.twig      |  77 +++++++++
 .../themes/material/Developer/client.html.twig     |  37 ----
 .../material/Developer/client_parameters.html.twig |  23 ---
 .../themes/material/Developer/howto_app.html.twig  |  63 -------
 .../themes/material/Developer/index.html.twig      |  69 --------
 .../views/themes/material/Entry/entries.html.twig  |   2 +-
 .../views/themes/material/Entry/entries.xml.twig   |  26 ---
 .../views/themes/material/Static/about.html.twig   | 186 ---------------------
 .../views/themes/material/Static/howto.html.twig   |  46 -----
 .../themes/material/Static/quickstart.html.twig    |  77 ---------
 .../Resources/views/themes/share.html.twig         |  40 -----
 32 files changed, 591 insertions(+), 1066 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
deleted file mode 100644
index d1c2f203..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{% set currentRoute = app.request.attributes.get('_route') %}
-
-{% if currentRoute == 'starred' %}
-    {{ 'entry.page_titles.starred'|trans }}
-{% elseif currentRoute == 'archive' %}
-    {{ 'entry.page_titles.archived'|trans }}
-{% elseif currentRoute == 'all' %}
-    {{ 'entry.page_titles.filtered'|trans }}
-{% elseif currentRoute == 'tag_entries' %}
-    {{ 'entry.page_titles.filtered_tags'|trans }}
-{% elseif currentRoute == 'untagged' %}
-    {{ 'entry.page_titles.untagged'|trans }}
-{% else %}
-    {{ 'entry.page_titles.unread'|trans }}
-{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
deleted file mode 100644
index 8a5da71a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.client.page_description'|trans }}</p>
-                {{ form_start(form) }}
-                {{ form_errors(form) }}
-
-                <div class="input-field col s12">
-                    {{ form_label(form.name) }}
-                    {{ form_errors(form.name) }}
-                    {{ form_widget(form.name) }}
-                </div>
-
-                <div class="input-field col s12">
-                    {{ form_label(form.redirect_uris) }}
-                    {{ form_errors(form.redirect_uris) }}
-                    {{ form_widget(form.redirect_uris) }}
-                </div>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
-                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-
-                {{ form_rest(form) }}
-            </div>
-
-        </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
deleted file mode 100644
index b498cceb..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-            <div class="row">
-                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
-                <ul>
-                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
-                </ul>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
-                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig
deleted file mode 100644
index acbc2c88..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}">
-{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
-    grant_type=password \
-    client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
-    client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
-    username=yourUsername \
-    password=yourPassw0rd</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">HTTP/1.1 200 OK
-Cache-Control: no-store, private
-Connection: close
-Content-Type: application/json
-Date: Tue, 06 Oct 2015 18:24:03 GMT
-Host: localhost:8000
-Pragma: no-cache
-X-Debug-Token: be00a1
-X-Debug-Token-Link: /profiler/be00a1
-X-Powered-By: PHP/5.5.9-1ubuntu4.13
-{
-    "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
-    "expires_in": 3600,
-    "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
-    "scope": null,
-    "token_type": "bearer"
-}</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
-    "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
-                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
-            </div>
-
-        </div>
-    </div>
-</div>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
deleted file mode 100644
index 3430c0d4..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
+++ /dev/null
@@ -1,69 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <h3>{{ 'developer.welcome_message'|trans }}</h3>
-
-                <h4>{{ 'developer.documentation'|trans }}</h4>
-
-                <ul>
-                    <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
-                    <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
-                </ul>
-
-                <h4>{{ 'developer.clients.title'|trans }}</h4>
-                <ul>
-                    <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li>
-                </ul>
-
-                <h4>{{ 'developer.existing_clients.title'|trans }}</h4>
-                {% if clients %}
-                    <ul class="collapsible" data-collapsible="expandable">
-                        {% for client in clients %}
-                            <li>
-                                <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
-                                <div class="collapsible-body">
-                                    <table class="striped">
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
-                                            <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
-                                            <td><strong><code>{{ client.secret }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_uris'|trans }}</td>
-                                            <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td>
-                                            <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td>
-                                        </tr>
-                                    </table>
-                                    <p>
-                                        {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
-                                        {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
-                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
-                                    </p>
-                                </div>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                {% else %}
-                    {{ 'developer.existing_clients.no_client'|trans }}
-                {% endif %}
-            </div>
-
-        </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 1554cce4..ffc5bec6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,7 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-    {% include "@WallabagCore/themes/_title.html.twig" %}
+    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
deleted file mode 100644
index 288bb54f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
-    <channel>
-        <title>wallabag — {{type}} feed</title>
-        <link>{{ url('unread') }}</link>
-        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
-        <generator>wallabag</generator>
-        <description>wallabag {{type}} elements</description>
-
-        {% for entry in entries %}
-
-            <item>
-                <title><![CDATA[{{ entry.title }}]]></title>
-                <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
-                <link>{{ entry.url }}</link>
-                <guid>{{ entry.url }}</guid>
-                <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
-                <description>
-                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
-                </description>
-            </item>
-
-        {% endfor %}
-
-    </channel>
-</rss>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
deleted file mode 100644
index 918249dc..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ /dev/null
@@ -1,169 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
-
-{% block content %}
-    <h2>{{ 'about.top_menu.who_behind_wallabag'|trans }}</h2>
-
-    <dl>
-        <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
-        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-        <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-
-        <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
-
-        <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
-        <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
-
-        <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
-
-        <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt>
-    </dl>
-
-    <h2>{{ 'about.top_menu.getting_help'|trans }}</h2>
-
-    <dl>
-        <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-        <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
-        <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
-
-        <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
-        <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
-    </dl>
-
-    <h2>{{ 'about.top_menu.helping'|trans }}</h2>
-
-    <p>{{ 'about.helping.description'|trans }}</p>
-
-    <dl>
-        <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
-        <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
-    </dl>
-
-    <h2>{{ 'about.top_menu.contributors'|trans }}</h2>
-    <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
-
-    <h2>{{ 'about.top_menu.third_party'|trans }}</h2>
-    <p>{{ 'about.third_party.description'|trans }}</p>
-    <table class="striped">
-        <tr>
-            <th>{{ 'about.third_party.package'|trans }}</th>
-            <th>{{ 'about.third_party.license'|trans }}</th>
-        </tr>
-        <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
-        <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/annotations</td><td>MIT</td></tr>
-        <tr><td>doctrine/cache</td><td>MIT</td></tr>
-        <tr><td>doctrine/collections</td><td>MIT</td></tr>
-        <tr><td>doctrine/common</td><td>MIT</td></tr>
-        <tr><td>doctrine/dbal</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/inflector</td><td>MIT</td></tr>
-        <tr><td>doctrine/instantiator</td><td>MIT</td></tr>
-        <tr><td>doctrine/lexer</td><td>MIT</td></tr>
-        <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr>
-        <tr><td>doctrine/orm</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr>
-        <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr>
-        <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr>
-        <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr>
-        <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr>
-        <tr><td>guzzlehttp/streams</td><td>MIT</td></tr>
-        <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/ruler</td><td>BSD-3-Clausev
-        <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
-        <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
-        <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
-        <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
-        <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
-        <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
-        <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
-        <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
-        <tr><td>jms/metadata</td><td>Apache</td></tr>
-        <tr><td>jms/parser-lib</td><td>Apache2</td></tr>
-        <tr><td>jms/serializer</td><td>Apache2</td></tr>
-        <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr>
-        <tr><td>kphoen/rulerz</td><td>MIT</td></tr>
-        <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
-        <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
-        <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
-        <tr><td>liip/theme-bundle</td><td>MIT</td></tr>
-        <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
-        <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
-        <tr><td>monolog/monolog</td><td>MIT</td></tr>
-        <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr>
-        <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr>
-        <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr>
-        <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr>
-        <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr>
-        <tr><td>paragonie/random_compat</td><td>MIT</td></tr>
-        <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr>
-        <tr><td>phpoption/phpoption</td><td>Apache2</td></tr>
-        <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr>
-        <tr><td>psr/log</td><td>MIT</td></tr>
-        <tr><td>react/promise</td><td>MIT</td></tr>
-        <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr>
-        <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr>
-        <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
-        <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr>
-        <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
-        <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
-        <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
-        <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
-        <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr>
-        <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>
-        <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr>
-        <tr><td>All of Symfony</td><td>MIT-licenced</td></tr>
-        <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr>
-        <tr><td>twig/extensions</td><td>MIT</td></tr>
-        <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr>
-        <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr>
-        <tr><td>willdurand/hateoas</td><td>MIT</td></tr>
-        <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr>
-        <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr>
-        <tr><td>willdurand/negotiation</td><td>MIT</td></tr>
-        <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr>
-        <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr>
-        <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr>
-        <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr>
-        <tr><td>phpspec/prophecy</td><td>MIT</td></tr>
-        <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sensio/generator-bundle</td><td>MIT</td></tr>
-        <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr>
-    </table>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
deleted file mode 100644
index b529a0ac..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
-
-{% block content %}
-    <h2>{{ 'howto.page_title'|trans }}</h2>
-
-    <p>{{ 'howto.page_description'|trans }}</p>
-    <ul>
-        <li><a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a></li>
-    </ul>
-    <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3>
-    <ul>
-        <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
-        <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
-    </ul>
-    <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3>
-    <ul>
-        <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
-        <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
-        <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
-    </ul>
-    <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3>
-    <p>
-    {{ 'howto.bookmarklet.description'|trans }}
-    {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
deleted file mode 100644
index ea1c1cbe..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
-
-{% block content %}
-
-    <h3>{{ 'quickstart.intro.title'|trans }}</h3>
-    <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
-    <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
-
-    <h4>{{ 'quickstart.configure.title'|trans }}</h4>
-    <ul>
-        <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
-        <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
-        <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
-    </ul>
-
-    {% if is_granted('ROLE_SUPER_ADMIN') %}
-    <h4>{{ 'quickstart.admin.title'|trans }}</h4>
-    <p>{{ 'quickstart.admin.description'|trans }}</p>
-    <ul>
-        <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
-    </ul>
-    {% endif %}
-
-    <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
-    <ul>
-        <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
-        <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
-    <p>{{ 'quickstart.migrate.description'|trans }}</p>
-    <ul>
-        <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
-        <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
-        <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
-        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.developer.title'|trans }}</h4>
-    <ul>
-        <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.docs.title'|trans }}</h4>
-    <ul>
-        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.support.title'|trans }}</h4>
-    <p>{{ 'quickstart.support.description'|trans }}</p>
-    <ul>
-        <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
-        <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
-        <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
-    </ul>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
new file mode 100644
index 00000000..8a5da71a
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
@@ -0,0 +1,37 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col s12">
+        <div class="card-panel settings">
+
+            <div class="row">
+                <p>{{ 'developer.client.page_description'|trans }}</p>
+                {{ form_start(form) }}
+                {{ form_errors(form) }}
+
+                <div class="input-field col s12">
+                    {{ form_label(form.name) }}
+                    {{ form_errors(form.name) }}
+                    {{ form_widget(form.name) }}
+                </div>
+
+                <div class="input-field col s12">
+                    {{ form_label(form.redirect_uris) }}
+                    {{ form_errors(form.redirect_uris) }}
+                    {{ form_widget(form.redirect_uris) }}
+                </div>
+
+                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
+                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+
+                {{ form_rest(form) }}
+            </div>
+
+        </div>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
new file mode 100644
index 00000000..b498cceb
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
@@ -0,0 +1,23 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col s12">
+        <div class="card-panel settings">
+            <div class="row">
+                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
+                <ul>
+                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
+                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
+                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
+                </ul>
+
+                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
+                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
new file mode 100644
index 00000000..acbc2c88
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
@@ -0,0 +1,63 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}">
+{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col s12">
+        <div class="card-panel settings">
+
+            <div class="row">
+                <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
+                <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
+                <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
+                <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
+                <p>
+                    <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
+    grant_type=password \
+    client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
+    client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
+    username=yourUsername \
+    password=yourPassw0rd</code></pre>
+                </p>
+                <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
+                <p>
+                    <pre><code class="language-bash">HTTP/1.1 200 OK
+Cache-Control: no-store, private
+Connection: close
+Content-Type: application/json
+Date: Tue, 06 Oct 2015 18:24:03 GMT
+Host: localhost:8000
+Pragma: no-cache
+X-Debug-Token: be00a1
+X-Debug-Token-Link: /profiler/be00a1
+X-Powered-By: PHP/5.5.9-1ubuntu4.13
+{
+    "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
+    "expires_in": 3600,
+    "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
+    "scope": null,
+    "token_type": "bearer"
+}</code></pre>
+                </p>
+                <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
+                <p>
+                    <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
+    "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
+                </p>
+                <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
+                <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
+                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
+            </div>
+
+        </div>
+    </div>
+</div>
+<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script>
+<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
new file mode 100644
index 00000000..3430c0d4
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
@@ -0,0 +1,69 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col s12">
+        <div class="card-panel settings">
+
+            <div class="row">
+                <h3>{{ 'developer.welcome_message'|trans }}</h3>
+
+                <h4>{{ 'developer.documentation'|trans }}</h4>
+
+                <ul>
+                    <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
+                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
+                    <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
+                </ul>
+
+                <h4>{{ 'developer.clients.title'|trans }}</h4>
+                <ul>
+                    <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li>
+                </ul>
+
+                <h4>{{ 'developer.existing_clients.title'|trans }}</h4>
+                {% if clients %}
+                    <ul class="collapsible" data-collapsible="expandable">
+                        {% for client in clients %}
+                            <li>
+                                <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
+                                <div class="collapsible-body">
+                                    <table class="striped">
+                                        <tr>
+                                            <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
+                                            <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
+                                        </tr>
+                                        <tr>
+                                            <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
+                                            <td><strong><code>{{ client.secret }}</code></strong></td>
+                                        </tr>
+                                        <tr>
+                                            <td>{{ 'developer.existing_clients.field_uris'|trans }}</td>
+                                            <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td>
+                                        </tr>
+                                        <tr>
+                                            <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td>
+                                            <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td>
+                                        </tr>
+                                    </table>
+                                    <p>
+                                        {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
+                                        {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
+                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
+                                    </p>
+                                </div>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% else %}
+                    {{ 'developer.existing_clients.no_client'|trans }}
+                {% endif %}
+            </div>
+
+        </div>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
new file mode 100644
index 00000000..d1c2f203
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
@@ -0,0 +1,15 @@
+{% set currentRoute = app.request.attributes.get('_route') %}
+
+{% if currentRoute == 'starred' %}
+    {{ 'entry.page_titles.starred'|trans }}
+{% elseif currentRoute == 'archive' %}
+    {{ 'entry.page_titles.archived'|trans }}
+{% elseif currentRoute == 'all' %}
+    {{ 'entry.page_titles.filtered'|trans }}
+{% elseif currentRoute == 'tag_entries' %}
+    {{ 'entry.page_titles.filtered_tags'|trans }}
+{% elseif currentRoute == 'untagged' %}
+    {{ 'entry.page_titles.untagged'|trans }}
+{% else %}
+    {{ 'entry.page_titles.unread'|trans }}
+{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
new file mode 100644
index 00000000..288bb54f
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
+    <channel>
+        <title>wallabag — {{type}} feed</title>
+        <link>{{ url('unread') }}</link>
+        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
+        <generator>wallabag</generator>
+        <description>wallabag {{type}} elements</description>
+
+        {% for entry in entries %}
+
+            <item>
+                <title><![CDATA[{{ entry.title }}]]></title>
+                <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
+                <link>{{ entry.url }}</link>
+                <guid>{{ entry.url }}</guid>
+                <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
+                <description>
+                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
+                </description>
+            </item>
+
+        {% endfor %}
+
+    </channel>
+</rss>
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
new file mode 100644
index 00000000..b82b3d3d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -0,0 +1,40 @@
+<html>
+    <head>
+        <title>{{ entry.title | raw }}</title>
+        <style>
+            body {
+                margin: 10px;
+                font-family: 'Roboto',Verdana,Geneva,sans-serif;
+                font-size: 16px;
+                color: #000;
+            }
+            header {
+                text-align: center;
+            }
+
+            header h1 {
+                font-size: 1.3em;
+            }
+
+            a,
+            a:hover,
+            a:visited {
+                color: #000;
+            }
+
+            article {
+                margin: 0 auto;
+                width: 600px;
+            }
+        </style>
+    </head>
+    <body>
+        <header>
+            <h1>{{ entry.title | raw }}</h1>
+            <span><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span>
+        </header>
+        <article>
+            {{ entry.content | raw }}
+        </article>
+    </body>
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig
new file mode 100644
index 00000000..631bcb88
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig
@@ -0,0 +1,6 @@
+Hello {{username}}!
+
+To reset your password - please visit {{confirmationUrl}}
+
+Regards,
+Wallabag bot
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
new file mode 100644
index 00000000..966a84db
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
@@ -0,0 +1 @@
+<a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">bag it!</a>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
new file mode 100644
index 00000000..d0b94279
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -0,0 +1,186 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel settings">
+
+                <div class="row">
+                    <div class="div_tabs col s12">
+                        <ul class="tabs">
+                        <li class="tab col s3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li>
+                        <li class="tab col s3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li>
+                        <li class="tab col s3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li>
+                        <li class="tab col s3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li>
+                        <li class="tab col s3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li>
+                        </ul>
+                    </div>
+
+                    <div id="set1" class="col s12">
+                        <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
+                        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+                        <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+                        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+                        <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
+                        <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
+                        <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
+                        <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="https://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
+                        <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt>
+                    </div>
+
+                    <div id="set2" class="col s12">
+                        <dl>
+                            <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
+                            <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
+                            <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
+
+                            <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
+                            <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
+                        </dl>
+                    </div>
+
+                    <div id="set3" class="col s12">
+                        <dl>
+                            <dt>{{ 'about.helping.description'|trans }}</dt>
+                            <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
+                            <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
+                        </dl>
+                    </div>
+
+                    <div id="set4" class="col s12">
+                        <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
+                    </div>
+
+                    <div id="set5" class="col s12">
+                        <p>{{ 'about.third_party.description'|trans }}</p>
+                        <table class="striped">
+                            <tr>
+                                <th>{{ 'about.third_party.package'|trans }}</th>
+                                <th>{{ 'about.third_party.license'|trans }}</th>
+                            </tr>
+                            <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
+                            <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
+                            <tr><td>doctrine/annotations</td><td>MIT</td></tr>
+                            <tr><td>doctrine/cache</td><td>MIT</td></tr>
+                            <tr><td>doctrine/collections</td><td>MIT</td></tr>
+                            <tr><td>doctrine/common</td><td>MIT</td></tr>
+                            <tr><td>doctrine/dbal</td><td>MIT</td></tr>
+                            <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr>
+                            <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr>
+                            <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr>
+                            <tr><td>doctrine/inflector</td><td>MIT</td></tr>
+                            <tr><td>doctrine/instantiator</td><td>MIT</td></tr>
+                            <tr><td>doctrine/lexer</td><td>MIT</td></tr>
+                            <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr>
+                            <tr><td>doctrine/orm</td><td>MIT</td></tr>
+                            <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr>
+                            <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr>
+                            <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr>
+                            <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr>
+                            <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr>
+                            <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr>
+                            <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr>
+                            <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr>
+                            <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr>
+                            <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr>
+                            <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr>
+                            <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr>
+                            <tr><td>guzzlehttp/streams</td><td>MIT</td></tr>
+                            <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/ruler</td><td>BSD-3-Clausev
+                            <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
+                            <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
+                            <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
+                            <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
+                            <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
+                            <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
+                            <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
+                            <tr><td>jms/metadata</td><td>Apache</td></tr>
+                            <tr><td>jms/parser-lib</td><td>Apache2</td></tr>
+                            <tr><td>jms/serializer</td><td>Apache2</td></tr>
+                            <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr>
+                            <tr><td>kphoen/rulerz</td><td>MIT</td></tr>
+                            <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
+                            <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
+                            <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
+                            <tr><td>liip/theme-bundle</td><td>MIT</td></tr>
+                            <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
+                            <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>monolog/monolog</td><td>MIT</td></tr>
+                            <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr>
+                            <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr>
+                            <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr>
+                            <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr>
+                            <tr><td>paragonie/random_compat</td><td>MIT</td></tr>
+                            <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr>
+                            <tr><td>phpoption/phpoption</td><td>Apache2</td></tr>
+                            <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr>
+                            <tr><td>psr/log</td><td>MIT</td></tr>
+                            <tr><td>react/promise</td><td>MIT</td></tr>
+                            <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr>
+                            <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr>
+                            <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
+                            <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr>
+                            <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
+                            <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
+                            <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
+                            <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr>
+                            <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>
+                            <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr>
+                            <tr><td>All of Symfony</td><td>MIT-licenced</td></tr>
+                            <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr>
+                            <tr><td>twig/extensions</td><td>MIT</td></tr>
+                            <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr>
+                            <tr><td>willdurand/hateoas</td><td>MIT</td></tr>
+                            <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr>
+                            <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr>
+                            <tr><td>willdurand/negotiation</td><td>MIT</td></tr>
+                            <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr>
+                            <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr>
+                            <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr>
+                            <tr><td>phpspec/prophecy</td><td>MIT</td></tr>
+                            <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr>
+                            <tr><td>sensio/generator-bundle</td><td>MIT</td></tr>
+                            <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr>
+                        </table>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
new file mode 100644
index 00000000..67a10190
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
@@ -0,0 +1,46 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel settings">
+                <p>{{ 'howto.page_description'|trans }}</p>
+
+                <div class="row">
+
+                    <div class="col s12">
+                        <a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a>
+                    </div>
+
+                    <div class="col s12">
+                        <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
+                        <ul>
+                            <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
+                            <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
+                        </ul>
+                    </div>
+
+                    <div class="col s12">
+                        <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5>
+                        <ul>
+                            <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
+                            <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
+                            <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
+                        </ul>
+                    </div>
+
+                    <div class="col s12">
+                        <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
+                        {{ 'howto.bookmarklet.description'|trans }}
+                        {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %}
+                    </div>
+
+                </div>
+
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
new file mode 100644
index 00000000..8cbf4ab4
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
@@ -0,0 +1,77 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel settings">
+
+                <div class="row">
+                    <h3>{{ 'quickstart.intro.title'|trans }}</h3>
+                    <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
+                    <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
+
+                    <h4>{{ 'quickstart.configure.title'|trans }}</h4>
+                    <ul>
+                        <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
+                        <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
+                        <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
+                    </ul>
+
+                    {% if is_granted('ROLE_SUPER_ADMIN') %}
+                    <h4>{{ 'quickstart.admin.title'|trans }}</h4>
+                    <p>{{ 'quickstart.admin.description'|trans }}</p>
+                    <ul>
+                        <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
+                    </ul>
+                    {% endif %}
+
+                    <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
+                    <ul>
+                        <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
+                        <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
+                    </ul>
+
+                    <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
+                    <p>{{ 'quickstart.migrate.description'|trans }}</p>
+                    <ul>
+                        <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
+                        <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
+                        <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
+                        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
+                    </ul>
+
+                    <h4>{{ 'quickstart.developer.title'|trans }}</h4>
+                    <ul>
+                        <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
+                    </ul>
+
+                    <h4>{{ 'quickstart.docs.title'|trans }}</h4>
+                    <ul>
+                        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
+                        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
+                        <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
+                        <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
+                        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
+                    </ul>
+
+                    <h4>{{ 'quickstart.support.title'|trans }}</h4>
+                    <p>{{ 'quickstart.support.description'|trans }}</p>
+                    <ul>
+                        <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
+                        <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
+                        <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
+                    </ul>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
deleted file mode 100644
index 8a5da71a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.client.page_description'|trans }}</p>
-                {{ form_start(form) }}
-                {{ form_errors(form) }}
-
-                <div class="input-field col s12">
-                    {{ form_label(form.name) }}
-                    {{ form_errors(form.name) }}
-                    {{ form_widget(form.name) }}
-                </div>
-
-                <div class="input-field col s12">
-                    {{ form_label(form.redirect_uris) }}
-                    {{ form_errors(form.redirect_uris) }}
-                    {{ form_widget(form.redirect_uris) }}
-                </div>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
-                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-
-                {{ form_rest(form) }}
-            </div>
-
-        </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
deleted file mode 100644
index b498cceb..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-            <div class="row">
-                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
-                <ul>
-                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
-                </ul>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
-                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig
deleted file mode 100644
index acbc2c88..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}">
-{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
-    grant_type=password \
-    client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
-    client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
-    username=yourUsername \
-    password=yourPassw0rd</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">HTTP/1.1 200 OK
-Cache-Control: no-store, private
-Connection: close
-Content-Type: application/json
-Date: Tue, 06 Oct 2015 18:24:03 GMT
-Host: localhost:8000
-Pragma: no-cache
-X-Debug-Token: be00a1
-X-Debug-Token-Link: /profiler/be00a1
-X-Powered-By: PHP/5.5.9-1ubuntu4.13
-{
-    "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
-    "expires_in": 3600,
-    "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
-    "scope": null,
-    "token_type": "bearer"
-}</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
-    "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
-                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
-            </div>
-
-        </div>
-    </div>
-</div>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
deleted file mode 100644
index 3430c0d4..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
+++ /dev/null
@@ -1,69 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <h3>{{ 'developer.welcome_message'|trans }}</h3>
-
-                <h4>{{ 'developer.documentation'|trans }}</h4>
-
-                <ul>
-                    <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
-                    <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
-                </ul>
-
-                <h4>{{ 'developer.clients.title'|trans }}</h4>
-                <ul>
-                    <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li>
-                </ul>
-
-                <h4>{{ 'developer.existing_clients.title'|trans }}</h4>
-                {% if clients %}
-                    <ul class="collapsible" data-collapsible="expandable">
-                        {% for client in clients %}
-                            <li>
-                                <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
-                                <div class="collapsible-body">
-                                    <table class="striped">
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
-                                            <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
-                                            <td><strong><code>{{ client.secret }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_uris'|trans }}</td>
-                                            <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td>
-                                            <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td>
-                                        </tr>
-                                    </table>
-                                    <p>
-                                        {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
-                                        {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
-                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
-                                    </p>
-                                </div>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                {% else %}
-                    {{ 'developer.existing_clients.no_client'|trans }}
-                {% endif %}
-            </div>
-
-        </div>
-    </div>
-</div>
-
-{% endblock %}
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 806a4eef..e889dea8 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
@@ -1,7 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-  {% include "@WallabagCore/themes/_title.html.twig" %}
+  {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
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
deleted file mode 100644
index 288bb54f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
-    <channel>
-        <title>wallabag — {{type}} feed</title>
-        <link>{{ url('unread') }}</link>
-        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
-        <generator>wallabag</generator>
-        <description>wallabag {{type}} elements</description>
-
-        {% for entry in entries %}
-
-            <item>
-                <title><![CDATA[{{ entry.title }}]]></title>
-                <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
-                <link>{{ entry.url }}</link>
-                <guid>{{ entry.url }}</guid>
-                <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
-                <description>
-                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
-                </description>
-            </item>
-
-        {% endfor %}
-
-    </channel>
-</rss>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
deleted file mode 100644
index d0b94279..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ /dev/null
@@ -1,186 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
-
-{% block content %}
-
-    <div class="row">
-        <div class="col s12">
-            <div class="card-panel settings">
-
-                <div class="row">
-                    <div class="div_tabs col s12">
-                        <ul class="tabs">
-                        <li class="tab col s3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li>
-                        </ul>
-                    </div>
-
-                    <div id="set1" class="col s12">
-                        <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
-                        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-                        <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-                        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-                        <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
-                        <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
-                        <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
-                        <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="https://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
-                        <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt>
-                    </div>
-
-                    <div id="set2" class="col s12">
-                        <dl>
-                            <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-                            <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
-                            <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
-
-                            <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
-                            <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
-                        </dl>
-                    </div>
-
-                    <div id="set3" class="col s12">
-                        <dl>
-                            <dt>{{ 'about.helping.description'|trans }}</dt>
-                            <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
-                            <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
-                        </dl>
-                    </div>
-
-                    <div id="set4" class="col s12">
-                        <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
-                    </div>
-
-                    <div id="set5" class="col s12">
-                        <p>{{ 'about.third_party.description'|trans }}</p>
-                        <table class="striped">
-                            <tr>
-                                <th>{{ 'about.third_party.package'|trans }}</th>
-                                <th>{{ 'about.third_party.license'|trans }}</th>
-                            </tr>
-                            <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
-                            <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
-                            <tr><td>doctrine/annotations</td><td>MIT</td></tr>
-                            <tr><td>doctrine/cache</td><td>MIT</td></tr>
-                            <tr><td>doctrine/collections</td><td>MIT</td></tr>
-                            <tr><td>doctrine/common</td><td>MIT</td></tr>
-                            <tr><td>doctrine/dbal</td><td>MIT</td></tr>
-                            <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr>
-                            <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr>
-                            <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr>
-                            <tr><td>doctrine/inflector</td><td>MIT</td></tr>
-                            <tr><td>doctrine/instantiator</td><td>MIT</td></tr>
-                            <tr><td>doctrine/lexer</td><td>MIT</td></tr>
-                            <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr>
-                            <tr><td>doctrine/orm</td><td>MIT</td></tr>
-                            <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr>
-                            <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr>
-                            <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr>
-                            <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr>
-                            <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr>
-                            <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr>
-                            <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr>
-                            <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr>
-                            <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr>
-                            <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr>
-                            <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr>
-                            <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr>
-                            <tr><td>guzzlehttp/streams</td><td>MIT</td></tr>
-                            <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/ruler</td><td>BSD-3-Clausev
-                            <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
-                            <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
-                            <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
-                            <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
-                            <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
-                            <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
-                            <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
-                            <tr><td>jms/metadata</td><td>Apache</td></tr>
-                            <tr><td>jms/parser-lib</td><td>Apache2</td></tr>
-                            <tr><td>jms/serializer</td><td>Apache2</td></tr>
-                            <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr>
-                            <tr><td>kphoen/rulerz</td><td>MIT</td></tr>
-                            <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
-                            <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
-                            <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
-                            <tr><td>liip/theme-bundle</td><td>MIT</td></tr>
-                            <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
-                            <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>monolog/monolog</td><td>MIT</td></tr>
-                            <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr>
-                            <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr>
-                            <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr>
-                            <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr>
-                            <tr><td>paragonie/random_compat</td><td>MIT</td></tr>
-                            <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr>
-                            <tr><td>phpoption/phpoption</td><td>Apache2</td></tr>
-                            <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr>
-                            <tr><td>psr/log</td><td>MIT</td></tr>
-                            <tr><td>react/promise</td><td>MIT</td></tr>
-                            <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr>
-                            <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr>
-                            <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
-                            <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr>
-                            <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
-                            <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
-                            <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
-                            <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr>
-                            <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>
-                            <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr>
-                            <tr><td>All of Symfony</td><td>MIT-licenced</td></tr>
-                            <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr>
-                            <tr><td>twig/extensions</td><td>MIT</td></tr>
-                            <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr>
-                            <tr><td>willdurand/hateoas</td><td>MIT</td></tr>
-                            <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr>
-                            <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr>
-                            <tr><td>willdurand/negotiation</td><td>MIT</td></tr>
-                            <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr>
-                            <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr>
-                            <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr>
-                            <tr><td>phpspec/prophecy</td><td>MIT</td></tr>
-                            <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr>
-                            <tr><td>sensio/generator-bundle</td><td>MIT</td></tr>
-                            <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr>
-                        </table>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-{% 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
deleted file mode 100644
index 6a177d6b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
-
-{% block content %}
-
-    <div class="row">
-        <div class="col s12">
-            <div class="card-panel settings">
-                <p>{{ 'howto.page_description'|trans }}</p>
-
-                <div class="row">
-
-                    <div class="col s12">
-                        <a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a>
-                    </div>
-
-                    <div class="col s12">
-                        <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
-                        <ul>
-                            <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
-                            <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
-                        </ul>
-                    </div>
-
-                    <div class="col s12">
-                        <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5>
-                        <ul>
-                            <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
-                            <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
-                            <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
-                        </ul>
-                    </div>
-
-                    <div class="col s12">
-                        <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
-                        {{ 'howto.bookmarklet.description'|trans }}
-                        {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-    </div>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
deleted file mode 100644
index 8cbf4ab4..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ /dev/null
@@ -1,77 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
-
-{% block content %}
-
-    <div class="row">
-        <div class="col s12">
-            <div class="card-panel settings">
-
-                <div class="row">
-                    <h3>{{ 'quickstart.intro.title'|trans }}</h3>
-                    <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
-                    <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
-
-                    <h4>{{ 'quickstart.configure.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
-                        <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
-                        <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
-                    </ul>
-
-                    {% if is_granted('ROLE_SUPER_ADMIN') %}
-                    <h4>{{ 'quickstart.admin.title'|trans }}</h4>
-                    <p>{{ 'quickstart.admin.description'|trans }}</p>
-                    <ul>
-                        <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
-                    </ul>
-                    {% endif %}
-
-                    <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
-                        <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
-                    </ul>
-
-                    <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
-                    <p>{{ 'quickstart.migrate.description'|trans }}</p>
-                    <ul>
-                        <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
-                        <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
-                        <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
-                        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
-                    </ul>
-
-                    <h4>{{ 'quickstart.developer.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
-                    </ul>
-
-                    <h4>{{ 'quickstart.docs.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
-                    </ul>
-
-                    <h4>{{ 'quickstart.support.title'|trans }}</h4>
-                    <p>{{ 'quickstart.support.description'|trans }}</p>
-                    <ul>
-                        <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
-                        <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
-                        <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
-                    </ul>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
deleted file mode 100644
index b82b3d3d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-    <head>
-        <title>{{ entry.title | raw }}</title>
-        <style>
-            body {
-                margin: 10px;
-                font-family: 'Roboto',Verdana,Geneva,sans-serif;
-                font-size: 16px;
-                color: #000;
-            }
-            header {
-                text-align: center;
-            }
-
-            header h1 {
-                font-size: 1.3em;
-            }
-
-            a,
-            a:hover,
-            a:visited {
-                color: #000;
-            }
-
-            article {
-                margin: 0 auto;
-                width: 600px;
-            }
-        </style>
-    </head>
-    <body>
-        <header>
-            <h1>{{ entry.title | raw }}</h1>
-            <span><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span>
-        </header>
-        <article>
-            {{ entry.content | raw }}
-        </article>
-    </body>
-</html>
-- 
cgit v1.2.3


From 40e219622a2c416ab36cb39b26a5e1354e4438cc Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 1 Oct 2016 14:51:54 +0200
Subject: Customize errors templates

All error goes to the same template which only display the error message and the status code.
---
 .../views/themes/baggy/Exception/error.html.twig   | 24 +++++++++++++++++
 .../themes/material/Exception/error.html.twig      | 30 ++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig
new file mode 100644
index 00000000..b52634fd
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig
@@ -0,0 +1,24 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'error.page_title'|trans }}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+{% block messages %}{% endblock %}
+{% block header %}{% endblock %}
+
+{% block content %}
+<main class="valign-wrapper">
+    <div class="valign row">
+        <div class="card sw">
+            <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /></div>
+            <h2>{{ status_code }}: {{ status_text }}</h2>
+            <p>{{ exception.message }}</p>
+        </div>
+    </div>
+</main>
+{% endblock %}
+
+{% block footer %}
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig
new file mode 100644
index 00000000..6be78edb
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig
@@ -0,0 +1,30 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'error.page_title'|trans }}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+{% block messages %}{% endblock %}
+
+{% block content %}
+<main class="valign-wrapper">
+    <div class="valign row">
+        <div class="card sw">
+            <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
+            <div class="card-content">
+                <div class="row">
+                    <h5>{{ status_code }}: {{ status_text }}</h5>
+                    <p>{{ exception.message }}</p>
+                    {# {% for trace in exception.trace %}
+                        <p>{{ trace.class }} - {{ trace.type }} - {{ trace.file }} - {{ trace.line }}</p>
+                    {% endfor %} #}
+                </div>
+            </div>
+        </div>
+    </div>
+</main>
+{% endblock %}
+
+{% block footer %}
+{% endblock %}
-- 
cgit v1.2.3


From 1264029cd413a4e29642a219e2647d886f0de0d6 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 1 Oct 2016 15:58:26 +0200
Subject: Add simple stats in footer

---
 .../Resources/views/themes/material/layout.html.twig      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 df05e2a4..b2d77c2e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -122,8 +122,19 @@
     <footer class="page-footer cyan darken-2">
         <div class="footer-copyright">
             <div class="container">
-                <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
-                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
+                <div class="row">
+                    <div class="col s8">
+                        <p>
+                            {{ display_stats() }}
+                        </p>
+                    </div>
+                    <div class="col s4">
+                        <p>
+                            {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> –
+                            <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a>
+                        </p>
+                    </div>
+                </div>
             </div>
         </div>
     </footer>
-- 
cgit v1.2.3


From bf3dc999e7b25888460faff2251f75e4a79491c4 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 1 Oct 2016 16:47:48 +0200
Subject: Add ability to edit a tagging rule

---
 .../CoreBundle/Resources/views/themes/baggy/Config/index.html.twig     | 1 +
 .../CoreBundle/Resources/views/themes/material/Config/index.html.twig  | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 6446cf2c..dd4f7b00 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -191,6 +191,7 @@
             « {{ tagging_rule.rule }} »
             {{ 'config.form_rules.then_tag_as_label'|trans }}
             « {{ tagging_rule.tags|join(', ') }} »
+            <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="tool mode_edit">✎</a>
             <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a>
         </li>
         {% endfor %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 5330c353..650a3ae2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -218,6 +218,9 @@
                                         « {{ tagging_rule.rule }} »
                                         {{ 'config.form_rules.then_tag_as_label'|trans }}
                                         « {{ tagging_rule.tags|join(', ') }} »
+                                        <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}">
+                                            <i class="tool grey-text mode_edit material-icons">mode_edit</i>
+                                        </a>
                                         <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}">
                                             <i class="tool grey-text delete material-icons">delete</i>
                                         </a>
-- 
cgit v1.2.3


From a44d2613c730b8933ba17a1295ae6c170345cad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Sat, 1 Oct 2016 16:09:31 +0200
Subject: Changed quickstart layout

---
 .../themes/common/Static/quickstart.html.twig      | 142 +++++++++++++--------
 1 file changed, 92 insertions(+), 50 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index 8cbf4ab4..226bafea 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
@@ -10,64 +10,106 @@
 
                 <div class="row">
                     <h3>{{ 'quickstart.intro.title'|trans }}</h3>
-                    <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
-                    <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
 
-                    <h4>{{ 'quickstart.configure.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
-                        <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
-                        <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
-                    </ul>
+                    <ul class="row data">
+                        <li class="col l4 m6 s12">
+                            <div class="card teal darken-1">
+                                <div class="card-content white-text">
+                                    <span class="card-title">{{ 'quickstart.configure.title'|trans }}</span>
+                                    <p>{{ 'quickstart.configure.description'|trans }}</p>
+                                </div>
+                                <div class="card-action">
+                                    <ul>
+                                        <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
+                                        <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
+                                        <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
 
-                    {% if is_granted('ROLE_SUPER_ADMIN') %}
-                    <h4>{{ 'quickstart.admin.title'|trans }}</h4>
-                    <p>{{ 'quickstart.admin.description'|trans }}</p>
-                    <ul>
-                        <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
-                        <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
-                    </ul>
-                    {% endif %}
+                        <li class="col l4 m6 s12">
+                            <div class="card green darken-1">
+                                <div class="card-content white-text">
+                                    <span class="card-title">{{ 'quickstart.first_steps.title'|trans }}</span>
+                                    <p>{{ 'quickstart.first_steps.description'|trans }}</p>
+                                </div>
+                                <div class="card-action">
+                                    <ul>
+                                        <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
+                                        <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
 
-                    <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
-                        <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
-                    </ul>
+                        <li class="col l4 m6 s12">
+                            <div class="card light-green darken-1">
+                                <div class="card-content white-text">
+                                    <span class="card-title">{{ 'quickstart.migrate.title'|trans }}</span>
+                                    <p>{{ 'quickstart.migrate.description'|trans }}</p>
+                                </div>
+                                <div class="card-action">
+                                    <ul>
+                                        <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
+                                        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
+                                        <li><a href="{{ path('import_instapaper') }}">{{ 'quickstart.migrate.instapaper'|trans }}</a></li>
+                                        <li><a href="{{ path('import') }}">{{ 'quickstart.more'|trans }}</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
 
-                    <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
-                    <p>{{ 'quickstart.migrate.description'|trans }}</p>
-                    <ul>
-                        <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
-                        <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
-                        <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
-                        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
-                    </ul>
+                        <li class="col l4 m6 s12">
+                            <div class="card blue darken-1">
+                                <div class="card-content white-text">
+                                    <span class="card-title">{{ 'quickstart.developer.title'|trans }}</span>
+                                    <p>{{ 'quickstart.developer.description'|trans }}</p>
+                                </div>
+                                <div class="card-action">
+                                    <ul>
+                                        <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
+                                        <li><a href="http://doc.wallabag.org/en/master/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li>
+                                        <li><a href="http://doc.wallabag.org/en/master/index.html#dev-docs">{{ 'quickstart.more'|trans }}</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
 
-                    <h4>{{ 'quickstart.developer.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
-                    </ul>
+                        <li class="col l4 m6 s12">
+                            <div class="card light-blue darken-1">
+                                <div class="card-content white-text">
+                                    <span class="card-title">{{ 'quickstart.docs.title'|trans }}</span>
+                                    <p>{{ 'quickstart.docs.description'|trans }}</p>
+                                </div>
+                                <div class="card-action">
+                                    <ul>
+                                        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
+                                        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
+                                        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
 
-                    <h4>{{ 'quickstart.docs.title'|trans }}</h4>
-                    <ul>
-                        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
-                        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
-                    </ul>
+                        <li class="col l4 m6 s12">
+                            <div class="card cyan darken-1">
+                                <div class="card-content white-text">
+                                    <span class="card-title">{{ 'quickstart.support.title'|trans }}</span>
+                                    <p>{{ 'quickstart.support.description'|trans }}</p>
+                                </div>
+                                <div class="card-action">
+                                    <ul>
+                                        <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
+                                        <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
+                                        <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
 
-                    <h4>{{ 'quickstart.support.title'|trans }}</h4>
-                    <p>{{ 'quickstart.support.description'|trans }}</p>
-                    <ul>
-                        <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
-                        <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
-                        <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
                     </ul>
+
                 </div>
 
             </div>
-- 
cgit v1.2.3


From 152fcccd4489378a8ed9391e3e191df4aeba6435 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 30 Sep 2016 20:09:06 +0200
Subject: Add users management UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
---
 .../views/themes/baggy/Config/index.html.twig      | 42 -----------------
 .../views/themes/material/Config/index.html.twig   | 52 +---------------------
 .../views/themes/material/layout.html.twig         |  6 ++-
 3 files changed, 7 insertions(+), 93 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index dd4f7b00..ff7ef73a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -302,46 +302,4 @@
             </table>
         </div>
     </div>
-
-    {% if is_granted('ROLE_SUPER_ADMIN') %}
-    <h2>{{ 'config.tab_menu.new_user'|trans }}</h2>
-
-    {{ form_start(form.new_user) }}
-        {{ form_errors(form.new_user) }}
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.username) }}
-                {{ form_errors(form.new_user.username) }}
-                {{ form_widget(form.new_user.username) }}
-            </div>
-        </fieldset>
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.plainPassword.first) }}
-                {{ form_errors(form.new_user.plainPassword.first) }}
-                {{ form_widget(form.new_user.plainPassword.first) }}
-            </div>
-        </fieldset>
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.plainPassword.second) }}
-                {{ form_errors(form.new_user.plainPassword.second) }}
-                {{ form_widget(form.new_user.plainPassword.second) }}
-            </div>
-        </fieldset>
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.email) }}
-                {{ form_errors(form.new_user.email) }}
-                {{ form_widget(form.new_user.email) }}
-            </div>
-        </fieldset>
-
-        {{ form_rest(form.new_user) }}
-        {% endif %}
-    </form>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 650a3ae2..270c077f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -16,9 +16,6 @@
                             <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li>
                             <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li>
                             <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li>
-                            {% if is_granted('ROLE_SUPER_ADMIN') %}
-                            <li class="tab col s3"><a href="#set6">{{ 'config.tab_menu.new_user'|trans }}</a></li>
-                            {% endif %}
                         </ul>
                     </div>
 
@@ -157,11 +154,9 @@
                             <div class="row">
                                 <div class="input-field col s12">
                                     {{ 'config.form_user.two_factor_description'|trans }}
-                                </div>
-                            </div>
 
-                            <div class="row">
-                                <div class="input-field col s12">
+                                    <br />
+
                                     {{ form_widget(form.user.twoFactorAuthentication) }}
                                     {{ form_label(form.user.twoFactorAuthentication) }}
                                     {{ form_errors(form.user.twoFactorAuthentication) }}
@@ -339,49 +334,6 @@
                             </div>
                         </div>
                     </div>
-
-                    {% if is_granted('ROLE_SUPER_ADMIN') %}
-                    <div id="set6" class="col s12">
-                        {{ form_start(form.new_user) }}
-                            {{ form_errors(form.new_user) }}
-
-                            <div class="row">
-                                <div class="input-field col s12">
-                                    {{ form_label(form.new_user.username) }}
-                                    {{ form_errors(form.new_user.username) }}
-                                    {{ form_widget(form.new_user.username) }}
-                                </div>
-                            </div>
-
-                            <div class="row">
-                                <div class="input-field col s12">
-                                    {{ form_label(form.new_user.plainPassword.first) }}
-                                    {{ form_errors(form.new_user.plainPassword.first) }}
-                                    {{ form_widget(form.new_user.plainPassword.first) }}
-                                </div>
-                            </div>
-
-                            <div class="row">
-                                <div class="input-field col s12">
-                                    {{ form_label(form.new_user.plainPassword.second) }}
-                                    {{ form_errors(form.new_user.plainPassword.second) }}
-                                    {{ form_widget(form.new_user.plainPassword.second) }}
-                                </div>
-                            </div>
-
-                            <div class="row">
-                                <div class="input-field col s12">
-                                    {{ form_label(form.new_user.email) }}
-                                    {{ form_errors(form.new_user.email) }}
-                                    {{ form_widget(form.new_user.email) }}
-                                </div>
-                            </div>
-
-                            {{ form_widget(form.new_user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            {{ form_rest(form.new_user) }}
-                        </form>
-                    </div>
-                    {% endif %}
                 </div>
 
             </div>
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 b2d77c2e..c7d6d70d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -45,7 +45,7 @@
             <li class="bold {% if currentRoute == 'archive' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ count_entries('archive') }}</span></a>
             </li>
-            <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}">
+            <li class="bold {% if currentRoute == 'all' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a>
             </li>
             <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
@@ -55,6 +55,10 @@
                 <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a>
             </li>
             {% if is_granted('ROLE_SUPER_ADMIN') %}
+                <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}">
+                    <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a>
+                </li>
+
                 <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}">
                     <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a>
                 </li>
-- 
cgit v1.2.3


From 03141f9b9548bca117136ba5bdcf811d9e59b155 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 1 Oct 2016 17:46:44 +0200
Subject: Cleanup & add link on baggy menu

---
 src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index 4fd4d317..30fd0d85 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -42,6 +42,7 @@
         </li>-->
         <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li>
         {% if is_granted('ROLE_SUPER_ADMIN') %}
+            <li><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li>
             <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li>
         {% endif %}
         <li><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li>
-- 
cgit v1.2.3


From 0f70abd695136f6cfcfaf3c755223cf2d61af090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 3 Oct 2016 10:27:01 +0200
Subject: Fixed CSS for quickstart links

---
 .../Resources/views/themes/common/Static/quickstart.html.twig           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index 226bafea..c8a303a6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-    <div class="row">
+    <div class="row quickstart">
         <div class="col s12">
             <div class="card-panel settings">
 
-- 
cgit v1.2.3


From a494c33ef7e574e68ab5bb83d0bdbd67348af0ef Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 3 Oct 2016 23:08:26 +0200
Subject: Basically, fix everything

* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
---
 .../views/themes/baggy/Entry/entry.html.twig       | 22 +++++++++++---------
 .../views/themes/material/Entry/entry.html.twig    | 24 ++++++++++++----------
 2 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index be1e3647..bead6809 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -21,12 +21,15 @@
 
                 <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
-                <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
+                <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
-                {% if craue_setting('share_public') %}<li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li>{% endif %}
+                {% if craue_setting('share_public') %}
+                    <li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li>
+                    <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li>
+                {% endif %}
                 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
-                {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
+                {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
                 {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
                 {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %}
                 {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %}
@@ -38,18 +41,17 @@
         </div>
 
         <div id="article-informations">
-            <div class="link mdi-action-today">
-                {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
-            </div>
+            <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}">{{ entry.createdAt|date('Y-m-d') }}
+            </i>
 
-            <div class="link mdi-action-query-builder">
+            <i class="tool icon icon-time">
                 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
                 {% if readingTime > 0 %}
-                    {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }}
+                    {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
                 {% else %}
-                    {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
+                    {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
                 {% endif %}
-            </div>
+            </i>
 
             {% set nbAnnotations = entry.annotations | length %}
             <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
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 209e9e89..d73d2703 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
@@ -47,7 +47,7 @@
 
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" href="{{ entry.url|e }}">
-                <i class="material-icons small">link</i>
+                <i class="material-icons small">public</i>
                 <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -106,12 +106,14 @@
                 <ul>
                     {% if craue_setting('share_public') %}
                         <li>
-                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="public icon-link" title="{{ 'entry.view.left_menu.public_link'|trans }}">
+                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}">
+                                <i class="material-icons">link</i>
                                 <span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
                             </a>
                         </li>
                         <li>
-                            <a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}">
+                            <a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}">
+                                <i class="material-icons">remove_circle</i>
                                 <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span>
                             </a>
                         </li>
@@ -125,22 +127,22 @@
                     {% endif %}
                     {% if craue_setting('share_shaarli') %}
                         <li>
-                            <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli">
-                                <span>shaarli</span>
+                            <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli">
+                                shaarli
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('share_diaspora') %}
                         <li>
-                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora}">
-                                <span>diaspora*</span>
+                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora">
+                                diaspora*
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('carrot') %}
                         <li>
-                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot">
-                                <span>Carrot</span>
+                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot" class="tool carrot icon-image icon-image--carrot">
+                                Carrot
                             </a>
                         </li>
                     {% endif %}
@@ -211,7 +213,7 @@
         </header>
         <aside>
             {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
-            <span class="mdi-action-query-builder"></span>
+            <i class="material-icons">timer</i>
             <span class="link">
                 {% if readingTime > 0 %}
                     {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
@@ -219,7 +221,7 @@
                     {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
                 {% endif %}
             </span>
-            <span class="mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> </span> <span class="link">{{ entry.createdAt|date('Y-m-d') }}</span>
+            <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span>
             <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
             <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span></a>
             <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
-- 
cgit v1.2.3


From 46d78f87d934bbc7679b85d0c78178444ff1b28e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 4 Oct 2016 14:48:22 +0200
Subject: fix icons

---
 .../Resources/views/themes/material/Entry/entry.html.twig  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 d73d2703..b4f2abc9 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
@@ -47,7 +47,7 @@
 
         <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" href="{{ entry.url|e }}">
-                <i class="material-icons small">public</i>
+                <i class="material-icons small">link</i>
                 <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
@@ -106,14 +106,12 @@
                 <ul>
                     {% if craue_setting('share_public') %}
                         <li>
-                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}">
-                                <i class="material-icons">link</i>
+                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}" class="tool icon icon-eye">
                                 <span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
                             </a>
                         </li>
                         <li>
-                            <a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}">
-                                <i class="material-icons">remove_circle</i>
+                            <a href="{{ path('delete_share', {'id': entry.id }) }}" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}" class="tool icon icon-no-eye">
                                 <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span>
                             </a>
                         </li>
@@ -128,21 +126,21 @@
                     {% if craue_setting('share_shaarli') %}
                         <li>
                             <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli">
-                                shaarli
+                                <span>shaarli</span>
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('share_diaspora') %}
                         <li>
                             <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora">
-                                diaspora*
+                                <span>diaspora*</span>
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('carrot') %}
                         <li>
                             <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot" class="tool carrot icon-image icon-image--carrot">
-                                Carrot
+                                <span>Carrot</span>
                             </a>
                         </li>
                     {% endif %}
-- 
cgit v1.2.3


From 0c7f1ba79615be00d07a3fd4e9671f3c2356d38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 4 Oct 2016 14:58:06 +0200
Subject: Fixed icon position in share menu

---
 .../Resources/views/themes/material/Entry/entry.html.twig   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 b4f2abc9..0a04e972 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
@@ -106,19 +106,19 @@
                 <ul>
                     {% if craue_setting('share_public') %}
                         <li>
-                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}" class="tool icon icon-eye">
+                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}" class="tool icon-eye">
                                 <span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
                             </a>
                         </li>
                         <li>
-                            <a href="{{ path('delete_share', {'id': entry.id }) }}" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}" class="tool icon icon-no-eye">
+                            <a href="{{ path('delete_share', {'id': entry.id }) }}" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}" class="tool icon-no-eye">
                                 <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span>
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('share_twitter') %}
                         <li>
-                            <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="twitter">
+                            <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool icon-twitter" title="twitter">
                                 <span>twitter</span>
                             </a>
                         </li>
@@ -132,22 +132,21 @@
                     {% endif %}
                     {% if craue_setting('share_diaspora') %}
                         <li>
-                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora">
+                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool icon-image icon-image--diaspora" title="diaspora">
                                 <span>diaspora*</span>
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('carrot') %}
                         <li>
-                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot" class="tool carrot icon-image icon-image--carrot">
+                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot" class="tool icon-image icon-image--carrot">
                                 <span>Carrot</span>
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('share_mail') %}
                         <li>
-                            <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}">
-                                <i class="material-icons">email</i>
+                            <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool email icon icon-mail">
                                 <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span>
                             </a>
                         </li>
-- 
cgit v1.2.3


From 3e85e91159c506586970e00e3614679879342de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 4 Oct 2016 15:00:47 +0200
Subject: Fixed calendar icon position with baggy theme

---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index bead6809..9a5c8fe0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -41,7 +41,8 @@
         </div>
 
         <div id="article-informations">
-            <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}">{{ entry.createdAt|date('Y-m-d') }}
+            <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}">
+                {{ entry.createdAt|date('Y-m-d') }}
             </i>
 
             <i class="tool icon icon-time">
-- 
cgit v1.2.3


From f733d8aaa329cc2115d0c94ffe9a0cedf98759b2 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 4 Oct 2016 15:12:48 +0200
Subject: Fix icon position

---
 .../Resources/views/themes/material/Entry/entry.html.twig        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 0a04e972..d52ab01c 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
@@ -125,21 +125,24 @@
                     {% endif %}
                     {% if craue_setting('share_shaarli') %}
                         <li>
-                            <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli">
+                            <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank">
+                                <i class="tool icon-image icon-image--shaarli" title="shaarli"></i>
                                 <span>shaarli</span>
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('share_diaspora') %}
                         <li>
-                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool icon-image icon-image--diaspora" title="diaspora">
+                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank">
+                                <i class="tool icon-image icon-image--diaspora" title="diaspora"></i>
                                 <span>diaspora*</span>
                             </a>
                         </li>
                     {% endif %}
                     {% if craue_setting('carrot') %}
                         <li>
-                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot" class="tool icon-image icon-image--carrot">
+                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot">
+                                <i class="tool icon-image icon-image--carrot"></i>
                                 <span>Carrot</span>
                             </a>
                         </li>
-- 
cgit v1.2.3


From 645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 4 Oct 2016 20:11:10 +0200
Subject: better tags on baggy

---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 6 +++---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 1c0430e8..3af88b23 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -29,16 +29,16 @@
                 <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li>
             </ul>
             {% if entry.previewPicture is null %}
-                <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
                 <ul class="card-entry-tags">
                     {% for tag in entry.tags %}
-                        <li>{{ tag.label }}</li>
+                        <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                     {% endfor %}
                 </ul>
+                <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
             {% else %}
                 <ul class="card-entry-labels">
                 {% for tag in entry.tags | slice(0, 3) %}
-                    <li>{{ tag.label }}</li>
+                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                 {% endfor %}
                 </ul>
                 <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 9a5c8fe0..b1aabf9b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -57,9 +57,11 @@
             {% set nbAnnotations = entry.annotations | length %}
             <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
             <aside class="tags">
+                <div class="card-entry-tags">
                 {% for tag in entry.tags %}
-                    <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a>
+                    <span class="label-outline"><i class="material-icons">label_outline</i> <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" class="nostyle"><i>✘</i></a></span>
                 {% endfor %}
+                </div>
                 <div class="input-field nav-panel-add-tag" style="display: none">
                     {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
                 </div>
-- 
cgit v1.2.3


From 15f1352ef8761d3e083fc17c8354c30ca3542050 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 5 Oct 2016 14:06:55 +0200
Subject: better tags on material

---
 .../Resources/views/themes/material/Entry/entries.html.twig         | 6 +++---
 .../Resources/views/themes/material/Entry/entry.html.twig           | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 01fde953..55b3ee5c 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
@@ -17,7 +17,7 @@
                             <div class="card-image waves-effect waves-block waves-light">
                                 <ul class="card-entry-labels">
                                 {% for tag in entry.tags | slice(0, 3) %}
-                                    <li>{{ tag.label }}</li>
+                                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                                 {% endfor %}
                                 </ul>
                                 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
@@ -46,7 +46,7 @@
                                 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
                                 <ul class="card-entry-labels-hidden">
                                 {% for tag in entry.tags | slice(0, 2) %}
-                                    <li>{{ tag.label }}</li>
+                                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                                 {% endfor %}
                             </ul>
                             {% endif %}
@@ -68,7 +68,7 @@
 
                             <ul class="card-entry-labels-hidden">
                                 {% for tag in entry.tags %}
-                                    <li>{{ tag.label }}</li>
+                                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                                 {% endfor %}
                             </ul>
                         </div>
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 d52ab01c..1ddb5a15 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
@@ -223,12 +223,13 @@
             </span>
             <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span>
             <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
-            <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span></a>
+                <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span>
+            </a>
             <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
             <div id="list">
                 {% for tag in entry.tags %}
                     <div class="chip">
-                    {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a>
+                    <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a>
                     </div>
                 {% endfor %}
             </div>
-- 
cgit v1.2.3


From f0d52417fbcb3427065ec3b0b8cf33f12f368f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 7 Oct 2016 09:05:18 +0200
Subject: Added OpenGraph support for public articles Fix #2289

---
 .../Resources/views/themes/common/Entry/share.html.twig          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 b82b3d3d..bf44ced7 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
@@ -27,11 +27,18 @@
                 width: 600px;
             }
         </style>
+        <meta property="og:title" content="{{ entry.title | raw }}" />
+        <meta property="og:type" content="article" />
+        <meta property="og:url" content="{{ app.request.uri }}" />
+        {% if entry.previewPicture is not null %}
+        <meta property="og:image" content="{{ entry.previewPicture }}" />
+        {% endif %}
     </head>
     <body>
         <header>
             <h1>{{ entry.title | raw }}</h1>
-            <span><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span>
+            <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
+            <div>{{ "entry.public.shared_by_wallabag"|trans|raw }}</div>
         </header>
         <article>
             {{ entry.content | raw }}
-- 
cgit v1.2.3


From d0d196ffb34929de6c915c0b34375f3af6135747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 7 Oct 2016 09:22:40 +0200
Subject: Fixed review

---
 .../CoreBundle/Resources/views/themes/common/Entry/share.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 bf44ced7..36c49e04 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
@@ -38,7 +38,7 @@
         <header>
             <h1>{{ entry.title | raw }}</h1>
             <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
-            <div>{{ "entry.public.shared_by_wallabag"|trans|raw }}</div>
+            <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div>
         </header>
         <article>
             {{ entry.content | raw }}
-- 
cgit v1.2.3


From d5c45d5288f035ef36484b007cd6cc246fa65e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 7 Oct 2016 15:21:31 +0200
Subject: Added default picture if preview picture is null

---
 .../CoreBundle/Resources/views/themes/common/Entry/share.html.twig      | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 36c49e04..a0a0d3c3 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
@@ -32,6 +32,8 @@
         <meta property="og:url" content="{{ app.request.uri }}" />
         {% if entry.previewPicture is not null %}
         <meta property="og:image" content="{{ entry.previewPicture }}" />
+        {% else %}
+        <meta property="og:image" content="{{ app.request.schemeAndHttpHost }}{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" />
         {% endif %}
     </head>
     <body>
-- 
cgit v1.2.3


From c5e4293efdff9c32d9b37865ae127c8f99f7020e Mon Sep 17 00:00:00 2001
From: Krzysztof Szafranek <ebraun@o2.pl>
Date: Sun, 9 Oct 2016 03:37:21 +0200
Subject: Fix few invalid HTML tags

---
 .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig  | 2 +-
 .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig    | 2 +-
 .../CoreBundle/Resources/views/themes/material/layout.html.twig         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 55b3ee5c..919f94ec 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
@@ -77,7 +77,7 @@
                     <div class="card-action">
                         <span class="bold">
                             <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>
-                        </bold>
+                        </span>
 
                         <ul class="tools right">
                             <li>
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 1ddb5a15..5188eb01 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
@@ -225,7 +225,7 @@
             <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
                 <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span>
             </a>
-            <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
+            <span class="tool"><i class="material-icons link">comment</i></span> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
             <div id="list">
                 {% for tag in entry.tags %}
                     <div class="chip">
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 c7d6d70d..de0049d3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -73,7 +73,7 @@
                 <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a>
             </li>
             <li class="bold">
-                <a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a>
+                <a class="waves-effect icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a>
             </li>
         </ul>
         <div class="nav-wrapper nav-panels">
-- 
cgit v1.2.3


From 90c766b96b280b092d57fd35d7b9b89853a4e2a0 Mon Sep 17 00:00:00 2001
From: Krzysztof Szafranek <ebraun@o2.pl>
Date: Sun, 9 Oct 2016 04:59:04 +0200
Subject: Show number of annotations instead of nbAnnotations placeholder

When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.
---
 .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig        | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index b1aabf9b..3689159b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -54,7 +54,6 @@
                 {% endif %}
             </i>
 
-            {% set nbAnnotations = entry.annotations | length %}
             <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
             <aside class="tags">
                 <div class="card-entry-tags">
-- 
cgit v1.2.3


From 28bb48905a2104adad65508f51737f987dc1ad4c Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 9 Oct 2016 18:41:19 +0200
Subject: Optimize the way tag list is rendered
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
---
 .../Resources/views/themes/baggy/Tag/tags.html.twig     |  2 +-
 .../Resources/views/themes/material/Tag/tags.html.twig  | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
index 50043907..1e2c6b42 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
@@ -9,7 +9,7 @@
 
     <ul>
     {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li>
+        <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries | length }})</a></li>
     {% endfor %}
     </ul>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index 1690633a..96f4f990 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -6,12 +6,19 @@
     <div class="results clearfix">
         <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}</div>
     </div>
+
     <br />
-    <ul class="row data">
-    {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li>
-    {% endfor %}
-    </ul>
+
+    <div class="row">
+        <ul class="card-tag-labels">
+            {% for tag in tags %}
+                <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s2">
+                    <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a>
+                </li>
+            {% endfor %}
+        </ul>
+    </div>
+
     <div>
         <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a>
     </div>
-- 
cgit v1.2.3


From d8a9209cfcc32f1031f9f857932351e0ee0f49d3 Mon Sep 17 00:00:00 2001
From: Krzysztof Szafranek <ebraun@o2.pl>
Date: Sun, 9 Oct 2016 22:40:55 +0200
Subject: Remove automatic closing of the window from bookmarklet

---
 .../Resources/views/themes/common/Static/_bookmarklet.html.twig         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
index 966a84db..3385cd53 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
@@ -1 +1 @@
-<a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">bag it!</a>
+<a id="bookmarklet" ondragend="this.click();" href="javascript:(function(){var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');})();">bag it!</a>
-- 
cgit v1.2.3


From 020c723e2865dbf61cca9fb14199ce07f479865a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 10 Oct 2016 14:29:11 +0200
Subject: Added support of Twitter Cards for public articles

---
 .../Resources/views/themes/common/Entry/share.html.twig        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 a0a0d3c3..b50226ef 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
@@ -30,11 +30,15 @@
         <meta property="og:title" content="{{ entry.title | raw }}" />
         <meta property="og:type" content="article" />
         <meta property="og:url" content="{{ app.request.uri }}" />
+        {% set picturePath = app.request.schemeAndHttpHost ~ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') %}
         {% if entry.previewPicture is not null %}
-        <meta property="og:image" content="{{ entry.previewPicture }}" />
-        {% else %}
-        <meta property="og:image" content="{{ app.request.schemeAndHttpHost }}{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" />
+            {% set picturePath = entry.previewPicture %}
         {% endif %}
+        <meta property="og:image" content="{{ picturePath }}" />
+        <meta name="twitter:card" content="summary" />
+        <meta name="twitter:image" content="{{ picturePath }}" />
+        <meta name="twitter:site" content="@wallabagapp" />
+        <meta name="twitter:title" content="{{ entry.title | raw }}" />
     </head>
     <body>
         <header>
-- 
cgit v1.2.3


From a2f42d8eaacaaa915034d08bf31504734c075721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 10 Oct 2016 16:05:06 +0200
Subject: Fixed Twitter Cards by adding a description tag

---
 .../CoreBundle/Resources/views/themes/common/Entry/share.html.twig       | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

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 b50226ef..804adb36 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
@@ -39,6 +39,7 @@
         <meta name="twitter:image" content="{{ picturePath }}" />
         <meta name="twitter:site" content="@wallabagapp" />
         <meta name="twitter:title" content="{{ entry.title | raw }}" />
+        <meta name="twitter:description" content="{{ entry.title | raw }}" />
     </head>
     <body>
         <header>
-- 
cgit v1.2.3


From d32e1c424adb6722706245fe91071594a8c7c826 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 15 Oct 2016 19:04:53 +0200
Subject: Fix baggy on small screens

---
 .../Resources/views/themes/baggy/layout.html.twig  | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index 30fd0d85..a046f7cf 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -23,12 +23,12 @@
 {% block menu %}
     <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button>
     <ul id="links" class="links">
-        <li><a href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a></li>
-        <li><a href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a></li>
-        <li><a href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a></li>
-        <li><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li>
-        <li><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li>
-        <li><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li>
+        <li class="menu unread"><a href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a></li>
+        <li class="menu starred"><a href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a></li>
+        <li class="menu archive"><a href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a></li>
+        <li class="menu all"><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li>
+        <li class="menu tag"><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li>
+        <li class="menu new"><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li>
         <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a>
             <div id="search-form" class="messages info popup-form">
                 <form method="get" action="index.php">
@@ -40,16 +40,16 @@
                 </form>
             </div>
         </li>-->
-        <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li>
+        <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li>
         {% if is_granted('ROLE_SUPER_ADMIN') %}
-            <li><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li>
-            <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li>
+            <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li>
+            <li class="menu internal"><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li>
         {% endif %}
-        <li><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li>
-        <li><a href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a></li>
-        <li><a href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a></li>
-        <li><a href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a></li>
-        <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a></li>
+        <li class="menu import"><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li>
+        <li class="menu howto"><a href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a></li>
+        <li class="menu developer"><a href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a></li>
+        <li class="menu about"><a href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a></li>
+        <li class="menu logout"><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a></li>
     </ul>
 {% endblock %}
 
-- 
cgit v1.2.3


From d9a30ef30141e86b3cf609aa0b559ccdbf6caf94 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 15 Oct 2016 19:26:38 +0200
Subject: Fix tabs on material

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 .../Resources/views/themes/common/Static/about.html.twig       | 10 +++++-----
 .../Resources/views/themes/material/Config/index.html.twig     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index d0b94279..a0ea554a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -11,11 +11,11 @@
                 <div class="row">
                     <div class="div_tabs col s12">
                         <ul class="tabs">
-                        <li class="tab col s3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li>
-                        <li class="tab col s3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li>
+                        <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li>
+                        <li class="tab col s12 m6 l3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li>
+                        <li class="tab col s12 m6 l3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li>
+                        <li class="tab col s12 m6 l3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li>
+                        <li class="tab col s12 m6 l3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li>
                         </ul>
                     </div>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 270c077f..19faddc0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -11,11 +11,11 @@
                 <div class="row">
                     <div class="div_tabs col s12">
                         <ul class="tabs">
-                            <li class="tab col s3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li>
+                            <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li>
+                            <li class="tab col s12 m6 l3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li>
+                            <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li>
+                            <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li>
+                            <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li>
                         </ul>
                     </div>
 
-- 
cgit v1.2.3


From f69ab83a5aa2253abdadd88f4369726e45bcfc86 Mon Sep 17 00:00:00 2001
From: Sven Fischer <git-dev@linux4tw.de>
Date: Sun, 16 Oct 2016 09:23:58 +0200
Subject: add link to German documentation in about page

---
 .../CoreBundle/Resources/views/themes/common/Static/about.html.twig      | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index d0b94279..85945719 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -36,6 +36,7 @@
                             <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
                             <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
                             <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
+                            <dd><a href="http://doc.wallabag.org/de/master/">deutsch</a></dd>
 
                             <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
                             <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
-- 
cgit v1.2.3