From 39676caf83a3d85203a769295d65c8ce32953883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 14 Apr 2020 16:01:14 +0200 Subject: Removed old, not so maintained and buggy baggy theme --- .../CoreBundle/Helper/DetectActiveTheme.php | 9 +- .../CoreBundle/Resources/config/services.yml | 1 + .../views/themes/baggy/Config/index.html.twig | 433 --------------------- .../views/themes/baggy/Config/otp_app.html.twig | 55 --- .../views/themes/baggy/Entry/edit.html.twig | 7 - .../views/themes/baggy/Entry/entries.html.twig | 219 ----------- .../views/themes/baggy/Entry/entry.html.twig | 116 ------ .../views/themes/baggy/Entry/new.html.twig | 7 - .../views/themes/baggy/Entry/new_form.html.twig | 14 - .../views/themes/baggy/Entry/search_form.html.twig | 17 - .../views/themes/baggy/Exception/error.html.twig | 24 -- .../themes/baggy/Mail/forgotPassword.txt.twig | 6 - .../Resources/views/themes/baggy/README.md | 3 - .../themes/baggy/SiteCredential/edit.html.twig | 60 --- .../themes/baggy/SiteCredential/index.html.twig | 42 -- .../themes/baggy/SiteCredential/new.html.twig | 53 --- .../views/themes/baggy/Tag/new_form.html.twig | 13 - .../views/themes/baggy/Tag/tags.html.twig | 40 -- .../Resources/views/themes/baggy/layout.html.twig | 71 ---- .../Resources/views/themes/baggy/screenshot.jpg | Bin 256315 -> 0 bytes .../views/themes/material/Config/index.html.twig | 4 +- 21 files changed, 11 insertions(+), 1183 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig delete mode 100755 src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg (limited to 'src/Wallabag/CoreBundle') diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php index 9f90ee3e..f1d5fdea 100644 --- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php +++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php @@ -16,15 +16,18 @@ class DetectActiveTheme implements DeviceDetectionInterface { protected $tokenStorage; protected $defaultTheme; + protected $themes; /** * @param TokenStorageInterface $tokenStorage Needed to retrieve the current user * @param string $defaultTheme Default theme when user isn't logged in + * @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes) */ - public function __construct(TokenStorageInterface $tokenStorage, $defaultTheme) + public function __construct(TokenStorageInterface $tokenStorage, $defaultTheme, $themes) { $this->tokenStorage = $tokenStorage; $this->defaultTheme = $defaultTheme; + $this->themes = $themes; } public function setUserAgent($userAgent) @@ -60,6 +63,10 @@ class DetectActiveTheme implements DeviceDetectionInterface return $this->defaultTheme; } + if (!in_array($config->getTheme(), $this->themes)) { + return $this->defaultTheme; + } + return $config->getTheme(); } } diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 3f3d4de7..bbf2a7a0 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -4,6 +4,7 @@ services: arguments: - "@security.token_storage" - "%wallabag_core.theme%" + - "%liip_theme.themes%" # custom form type wallabag_core.form.type.config: 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 deleted file mode 100644 index f719bea2..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ /dev/null @@ -1,433 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'config.page_title'|trans }}{% endblock %} - -{% block content %} -

{{ 'config.tab_menu.settings'|trans }}

- - {{ form_start(form.config) }} - {{ form_errors(form.config) }} - -
-
- {{ form_label(form.config.theme) }} - {{ form_errors(form.config.theme) }} - {{ form_widget(form.config.theme) }} -
- - live_help - -
- -
-
- {{ form_label(form.config.items_per_page) }} - {{ form_errors(form.config.items_per_page) }} - {{ form_widget(form.config.items_per_page) }} -
- - live_help - -
- -
-
- {{ form_label(form.config.reading_speed) }} - {{ form_errors(form.config.reading_speed) }} - {{ form_widget(form.config.reading_speed) }} -

- {{ 'config.form_settings.reading_speed.help_message'|trans }} - myreadspeed -

-
- - live_help - -
- -
-
- {{ form_label(form.config.action_mark_as_read) }} - {{ form_errors(form.config.action_mark_as_read) }} - {{ form_widget(form.config.action_mark_as_read) }} -
-
- -
-
- {{ form_label(form.config.language) }} - {{ form_errors(form.config.language) }} - {{ form_widget(form.config.language) }} -
- - live_help - -
- -
-
- {{ form_label(form.config.pocket_consumer_key) }} - {{ form_errors(form.config.pocket_consumer_key) }} - {{ form_widget(form.config.pocket_consumer_key) }} -

