Remove LiipThemeBundle

As baggy theme was removed and material is the only remaining theme, we don't need a theme switched anymore.
So:
- move all `*.twig` files from the material theme folder to the root
- remove useless translations

src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig

@@ -25,19 +25,6 @@
                         {{ form_start(form.config) }}
                             {{ form_errors(form.config) }}
 
-                            <div class="row">
-                                <div class="input-field col s11">
-                                    {{ form_errors(form.config.theme) }}
-                                    {{ form_widget(form.config.theme) }}
-                                    {{ form_label(form.config.theme) }}
-                                </div>
-                                <div class="input-field col s1">
-                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}">
-                                        <i class="material-icons">live_help</i>
-                                    </a>
-                                </div>
-                            </div>
-
                             <div class="row">
                                 <div class="input-field col s11">
                                     {{ form_errors(form.config.items_per_page) }}

src/Wallabag/CoreBundle/Resources/views/Entry/Card/_content.html.twig

@@ -9,9 +9,9 @@
     <div class="{{ subClass|default('original grey-text') }}">
         <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
         {% if withMetadata is defined %}
-            {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
+            {% include "@WallabagCore/Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
             <div class="reading-time grey-text">
-                <div class="card-reading-time">{% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
+                <div class="card-reading-time">{% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
             </div>
         {% endif %}
     </div>

src/Wallabag/CoreBundle/Resources/views/Entry/_card_actions.html.twig

@@ -1,6 +1,6 @@
 <div class="card-action">
     <div class="reading-time grey-text">
-        <div class="card-reading-time">{% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
+        <div class="card-reading-time">{% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
         <div class="card-created-at">
             <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
             <span>&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span>

src/Wallabag/CoreBundle/Resources/views/Entry/_card_full_image.html.twig

@@ -10,8 +10,8 @@
                 <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span>
             </a>
         </div>
-        {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry} only %}
+        {% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry} only %}
     </div>
 
-    {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
+    {% include "@WallabagCore/Entry/_card_actions.html.twig" with {'entry': entry} only %}
 </div>

src/Wallabag/CoreBundle/Resources/views/Entry/_card_list.html.twig

@@ -1,12 +1,12 @@
 <div class="card-stacked{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
-    {% include "@WallabagCore/themes/material/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
+    {% include "@WallabagCore/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
     <div class="card-preview">
         <a href="{{ path('view', {'id': entry.id}) }}">
             {% set preview_class_modifier = entry.previewPicture ? '' : ' preview--default' %}
             <span class="preview{{ preview_class_modifier }}" style="background-image: url({{ entry.previewPicture|default(asset('img/logo-square.svg')) }})"></span>
         </a>
     </div>
-    {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %}
+    {% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %}
     <ul class="tools-list hide-on-small-only">
         <li>
             <a title="{{ 'entry.list.show_same_domain'|trans }}" class="tool grey-text" href="{{ path('same_domain', {'id': entry.id}) }}"><i class="material-icons">language</i></a>

src/Wallabag/CoreBundle/Resources/views/Entry/_card_preview.html.twig

@@ -11,7 +11,7 @@
                 <span class="preview{{ preview_class_modifier }}" style="background-image: url({{ entry.previewPicture|default(asset('img/logo-square.svg')) }})"></span>
             </a>
         </div>
-        {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %}
+        {% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %}
     </div>
 
     <div class="card-reveal">
@@ -31,5 +31,5 @@
         </ul>
     </div>
 
-    {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
+    {% include "@WallabagCore/Entry/_card_actions.html.twig" with {'entry': entry} only %}
 </div>

src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig

@@ -15,7 +15,7 @@
     {% if searchTerm is defined and searchTerm is not empty %}
         {% set filter = searchTerm %}
     {% endif %}
-    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %}
+    {% include "@WallabagCore/Entry/_title.html.twig" with {'filter': filter} %}
 {% endblock %}
 
 {% block content %}
@@ -31,7 +31,7 @@
             {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
             <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if list_mode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
             {% if app.user.config.feedToken %}
-                {% include "@WallabagCore/themes/common/Entry/_feed_link.html.twig" %}
+                {% include "@WallabagCore/Entry/_feed_link.html.twig" %}
             {% endif %}
         </div>
         {% if current_route == 'search' %}<div><a href="{{ path('tag_this_search', {'filter': searchTerm, 'currentRoute': app.request.get('currentRoute')}) }}" title="{{ 'entry.list.assign_search_tag'|trans }}">{{ 'entry.list.assign_search_tag'|trans }}</a></div>{% endif %}
@@ -66,11 +66,11 @@
         {% for entry in entries %}
             <li id="entry-{{ entry.id|e }}" class="{% if list_mode != 0 %}col collection-item{% endif %} s12" data-entry-id="{{ entry.id|e }}" data-test="entry">
                 {% if list_mode == 1 %}
-                    {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
+                    {% include "@WallabagCore/Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
                 {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
-                    {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
+                    {% include "@WallabagCore/Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
                 {% else %}
-                    {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
+                    {% include "@WallabagCore/Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
                 {% endif %}
             </li>
         {% endfor %}

src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig

@@ -240,7 +240,7 @@
             <div class="tools grey-text" dir="auto">
                 <ul class="stats">
                     <li>
-                        {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
+                        {% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %}
                     </li>
                     <li>
                         <i class="material-icons grey-text" title="{{ 'entry.view.created_at'|trans }}">today</i>
@@ -279,7 +279,7 @@
                         </li>
                     {% endif %}
                 </ul>
-                {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags, 'entryId': entry.id, 'withRemove': true} only %}
+                {% include "@WallabagCore/Entry/_tags.html.twig" with {'tags': entry.tags, 'entryId': entry.id, 'withRemove': true} only %}
             </div>
 
             <div class="input-field nav-panel-add-tag" style="display: none">

src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig

@@ -120,7 +120,6 @@
                             <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>

src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig

@@ -46,7 +46,7 @@
                             <div class="col s12">
                                 <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
                                 {{ 'howto.bookmarklet.description'|trans }}
-                                {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %}
+                                {% include '@WallabagCore/Static/_bookmarklet.html.twig' %}
                             </div>
 
                         </div>
@@ -106,6 +106,22 @@
                                     <td><code>g l</code></td>
                                     <td>{{ 'howto.shortcuts.go_logout'|trans }}</td>
                                 </tr>
+                                <tr>
+                                    <td><code>g n</code></td>
+                                    <td>{{ 'howto.shortcuts.add_link'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>esc</code></td>
+                                    <td>{{ 'howto.shortcuts.hide_form'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>← →</code></td>
+                                    <td>{{ 'howto.shortcuts.arrows_navigation'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>enter</code></td>
+                                    <td>{{ 'howto.shortcuts.open_article'|trans }}</td>
+                                </tr>
                             </tbody>
                         </table>
 
@@ -156,36 +172,6 @@
                             </tr>
                             </tbody>
                         </table>
-
-                        <h5>{{ 'howto.shortcuts.material_title'|trans }}</h5>
-
-                        <table class="bordered">
-                            <thead>
-                            <tr>
-                                <th>{{ 'howto.shortcuts.shortcut'|trans }}</th>
-                                <th>{{ 'howto.shortcuts.action'|trans }}</th>
-                            </tr>
-                            </thead>
-
-                            <tbody>
-                            <tr>
-                                <td><code>g n</code></td>
-                                <td>{{ 'howto.shortcuts.add_link'|trans }}</td>
-                            </tr>
-                            <tr>
-                                <td><code>esc</code></td>
-                                <td>{{ 'howto.shortcuts.hide_form'|trans }}</td>
-                            </tr>
-                            <tr>
-                                <td><code>← →</code></td>
-                                <td>{{ 'howto.shortcuts.arrows_navigation'|trans }}</td>
-                            </tr>
-                            <tr>
-                                <td><code>enter</code></td>
-                                <td>{{ 'howto.shortcuts.open_article'|trans }}</td>
-                            </tr>
-                            </tbody>
-                        </table>
                     </div>
 
             </div>

src/Wallabag/CoreBundle/Resources/views/themes/material/Mail/forgotPassword.txt.twig

@@ -1,6 +0,0 @@
-Hello {{ username }}!
-
-To reset your password - please visit {{ confirmationUrl }}
-
-Regards,
-Wallabag bot