- » - https://getpocket.com/developer/docs/authentication -

-
- - live_help - -
- -
-
-

{{ 'config.form_settings.android_configuration'|trans }}

- {{ 'config.form_settings.android_instruction' | trans }} -
- - -
-
- - {{ form_rest(form.config) }} - - -

{{ 'config.tab_menu.feed'|trans }}

- - {{ form_start(form.feed) }} - {{ form_errors(form.feed) }} - -
- {{ 'config.form_feed.description'|trans }} -
- -
-
- - {% if feed.token %} - {{ feed.token }} - {% else %} - {{ 'config.form_feed.no_token'|trans }} - {% endif %} - - {% if feed.token %} - – {{ 'config.form_feed.token_reset'|trans }} - – {{ 'config.form_feed.token_revoke'|trans }} - {% else %} - – {{ 'config.form_feed.token_create'|trans }} - {% endif %} -
-
- - {% if feed.token %} -
-
- - -
-
- {% endif %} - -
-
- {{ form_label(form.feed.feed_limit) }} - {{ form_errors(form.feed.feed_limit) }} - {{ form_widget(form.feed.feed_limit) }} -
-
- - {{ form_rest(form.feed) }} - - -

{{ 'config.tab_menu.user_info'|trans }}

- - {{ form_start(form.user) }} - {{ form_errors(form.user) }} -
-
- - {{ app.user.username }} -
-
- -
-
- {{ form_label(form.user.name) }} - {{ form_errors(form.user.name) }} - {{ form_widget(form.user.name) }} -
-
- -
-
- {{ form_label(form.user.email) }} - {{ form_errors(form.user.email) }} - {{ form_widget(form.user.email) }} -
-
- - {{ form_widget(form.user.save) }} - - {% if twofactor_auth %} -
{{ 'config.otp.page_title'|trans }}
- -
- {{ 'config.form_user.two_factor_description'|trans }} -
- - - - - - - - - - - - - - - - - - - - - - -
{{ 'config.form_user.two_factor.table_method'|trans }}{{ 'config.form_user.two_factor.table_state'|trans }}{{ 'config.form_user.two_factor.table_action'|trans }}
{{ 'config.form_user.two_factor.emailTwoFactor_label'|trans }}{% if app.user.isEmailTwoFactor %}{{ 'config.form_user.two_factor.state_enabled'|trans }}{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}{{ 'config.form_user.two_factor.action_email'|trans }}
{{ 'config.form_user.two_factor.googleTwoFactor_label'|trans }}{% if app.user.isGoogleTwoFactor %}{{ 'config.form_user.two_factor.state_enabled'|trans }}{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}{{ 'config.form_user.two_factor.action_app'|trans }}
- - {% endif %} - - {{ form_widget(form.user._token) }} - - - {% if enabled_users > 1 %} -

{{ 'config.form_user.delete.title'|trans }}

- -

{{ 'config.form_user.delete.description'|trans }}

- - {{ 'config.form_user.delete.button'|trans }} - - {% endif %} - -

{{ 'config.tab_menu.password'|trans }}

- - {{ form_start(form.pwd) }} - {{ form_errors(form.pwd) }} - -
- {{ 'config.form_password.description'|trans }} -
- -
-
- {{ form_label(form.pwd.old_password) }} - {{ form_errors(form.pwd.old_password) }} - {{ form_widget(form.pwd.old_password) }} -
-
- -
-
- {{ form_label(form.pwd.new_password.first) }} - {{ form_errors(form.pwd.new_password.first) }} - {{ form_widget(form.pwd.new_password.first) }} -
-
- -
-
- {{ form_label(form.pwd.new_password.second) }} - {{ form_errors(form.pwd.new_password.second) }} - {{ form_widget(form.pwd.new_password.second) }} -
-
- - {{ form_rest(form.pwd) }} - - -

{{ 'config.tab_menu.rules'|trans }}

- - - - {{ form_start(form.new_tagging_rule) }} - {{ form_errors(form.new_tagging_rule) }} - -
-
- {{ form_label(form.new_tagging_rule.rule) }} - {{ form_errors(form.new_tagging_rule.rule) }} - {{ form_widget(form.new_tagging_rule.rule) }} -
-
- -
-
- {{ form_label(form.new_tagging_rule.tags) }} - {{ form_errors(form.new_tagging_rule.tags) }} - {{ form_widget(form.new_tagging_rule.tags) }} -
-
- - {{ form_rest(form.new_tagging_rule) }} - - -
-

{{ 'config.form_rules.card.import_tagging_rules'|trans }}

-

{{ 'config.form_rules.card.import_tagging_rules_detail'|trans }}

-
- - {{ form_start(form.import_tagging_rule) }} - {{ form_errors(form.import_tagging_rule) }} - -
-
- {{ form_label(form.import_tagging_rule.file) }} - {{ form_errors(form.import_tagging_rule.file) }} - {{ form_widget(form.import_tagging_rule.file) }} -
-
- - {{ form_rest(form.import_tagging_rule) }} - - - {% if app.user.config.taggingRules is not empty %} -
-

{{ 'config.form_rules.card.export_tagging_rules'|trans }}

-

{{ 'config.form_rules.card.export_tagging_rules_detail'|trans }}

-

{{ 'config.form_rules.export'|trans }}

-
- {% endif %} - -
-
-

{{ 'config.form_rules.faq.title'|trans }}

- -

{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}

-

{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}

- -

{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}

-

{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}

- -

{{ 'config.form_rules.faq.variables_available_title'|trans }}

-

- {{ 'config.form_rules.faq.variables_available_description'|trans }} -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'config.form_rules.faq.variable_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}{{ 'config.form_rules.faq.operator_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}
title{{ 'config.form_rules.faq.variable_description.title'|trans }}<={{ 'config.form_rules.faq.operator_description.less_than'|trans }}
url{{ 'config.form_rules.faq.variable_description.url'|trans }}<{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}
isArchived{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}>={{ 'config.form_rules.faq.operator_description.greater_than'|trans }}
isStarred{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}
content{{ 'config.form_rules.faq.variable_description.content'|trans }}={{ 'config.form_rules.faq.operator_description.equal_to'|trans }}
language{{ 'config.form_rules.faq.variable_description.language'|trans }}!={{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}
mimetype{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}OR{{ 'config.form_rules.faq.operator_description.or'|trans }}
readingTime{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}AND{{ 'config.form_rules.faq.operator_description.and'|trans }}
domainName{{ 'config.form_rules.faq.variable_description.domainName'|trans }}matches{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}
-
-
- -

{{ 'config.reset.title'|trans }}

-
-

{{ 'config.reset.description'|trans }}

- -
-{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig deleted file mode 100644 index 1d3685ae..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'config.page_title'|trans }} > {{ 'config.otp.page_title'|trans }}{% endblock %} - -{% block content %} -
{{ 'config.otp.page_title'|trans }}
- -
    -
  1. -

    {{ 'config.otp.app.two_factor_code_description_1'|trans }}

    -

    {{ 'config.otp.app.two_factor_code_description_2'|trans }}

    - -

    - - -

    -
    2. -
  2. -

    {{ 'config.otp.app.two_factor_code_description_3'|trans }}

    - -

    {{ backupCodes|join("\n")|nl2br }}

    -
    3. -
  3. -

    {{ 'config.otp.app.two_factor_code_description_4'|trans }}

    - - {% for flashMessage in app.session.flashbag.get("two_factor") %} -
    - {{ flashMessage|trans }} -
    - {% endfor %} - -
    -
    -
    -
    - - -
    -
    -
    -
    - - {{ 'config.otp.app.cancel'|trans }} - - -
    -
    -
    4. -
-{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig deleted file mode 100644 index e974fc69..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'entry.edit.page_title'|trans }}{% endblock %} - -{% block content %} - {{ form(form) }} -{% 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 deleted file mode 100644 index 4182628f..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ /dev/null @@ -1,219 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block head %} - {{ parent() }} - {% if tag is defined and app.user.config.feedToken %} - - {% endif %} -{% endblock %} - -{% block title %} - {% set filter = '' %} - {% if tag is defined %} - {% set filter = tag %} - {% endif %} - {% if searchTerm is defined and searchTerm is not empty %} - {% set filter = searchTerm %} - {% endif %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %} -{% endblock %} - -{% block content %} - {% set currentRoute = app.request.attributes.get('_route') %} - {% if currentRoute == 'homepage' %} - {% set currentRoute = 'unread' %} - {% endif %} - {% set listMode = app.user.config.listMode %} -
-
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
- -
- - {% for entry in entries %} -
-

{{ entry.title | striptags | truncate(80, true, '…') | default('entry.default_title'|trans) | raw }}

- - {% set readingTime = entry.readingTime / app.user.config.readingSpeed * 200 %} -
- - {% if readingTime > 0 %} - {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }} - {% else %} - {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} - {% endif %} - - - - {{ entry.createdAt|date('Y-m-d') }} - - -
- - - {% if (entry.previewPicture is null or listMode == 1) %} - -

{{ entry.content|striptags|slice(0, 300) }}…

- {% else %} - - {{ entry.title|e|raw }} - {% endif %} -
- {% endfor %} - - {% if entries.getNbPages > 1 %} - {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} - {% endif %} - - - - - - {% if form is not null %} -
-
-

{{ 'entry.filters.title'|trans }}

- × - -
- {% if currentRoute != 'untagged' and nbEntriesUntagged != 0 %} -
- {{ 'tag.list.see_untagged_entries'|trans }} ({{nbEntriesUntagged}}) -
- {% endif %} - -
- -
-
- {{ form_widget(form.isArchived) }} - {{ form_label(form.isArchived) }} -
- -
- {{ form_widget(form.isStarred) }} - {{ form_label(form.isStarred) }} -
- -
- {{ form_widget(form.isUnread) }} - {{ form_label(form.isUnread) }} -
- -
- {{ form_widget(form.previewPicture) }} - {{ form_label(form.previewPicture) }} -
- -
- {{ form_widget(form.isPublic) }} - {{ form_label(form.isPublic) }} -
-
- -
- {{ form_label(form.language) }} -
- {{ form_widget(form.language) }} -
-
- -
- {{ form_label(form.httpStatus) }} -
- {{ form_widget(form.httpStatus) }} -
-
- -
-
- {{ form_label(form.readingTime) }} -
-
- - {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} -
-
- - {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} -
-
- -
- {{ form_label(form.domainName) }} -
- {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }} -
-
- -
-
- {{ form_label(form.createdAt) }} -
-
- - {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }} -
-
- - {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }} -
-
- -
-
- {{ 'entry.filters.action.clear'|trans }} -
- - -
-
-
- {% 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 deleted file mode 100644 index c2e69a27..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ /dev/null @@ -1,116 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ entry.title|e|default('entry.default_title'|trans)|raw }} ({{ entry.domainName|removeWww }}){% endblock %} - -{% block content %} -
-
-

{{ entry.title|e|default('entry.default_title'|trans)|raw }} ✎

-
- -
- -
- -
- - {{ entry.createdAt|date('Y-m-d H:i') }} - - - {% if entry.publishedAt is not null %} - - {{ entry.publishedAt|date('Y-m-d H:i') }} - - {% endif %} - - {% if entry.publishedBy is not empty %} - - {% for author in entry.publishedBy %} - {{ author }}{% if not loop.last %}, {% endif %} - {% endfor %} - - {% endif %} - - - {% set readingTime = entry.readingTime / app.user.config.readingSpeed * 200 %} - {% 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 %} - - - comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} - - {% if entry.originUrl is not empty %} - launch - - {{ entry.originUrl|striptags|removeSchemeAndWww|truncate(32) }} - - {% endif %} - - -
- - {{ entry.content | raw }} - -
- - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig deleted file mode 100644 index 03768a3d..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %} - -{% block content %} - {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig deleted file mode 100644 index 8c129068..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -
- {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} - - {% if form_errors(form.url) %} - {{ form_errors(form.url) }} - {% endif %} - - {{ form_label(form.url) }} - {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }} - - {{ form_rest(form) }} -
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig deleted file mode 100644 index 20821b6d..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -
-

{{ 'menu.left.search'|trans }}

- × - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} - - {% if form_errors(form.term) %} - {{ form_errors(form.term) }} - {% endif %} - - - - {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} - - {{ form_rest(form) }} -
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 deleted file mode 100644 index 9959cc3d..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{% 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 %} -
-
-
-
wallabag logo
-

{{ status_code }}: {{ status_text }}

-

{{ exception.message }}

-
-
-
-{% endblock %} - -{% block footer %} -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig deleted file mode 100644 index 631bcb88..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig +++ /dev/null @@ -1,6 +0,0 @@ -Hello {{username}}! - -To reset your password - please visit {{confirmationUrl}} - -Regards, -Wallabag bot diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md deleted file mode 100644 index 3db07873..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Baggy Theme - -theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig deleted file mode 100644 index 882be430..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} - -{% block content %} - -
-
-
-
-
-

{{ 'site_credential.edit_site_credential'|trans }}

- -
- {{ form_start(edit_form) }} - {{ form_errors(edit_form) }} - -
-
- {{ form_label(edit_form.host) }} - {{ form_errors(edit_form.host) }} - {{ form_widget(edit_form.host) }} -
-
- -
-
- {{ form_label(edit_form.username) }} - {{ form_errors(edit_form.username) }} - {{ form_widget(edit_form.username) }} -
-
- -
-
- {{ form_label(edit_form.password) }} - {{ form_errors(edit_form.password) }} - {{ form_widget(edit_form.password) }} -
-
- -
- - {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_widget(edit_form._token) }} - -

- {{ form_start(delete_form) }} - - {{ form_end(delete_form) }} -

-

{{ 'site_credential.form.back_to_list'|trans }}

-
-
-
-
-
-
- -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig deleted file mode 100644 index 324854ad..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} - -{% block content %} - -
-
-
-
-
-

{{ 'site_credential.description'|trans|raw }}

- - - - - - - - - - {% for credential in credentials %} - - - - - {% endfor %} - -
{{ 'site_credential.form.host_label'|trans }}{{ 'site_credential.list.actions'|trans }}
{{ credential.host }} - {{ 'site_credential.list.edit_action'|trans }} -
-
-

- {{ 'site_credential.list.create_new_one'|trans }} -

-
-
-
-
-
- -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig deleted file mode 100644 index 3c008cde..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig +++ /dev/null @@ -1,53 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} - -{% block content %} - -
-
-
-
-
-

{{ 'site_credential.new_site_credential'|trans }}

- -
- {{ form_start(form) }} - {{ form_errors(form) }} - -
-
- {{ form_label(form.host) }} - {{ form_errors(form.host) }} - {{ form_widget(form.host) }} -
-
- -
-
- {{ form_label(form.username) }} - {{ form_errors(form.username) }} - {{ form_widget(form.username) }} -
-
- -
-
- {{ form_label(form.password) }} - {{ form_errors(form.password) }} - {{ form_widget(form.password) }} -
-
- - {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form) }} - -

{{ 'site_credential.form.back_to_list'|trans }}

-
-
-
-
-
-
- -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig deleted file mode 100644 index 6e552560..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -
- {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} - - {% if form_errors(form.label) %} - {{ form_errors(form.label) }} - {% endif %} - - {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} - - {{ form_rest(form) }} -
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 deleted file mode 100644 index aa17b842..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'tag.page_title'|trans }}{% endblock %} - -{% block content %} -
-
{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}
-
- - - -
- {% if nbEntriesUntagged == 0 %} - {{ 'tag.list.no_untagged_entries'|trans }} - {% else %} - {{ 'tag.list.see_untagged_entries'|trans }} ({{nbEntriesUntagged}}) - {% endif %} -
-{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig deleted file mode 100644 index 6b1e2bd7..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "WallabagCoreBundle::base.html.twig" %} - -{% block css %} - {{ parent() }} - {% if not app.debug %} - - {% endif %} -{% endblock %} - -{% block scripts %} - {{ parent() }} - -{% endblock %} - -{% block header %} -
-

- {% block logo %} - - wallabag logo - - {% endblock %} -

-
-{% endblock %} - -{% block menu %} - - -{% endblock %} - -{% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
- × -

{{ flashMessage|trans }}

-
- {% endfor %} -{% endblock %} - -{% block footer %} - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg deleted file mode 100755 index 19cd24bb..00000000 Binary files a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg and /dev/null differ 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 d8e9694d..212e08a9 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 @@ -294,10 +294,10 @@ « {{ tagging_rule.rule }} » {{ 'config.form_rules.then_tag_as_label'|trans }} « {{ tagging_rule.tags|join(', ') }} » - + mode_edit - + delete -- cgit v1.2.3