Merge pull request #6097 from wallabag/fix/remove-liip-theme-bundle

Remove LiipThemeBundle
This commit is contained in:
Jérémy Benoist 2022-11-23 15:05:12 +01:00 committed by GitHub
commit 580b9c6e00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
89 changed files with 78 additions and 396 deletions

View file

@ -21,7 +21,6 @@ class AppKernel extends Kernel
new JMS\SerializerBundle\JMSSerializerBundle(),
new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
new Nelmio\CorsBundle\NelmioCorsBundle(),
new Liip\ThemeBundle\LiipThemeBundle(),
new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
new FOS\OAuthServerBundle\FOSOAuthServerBundle(),

View file

@ -0,0 +1,32 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Drop theme fields from config table.
*/
final class Version20221123132612 extends WallabagMigration
{
public function up(Schema $schema): void
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf(!$configTable->hasColumn('theme'), 'It seems that you already played this migration.');
$configTable->dropColumn('theme');
}
public function down(Schema $schema): void
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf($configTable->hasColumn('theme'), 'It seems that you already played this migration.');
$configTable->addColumn('theme', 'string', [
'notnull' => true,
]);
}
}

View file

@ -171,16 +171,6 @@ nelmio_cors:
max_age: 3600
hosts: ['^api\.']
liip_theme:
load_controllers: false
themes:
- material
autodetect_theme: Wallabag\CoreBundle\Helper\DetectActiveTheme
path_patterns:
bundle_resource:
- "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
fos_user:
db_driver: orm
firewall_name: secured_area

View file

@ -17,7 +17,6 @@ services:
$defaultLocale: '%kernel.default_locale%'
$wallabagUrl: '%domain_name%'
$tablePrefix: "%database_table_prefix%"
$defaultTheme: '%wallabag_core.theme%'
$encryptionKeyPath: "%wallabag_core.site_credentials.encryption_key_path%"
$fetchingErrorMessageTitle: "%wallabag_core.fetching_error_message_title%"
$fetchingErrorMessage: '%wallabag_core.fetching_error_message%'
@ -31,7 +30,6 @@ services:
$senderName: "%scheb_two_factor.email.sender_name%"
$storeArticleHeaders: '@=service(''craue_config'').get(''store_article_headers'')'
$supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
$themes: '%liip_theme.themes%'
Wallabag\AnnotationBundle\:
resource: '../../src/Wallabag/AnnotationBundle/*'
@ -71,9 +69,6 @@ services:
Lexik\Bundle\FormFilterBundle\Filter\FilterBuilderUpdaterInterface:
alias: lexik_form_filter.query_builder_updater
Liip\ThemeBundle\ActiveTheme:
alias: liip_theme.active_theme
Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface:
alias: scheb_two_factor.security.google_authenticator
@ -210,7 +205,6 @@ services:
Wallabag\UserBundle\EventListener\CreateConfigListener:
arguments:
$theme: "%wallabag_core.theme%"
$itemsOnPage: "%wallabag_core.items_on_page%"
$feedLimit: "%wallabag_core.feed_limit%"
$language: "%wallabag_core.language%"

View file

@ -24,7 +24,6 @@ wallabag_core:
cs: 'Čeština'
el: 'Ελληνικά'
items_on_page: 12
theme: material
language: '%locale%'
rss_limit: 50
reading_speed: 200

View file

@ -83,7 +83,6 @@
"laminas/laminas-code": "^3.4",
"laminas/laminas-diactoros": "^2.3",
"lexik/form-filter-bundle": "^5.0.4",
"liip/theme-bundle": "^1.4.6",
"mgargano/simplehtmldom": "~1.5",
"mnapoli/piwik-twig-extension": "^3.0",
"nelmio/api-doc-bundle": "^3.0",

70
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "25b03b05eeff545aa68314784c949834",
"content-hash": "a2a09b8c7c80d9411cb07680b46952a5",
"packages": [
{
"name": "babdev/pagerfanta-bundle",
@ -5780,74 +5780,6 @@
},
"time": "2019-04-17T17:58:44+00:00"
},
{
"name": "liip/theme-bundle",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/liip/LiipThemeBundle.git",
"reference": "362394821ff8dcc90b06272e289e7dafe4dab52a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/362394821ff8dcc90b06272e289e7dafe4dab52a",
"reference": "362394821ff8dcc90b06272e289e7dafe4dab52a",
"shasum": ""
},
"require": {
"php": "^7.0",
"psr/log": "~1.0",
"symfony/finder": "^3.0|^4.0",
"symfony/framework-bundle": "^3.0|^4.0",
"symfony/templating": "^3.0|^4.0",
"symfony/twig-bundle": "^3.0|^4.0",
"twig/twig": "^1.34|^2.4"
},
"conflict": {
"sebastian/comparator": "1.2.3"
},
"require-dev": {
"phpunit/phpunit": "^6.0",
"symfony/console": "^3.0|^4.0",
"symfony/expression-language": "^3.0|^4.0"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"Liip\\ThemeBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Community contributions",
"homepage": "https://github.com/liip/LiipThemeBundle/contributors"
},
{
"name": "Liip AG",
"homepage": "http://www.liip.ch/"
}
],
"description": "Provides theming support for #Symfony2 Bundles",
"keywords": [
"themes",
"theming"
],
"support": {
"issues": "https://github.com/liip/LiipThemeBundle/issues",
"source": "https://github.com/liip/LiipThemeBundle/tree/1.7.0"
},
"abandoned": "sylius/theme-bundle",
"time": "2019-06-19T12:53:08+00:00"
},
{
"name": "masterminds/html5",
"version": "2.7.6",

View file

@ -25,7 +25,7 @@ class DeveloperController extends Controller
{
$clients = $this->getDoctrine()->getRepository(Client::class)->findByUser($this->getUser()->getId());
return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
return $this->render('@WallabagCore/Developer/index.html.twig', [
'clients' => $clients,
]);
}
@ -54,14 +54,14 @@ class DeveloperController extends Controller
$this->get(TranslatorInterface::class)->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
);
return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [
return $this->render('@WallabagCore/Developer/client_parameters.html.twig', [
'client_id' => $client->getPublicId(),
'client_secret' => $client->getSecret(),
'client_name' => $client->getName(),
]);
}
return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [
return $this->render('@WallabagCore/Developer/client.html.twig', [
'form' => $clientForm->createView(),
]);
}
@ -100,6 +100,6 @@ class DeveloperController extends Controller
*/
public function howtoFirstAppAction()
{
return $this->render('@WallabagCore/themes/common/Developer/howto_app.html.twig');
return $this->render('@WallabagCore/Developer/howto_app.html.twig');
}
}

View file

@ -8,7 +8,6 @@ use Doctrine\Persistence\ManagerRegistry;
use FOS\UserBundle\Model\UserManagerInterface;
use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerBuilder;
use Liip\ThemeBundle\ActiveTheme;
use PragmaRX\Recovery\Recovery as BackupCodes;
use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@ -55,25 +54,11 @@ class ConfigController extends Controller
$configForm->handleRequest($request);
if ($configForm->isSubmitted() && $configForm->isValid()) {
// force theme to material to avoid using baggy
if ('baggy' === $config->getTheme()) {
$config->setTheme('material');
$this->addFlash(
'notice',
'Baggy is gone, forced to Material theme.'
);
}
$em->persist($config);
$em->flush();
$request->getSession()->set('_locale', $config->getLanguage());
// switch active theme
$activeTheme = $this->get(ActiveTheme::class);
$activeTheme->setName($config->getTheme());
$this->addFlash(
'notice',
'flashes.config.notice.config_saved'

View file

@ -579,7 +579,7 @@ class EntryController extends Controller
}
return $this->render(
'@WallabagCore/themes/common/Entry/share.html.twig',
'@WallabagCore/Entry/share.html.twig',
['entry' => $entry]
);
}

View file

@ -144,7 +144,7 @@ class FeedController extends Controller
}
return $this->render(
'@WallabagCore/themes/common/Entry/entries.xml.twig',
'@WallabagCore/Entry/entries.xml.twig',
[
'type' => 'tag',
'url' => $url,
@ -228,7 +228,7 @@ class FeedController extends Controller
}
}
return $this->render('@WallabagCore/themes/common/Entry/entries.xml.twig', [
return $this->render('@WallabagCore/Entry/entries.xml.twig', [
'type' => $type,
'url' => $url,
'entries' => $entries,

View file

@ -15,7 +15,7 @@ class StaticController extends Controller
$addonsUrl = $this->container->getParameter('addons_url');
return $this->render(
'@WallabagCore/themes/common/Static/howto.html.twig',
'@WallabagCore/Static/howto.html.twig',
[
'addonsUrl' => $addonsUrl,
]
@ -28,7 +28,7 @@ class StaticController extends Controller
public function aboutAction()
{
return $this->render(
'@WallabagCore/themes/common/Static/about.html.twig',
'@WallabagCore/Static/about.html.twig',
[
'version' => $this->getParameter('wallabag_core.version'),
'paypal_url' => $this->getParameter('wallabag_core.paypal_url'),
@ -42,7 +42,7 @@ class StaticController extends Controller
public function quickstartAction()
{
return $this->render(
'@WallabagCore/themes/common/Static/quickstart.html.twig'
'@WallabagCore/Static/quickstart.html.twig'
);
}
}

View file

@ -17,7 +17,6 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
{
$adminConfig = new Config($this->getReference('admin-user'));
$adminConfig->setTheme('material');
$adminConfig->setItemsPerPage(30);
$adminConfig->setReadingSpeed(200);
$adminConfig->setLanguage('en');
@ -30,7 +29,6 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
$this->addReference('admin-config', $adminConfig);
$bobConfig = new Config($this->getReference('bob-user'));
$bobConfig->setTheme('default');
$bobConfig->setItemsPerPage(10);
$bobConfig->setReadingSpeed(200);
$bobConfig->setLanguage('fr');
@ -43,7 +41,6 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
$this->addReference('bob-config', $bobConfig);
$emptyConfig = new Config($this->getReference('empty-user'));
$emptyConfig->setTheme('material');
$emptyConfig->setItemsPerPage(10);
$emptyConfig->setReadingSpeed(100);
$emptyConfig->setLanguage('en');

View file

@ -20,9 +20,6 @@ class Configuration implements ConfigurationInterface
->integerNode('items_on_page')
->defaultValue(12)
->end()
->scalarNode('theme')
->defaultValue('material')
->end()
->scalarNode('language')
->defaultValue('en')
->end()

View file

@ -14,7 +14,6 @@ class WallabagCoreExtension extends Extension
$container->setParameter('wallabag_core.languages', $config['languages']);
$container->setParameter('wallabag_core.items_on_page', $config['items_on_page']);
$container->setParameter('wallabag_core.theme', $config['theme']);
$container->setParameter('wallabag_core.language', $config['language']);
$container->setParameter('wallabag_core.feed_limit', $config['rss_limit']);
$container->setParameter('wallabag_core.reading_speed', $config['reading_speed']);

View file

@ -35,14 +35,6 @@ class Config
*/
private $id;
/**
* @var string
*
* @Assert\NotBlank()
* @ORM\Column(name="theme", type="string", nullable=false)
*/
private $theme;
/**
* @var int
*
@ -162,30 +154,6 @@ class Config
return $this->id;
}
/**
* Set theme.
*
* @param string $theme
*
* @return Config
*/
public function setTheme($theme)
{
$this->theme = $theme;
return $this;
}
/**
* Get theme.
*
* @return string
*/
public function getTheme()
{
return $this->theme;
}
/**
* Set itemsPerPage.
*

View file

@ -12,38 +12,19 @@ use Wallabag\CoreBundle\Entity\Config;
class ConfigType extends AbstractType
{
private $themes = [];
private $languages = [];
/**
* @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes)
* @param array $languages Languages come from configuration, array just code language as key and label as value
*/
public function __construct($themes, $languages)
public function __construct($languages)
{
$this->themes = array_combine(
$themes,
array_map(function ($s) {
$cleanTheme = ucwords(strtolower(str_replace('-', ' ', $s)));
if ('Baggy' === $cleanTheme) {
$cleanTheme = 'Baggy (DEPRECATED)';
}
return $cleanTheme;
}, $themes)
);
$this->languages = $languages;
}
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('theme', ChoiceType::class, [
'choices' => array_flip($this->themes),
'label' => 'config.form_settings.theme_label',
])
->add('items_per_page', IntegerType::class, [
'label' => 'config.form_settings.items_per_page_label',
'property_path' => 'itemsPerPage',

View file

@ -1,72 +0,0 @@
<?php
namespace Wallabag\CoreBundle\Helper;
use Liip\ThemeBundle\Helper\DeviceDetectionInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\UserBundle\Entity\User;
/**
* This class intend to detect the active theme for the logged in user.
* It will retrieve the configured theme of the user.
*
* If no user where logged in, it will return the default theme
*/
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, $themes)
{
$this->tokenStorage = $tokenStorage;
$this->defaultTheme = $defaultTheme;
$this->themes = $themes;
}
public function setUserAgent($userAgent)
{
}
/**
* This should return the active theme for the logged in user.
*
* Default theme for:
* - anonymous user
* - user without a config (shouldn't happen ..)
*
* @return string
*/
public function getType()
{
$token = $this->tokenStorage->getToken();
if (null === $token) {
return $this->defaultTheme;
}
$user = $token->getUser();
if (!$user instanceof User) {
return $this->defaultTheme;
}
$config = $user->getConfig();
if (!$config) {
return $this->defaultTheme;
}
if (!\in_array($config->getTheme(), $this->themes, true)) {
return $this->defaultTheme;
}
return $config->getTheme();
}
}

View file

@ -221,11 +221,9 @@ config:
language_label: Jazyk
help_pocket_consumer_key: Vyžadováno pro import z Pocketu. Můžete ho vytvořit ve svém účtu Pocket.
help_items_per_page: Můžete změnit počet článků zobrazených na každé stránce.
help_theme: wallabag je přizpůsobitelný. Zde si můžete vybrat upřednostňovaný motiv.
android_instruction: Klepnutím sem předvyplníte svou aplikaci pro Android
android_configuration: Nakonfigurujte svou aplikaci pro Android
pocket_consumer_key_label: Zákaznický klíč pro Pocket k importu obsahu
theme_label: Motiv
form_password:
new_password_label: Nové heslo
old_password_label: Aktuální heslo
@ -643,7 +641,6 @@ howto:
arrows_navigation: Procházet články
hide_form: Skrýt aktuální formulář (hledat nebo nový odkaz)
add_link: Přidat nový odkaz
material_title: Klávesové zkratky dostupné pouze s motivem Material
delete: Odstranit položku
toggle_favorite: Přepnout stav označení hvězdičkou pro položku
toggle_archive: Přepnout stav přečtení pro položku

View file

@ -69,7 +69,6 @@ config:
form:
save: Speichern
form_settings:
theme_label: Theme
items_per_page_label: Einträge pro Seite
language_label: Sprache
reading_speed:
@ -86,7 +85,6 @@ config:
pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren
android_configuration: Konfiguriere deine Android-App
android_instruction: Hier berühren, um deine Android-App auszufüllen
help_theme: wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen.
help_items_per_page: Du kannst die Nummer von Artikeln pro Seite anpassen.
help_reading_speed: wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen.
help_language: Du kannst die Sprache der wallabag-Oberfläche ändern.
@ -414,7 +412,6 @@ howto:
toggle_favorite: Favorit-Status für den Artikel ändern
toggle_archive: Archiviert-Status für den Artikel ändern
delete: Artikel löschen
material_title: Tastenkürzel des Material-Theme
add_link: Neuen Link hinzufügen
hide_form: Aktuelles Formular verstecken (Suche oder neuer Link)
arrows_navigation: Durch Artikel navigieren

View file

@ -308,7 +308,6 @@ howto:
arrows_navigation: Πλοήγηση στα άρθρα
hide_form: Απόκρυψη της τρέχουσας φόρμας (αναζήτηση ή νέος σύνδεσμος)
add_link: Προσθήκη νέου συνδέσμου
material_title: Διαθέσιμες συντομεύσεις μόνο με το θέμα Material
delete: Διαγραφή της καταχώρισης
toggle_archive: Εναλλαγή κατάστασης αναγνωσμένου για την καταχώριση
toggle_favorite: Εναλλαγή κατάστασης αγαπημένου για την καταχώριση
@ -595,7 +594,6 @@ config:
help_language: Μπορείτε να αλλάξετε τη γλώσσα της διεπαφής του wallabag.
help_reading_speed: Το wallabag υπολογίζει τον χρόνο ανάγνωσής σας για κάθε άρθρο. Μπορείτε να ορίσετε εδώ, χάρη σε αυτή τη λίστα, αν είστε γρήγορος ή αργός αναγνώστης. Το wallabag θα επανυπολογίσει τον χρόνο ανάγνωσης για κάθε άρθρο.
help_items_per_page: Μπορείτε να αλλάξετε τον αριθμό των άρθρων που προβάλλονται σε κάθε σελίδα.
help_theme: Το wallabag μπορεί να προσαρμοστεί. Εδώ μπορείτε να επιλέξετε το θέμα που προτιμάτε.
android_instruction: Πατήστε εδώ για να γεμίσετε από πριν την εφαρμογή Android
android_configuration: Ρύθμιση της εφαρμογής Android
pocket_consumer_key_label: Κλειδί επαλήθευσης Pocket για την εισαγωγή περιεχομένου
@ -612,7 +610,6 @@ config:
label: Ταχύτητα ανάγνωσης
language_label: Γλώσσα
items_per_page_label: Αντικείμενα ανά σελίδα
theme_label: Θέμα
form:
save: Αποθήκευση
page_title: Ρυθμίσεις

View file

@ -68,7 +68,6 @@ config:
form:
save: Save
form_settings:
theme_label: Theme
items_per_page_label: Items per page
language_label: Language
reading_speed:
@ -85,7 +84,6 @@ config:
pocket_consumer_key_label: Consumer key for Pocket to import contents
android_configuration: Configure your Android app
android_instruction: Touch here to prefill your Android app
help_theme: wallabag is customizable. You can choose your prefered theme here.
help_items_per_page: You can change the number of articles displayed on each page.
help_reading_speed: wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article.
help_language: You can change the language of wallabag interface.
@ -398,7 +396,6 @@ howto:
toggle_favorite: Toggle star status for the entry
toggle_archive: Toggle read status for the entry
delete: Delete the entry
material_title: Shortcuts available with Material theme only
add_link: Add a new link
hide_form: Hide the current form (search or new link)
arrows_navigation: Navigate through articles

View file

@ -66,7 +66,6 @@ config:
form:
save: 'Guardar'
form_settings:
theme_label: 'Tema'
items_per_page_label: 'Número de artículos por página'
language_label: 'Idioma'
reading_speed:
@ -82,7 +81,6 @@ config:
redirect_current_page: 'Permanecer en la página actual'
pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket
android_configuration: Configura tu aplicación Android
help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí."
help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página."
help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Aquí puedes definir, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo."
help_language: "Puedes cambiar el idioma de la interfaz de wallabag."
@ -388,7 +386,6 @@ howto:
toggle_favorite: Marcar como favorito / no favorito el artículo
toggle_archive: Marcar como leído / no leído el artículo
delete: Borrar el artículo
material_title: Atajos de teclado disponibles solo en el tema Material
add_link: Añadir un nuevo artículo
hide_form: Ocultar el formulario actual (búsqueda o nuevo artículo)
arrows_navigation: Navegar por los artículos

View file

@ -68,7 +68,6 @@ config:
form:
save: Enregistrer
form_settings:
theme_label: Thème
items_per_page_label: Nombre darticles par page
language_label: Langue
reading_speed:
@ -85,7 +84,6 @@ config:
pocket_consumer_key_label: Clé dauthentification Pocket pour importer les données
android_configuration: Configurez votre application Android
android_instruction: Appuyez ici pour préremplir votre application Android
help_theme: Laffichage de wallabag est personnalisable. Cest ici que vous choisissez le thème que vous préférez.
help_items_per_page: Vous pouvez définir le nombre darticles affichés sur chaque page.
help_reading_speed: wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article.
help_language: Vous pouvez définir la langue de linterface de wallabag.
@ -398,7 +396,6 @@ howto:
toggle_favorite: Changer le statut Favori de larticle
toggle_archive: Changer le status Lu de larticle
delete: Supprimer larticle
material_title: Raccourcis disponibles avec le thème Material uniquement
add_link: Ajouter un nouvel article
hide_form: Masquer le formulaire courant (recherche ou nouvel article)
arrows_navigation: Naviguer à travers les articles

View file

@ -19,7 +19,6 @@ howto:
arrows_navigation: Navegar polos artigos
hide_form: Agochar o formulario actual (busca ou nova ligazón)
add_link: Engadir nova ligazón
material_title: Atallos dispoñibles só para o decorado Material
delete: Eliminar o artigo
toggle_archive: Marcar como lido o artigo
toggle_favorite: Marcar con estrela o artigo
@ -271,7 +270,6 @@ config:
help_language: Podes cambiar o idioma da interface de wallabag.
help_reading_speed: wallabag calcula o tempo de lectura de cada artigo. Podes definir aquí, grazas a esta lista, se es lectora rápida ou lenta. wallabag volverá a calcular a velocidade de lectura para cada artigo.
help_items_per_page: Podes cambiar o número de artigos mostrados en cada páxina.
help_theme: wallabag é personalizable. Podes escoller o teu decorado preferido.
android_configuration: Configurar a app Android
pocket_consumer_key_label: Consumer Key para importar contidos de Pocket
action_mark_as_read:
@ -287,7 +285,6 @@ config:
label: Velocidade de lectura
language_label: Idioma
items_per_page_label: Elementos por páxina
theme_label: Decorado
form_password:
repeat_new_password_label: Repite o novo contrasinal
new_password_label: Novo contrasinal

View file

@ -197,9 +197,7 @@ config:
import_submit: Uvezi
file_label: JSON datoteka
form_settings:
theme_label: Tema
help_items_per_page: Možeš promijeniti broj prikazanih članaka na svakoj stranici.
help_theme: wallabag je prilagodljiv. Ovdje možeš odabrati željenu temu.
action_mark_as_read:
label: Što učiniti nakon što se članak ukloni, označi kao omiljeni ili kao pročitani?
redirect_current_page: Ostani na trenutačnoj stranici
@ -341,7 +339,6 @@ howto:
action: Akcija
toggle_favorite: Uklj/isklj stanje favorita za zapis
go_all: Idi na sve zapise
material_title: Dostupni prečaci samo za Material temu
add_link: Dodaj novu poveznicu
toggle_archive: Uklj/Isklj stanje čitanja za zapis
list_title: Dostupni prečaci na stranicama popisa

View file

@ -58,7 +58,6 @@ config:
form:
save: Mentés
form_settings:
theme_label: Kinézet
items_per_page_label: Oldalankénti elemek száma
language_label: Nyelv
reading_speed:
@ -75,7 +74,6 @@ config:
pocket_consumer_key_label: A tartalom importálásához szükséges Pocket „Consumer key”
android_configuration: Az Android alkalmazásának beállítása
android_instruction: Érintsen ide az Android alkalmazásának előtöltéséhez
help_theme: A wallabag testre szabható. Itt kiválaszthatja a preferált kinézetét.
help_items_per_page: Megváltoztathatja az oldalanként megjelenített cikkek számát.
help_reading_speed: A wallabag kiszámítja az elolvasási időt minden egyes cikkre. Itt meghatározhatja, ennek a listának köszönhetően, hogy mennyire gyors vagy lassú olvasó. A wallabag újra ki fogja számítani az elolvasási időt minden egyes cikkre.
help_language: Megváltoztathatja a wallabag felületének a nyelvét.
@ -330,7 +328,6 @@ howto:
toggle_favorite: A bejegyzés csillagozott állapotának átváltása
toggle_archive: A bejegyzés olvasott állapotának átváltása
delete: A bejegyzés törlése
material_title: Kizárólag a „Material” kinézet esetén elérhető gyorsbillentyűk
add_link: Új hivatkozás hozzáadása
hide_form: A jelenlegi mező elrejtése (keresés vagy új hivatkozás)
arrows_navigation: Navigálás a cikkek között

View file

@ -67,7 +67,6 @@ config:
form:
save: Salva
form_settings:
theme_label: Tema
items_per_page_label: Elementi per pagina
language_label: Lingua
reading_speed:
@ -84,7 +83,6 @@ config:
pocket_consumer_key_label: Consumer key per Pocket usata per per importare i contenuti
android_configuration: Configura la tua applicazione Android
android_instruction: Tocca qui per preriempire la tua applicazione Android
help_theme: wallabag è personalizzabile. Qui puoi scegliere il tuo tema preferito.
help_items_per_page: Puoi cambiare il numero di articoli mostrati su ogni pagina.
help_reading_speed: wallabag calcola un tempo di lettura per ogni articolo. Puoi definire qui, grazie a questa lista, se sei un lettore lento o veloce. wallabag ricalcolerà la velocità di lettura per ogni articolo.
help_language: Puoi cambiare la lingua dell'interfaccia di wallabag.
@ -347,7 +345,6 @@ howto:
toggle_favorite: Cambia stato Preferito dell'articolo
toggle_archive: Cambia stato Letto dell'articolo in letto
delete: Cancella l'articolo
material_title: Scorciatoie disponibili solo con il tema Material
add_link: Aggiungi un nuovo link
hide_form: Nascondi il modulo corrente (ricerca o nuovo link)
arrows_navigation: Naviga tra gli articoli

View file

@ -69,7 +69,6 @@ config:
form:
save: 保存
form_settings:
theme_label: テーマ
items_per_page_label: ページあたりのアイテム
language_label: 言語
reading_speed:
@ -89,7 +88,6 @@ config:
redirect_current_page: 現在のページに留まる
label: 記事に既読やスターをつけた後、どこに移動しますか?
android_configuration: Androidアプリの設定をする
help_theme: wallabagはカスタマイズ可能です。お気に入りのテーマを選べます。
android_instruction: ここをタッチするとあなたのAndroid アプリに自動入力します
form_rss:
description: wallabag が提供する RSS フィードは、お好みの RSS リーダーで保存した記事を読むできます。最初にトークンを生成する必要があります。
@ -382,7 +380,6 @@ howto:
arrows_navigation: 記事を移動する
hide_form: 現在の入力フォームを隠す(検索 または リンク)
add_link: 新しいリンクを追加する
material_title: マテリアルテーマのみで使用可能なショートカット
delete: 記事を削除する
toggle_archive: 既読状態を切り替える
toggle_favorite: スターの状態を切り替える

View file

@ -261,7 +261,6 @@ howto:
arrows_navigation: 문서 탐색
hide_form: 현재 양식 숨기기 (검색 또는 새 링크)
add_link: 새 링크 추가
material_title: 머티리얼 테마에서만 사용할 수있는 단축키
toggle_archive: 문서 읽음 상태 전환
delete: 문서 삭제
toggle_favorite: 문서의 즐겨찾기 상태 전환
@ -486,7 +485,6 @@ config:
items_per_page_label: 페이지 당 항목
help_pocket_consumer_key: Pocket 가져오기에 필요합니다. Pocket 계정에서 만들 수 있습니다.
help_language: wallabag 인터페이스 언어를 변경할 수 있습니다.
help_theme: wallabag은 사용자 정의할 수 있습니다. 여기에서 원하는 테마를 선택할 수 있습니다.
android_instruction: Android 앱 정보를 입력하려면 여기를 클릭하세요
android_configuration: Android 앱 구성
pocket_consumer_key_label: 콘텐츠를 가져 오기 위한 Pocket의 Consumer key
@ -498,7 +496,6 @@ config:
help_message: '온라인 도구를 사용하여 읽기 속도를 측정 할 수 있습니다:'
label: 읽기 속도
language_label: 언어
theme_label: 테마
otp:
app:
qrcode_label: QR 코드

View file

@ -64,7 +64,6 @@ config:
form:
save: Lagre
form_settings:
theme_label: Drakt
items_per_page_label: Elementer per side
language_label: Språk
reading_speed:
@ -83,7 +82,6 @@ config:
help_pocket_consumer_key: Kreves for Pocket-import. Kan opprettes i din Pocket-konto.
help_language: Du kan endre språk for wallabag-grensesnittet.
help_items_per_page: Du kan endre antallet artikler som vises på hver side.
help_theme: wallabag kan tilpasset. Du kan velge foretrukket drakt her.
android_instruction: Trykk her for å forhåndsutfylle ditt Android-program
android_configuration: Sett opp ditt Android-program
form_rss:
@ -433,7 +431,6 @@ howto:
arrows_navigation: Naviger gjennom artikler
hide_form: Skjul nåværende skjema (søk eller ny lenke)
add_link: Legg til ny lenke
material_title: Snarveier kun tilgjengelige i materiell drakt
toggle_archive: Veksle lesestatus for oppføringer
toggle_favorite: Veksle stjernemerkingsstatus for oppføringen
open_original: Åpne opprinnelig nettadresse for oppføringen

View file

@ -13,12 +13,10 @@ config:
label: Leessnelheid
language_label: Taal
items_per_page_label: Items per pagina
theme_label: Thema
help_pocket_consumer_key: Verplicht voor het importeren uit Pocket. U kan dit aanmaken in uw Pocket account.
help_language: U kan de taal van wallabag aanpassen.
help_reading_speed: wallabag berekend een leestijd voor ieder artikel. U kan hier aangeven of u een snelle of langzame lezer bent waardoor wallabag een accurate tijd kan berekenen per artikel.
help_items_per_page: U kan de hoeveelheid getoonde artikelen per pagina aanpassen.
help_theme: wallabag is aanpasbaar. U can uw gewenste thema hier selecteren.
android_instruction: Tik hier om uw Android-appvooraf in te vullen
android_configuration: Configureer uw Android applicatie
pocket_consumer_key_label: Consumer key voor Pocket om inhoud te importeren
@ -523,7 +521,6 @@ howto:
arrows_navigation: Navigeer door artikelen
hide_form: Verberg het huidige formulier (zoeken of nieuwe link)
add_link: Voeg nieuwe link toe
material_title: Snelkoppelingen alleen beschikbaar met Material thema
delete: Verwijder het item
toggle_archive: Verander lees status van het item
toggle_favorite: Verander gemarkeerd status van het item

View file

@ -65,7 +65,6 @@ config:
form:
save: Enregistrar
form_settings:
theme_label: Tèma
items_per_page_label: Nombre d'articles per pagina
language_label: Lenga
reading_speed:
@ -82,7 +81,6 @@ config:
pocket_consumer_key_label: Clau dautentificacion Pocket per importar las donadas
android_configuration: Configuratz vòstra aplicacion Android
android_instruction: Tocatz aquí per garnir las informacions de l'aplicacion Android
help_theme: wallabag es personalizable. Podètz causir vòstre tèma preferit aquí.
help_items_per_page: Podètz cambiar lo nombre d'articles afichats per pagina.
help_reading_speed: wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article.
help_language: Podètz cambiar la lenga de l'interfàcia de wallabag.
@ -342,7 +340,6 @@ howto:
toggle_favorite: Cambiar l'estatut Favorit per l'article
toggle_archive: Cambiar l'estatut Legit per l'article
delete: Suprimir l'article
material_title: Acorchis solament disponibles amb lo tèma Material
add_link: Apondre un acorchi
hide_form: Rescondre lo formulari actual (recèrca o nòu ligam)
arrows_navigation: Navigar dins los articles

View file

@ -69,7 +69,6 @@ config:
form:
save: Zapisz
form_settings:
theme_label: Temat
items_per_page_label: Liczba elementów na stronie
language_label: Język
reading_speed:
@ -86,7 +85,6 @@ config:
pocket_consumer_key_label: Klucz klienta Pocket do importu zawartości
android_configuration: Skonfiguruj swoją androidową aplikację
android_instruction: Dotknij tutaj, aby wstępnie uzupełnij androidową aplikację
help_theme: Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw.
help_items_per_page: Możesz zmienić liczbę artykułów wyświetlanych na każdej stronie.
help_reading_speed: wallabag oblicza czas czytania każdego artykułu. Możesz tutaj określić, dzięki tej liście, czy jesteś szybkim czy powolnym czytelnikiem. wallabag przeliczy czas czytania każdego artykułu.
help_language: Możesz zmienić język interfejsu wallabag.
@ -414,7 +412,6 @@ howto:
toggle_favorite: Oznacz wpis gwiazdką
toggle_archive: Oznacz wpis jako przeczytany
delete: Usuń wpis
material_title: Skróty dostępne wyłącznie w motywie Material
add_link: Dodaj nowy link
hide_form: Ukryj obecny formularz (wyszukiwania lub nowego linku)
arrows_navigation: Nawiguj pomiędzy artykułami

View file

@ -65,7 +65,6 @@ config:
form:
save: 'Guardar'
form_settings:
theme_label: 'Tema'
items_per_page_label: 'Itens por página'
language_label: 'Idioma'
reading_speed:
@ -76,7 +75,6 @@ config:
300_word: 'Posso ler ~300 palavras por minuto'
400_word: 'Posso ler ~400 palavras por minuto'
pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo'
help_theme: o wallabag é personalizável. Pode escolher o tema que pretender aqui.
help_pocket_consumer_key: Necessário para importar do Pocket. Pode criá-lo na sua conta do Pocket.
form_rss:
description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.'

View file

@ -68,7 +68,6 @@ config:
form:
save: 'Сохранить'
form_settings:
theme_label: 'Тема'
items_per_page_label: 'Записей на странице'
language_label: 'Язык'
reading_speed:
@ -84,7 +83,6 @@ config:
redirect_current_page: 'На текущую страницу'
pocket_consumer_key_label: "Ключ от Pocket для импорта контента"
android_configuration: "Настройте Ваше Android приложение"
help_theme: "wallabag настраиваемый, здесь Вы можете выбрать тему."
help_items_per_page: "Вы можете выбрать количество отображаемых записей на странице."
help_reading_speed: "wallabag посчитает сколько времени занимает чтение каждой записи. Вы можете определить здесь, как быстро вы читаете. wallabag пересчитает время чтения для каждой записи."
help_language: "Вы можете изменить язык интерфейса wallabag."
@ -409,7 +407,6 @@ howto:
toggle_favorite: "Переключить пометку звездочкой для записи"
toggle_archive: "Переключить пометку о прочтении для записи"
delete: "Удалить запись"
material_title: "Горячие клавиши доступные только в Material теме"
add_link: "Добавить новую запись"
hide_form: "Скрыть текущую форму (поисковую или новой ссылки)"
arrows_navigation: "Навигация по статьям"

View file

@ -60,7 +60,6 @@ config:
form:
save: 'บันทึก'
form_settings:
theme_label: 'ธีม'
items_per_page_label: 'ไอเทมต่อหน้า'
language_label: 'ภาษา'
reading_speed:
@ -73,7 +72,6 @@ config:
pocket_consumer_key_label: คีย์ของลูกค้าที่ไว้เก็บเพื่อนำข้อมูลเนื่อหาเข้า
android_configuration: การกำหนดค่าของแอนดรอยแอพพลิเคชั่น
android_instruction: "แตะตับที่นี้เพื่อเพิ่มเติมแอนดรอยแอพพลิเคชั่นของคุณ"
help_theme: "wallabag เป็นการปรับแต่งที่คุณสามารถเลือกธีมที่คุณต้องการได้ที่นี้"
help_items_per_page: "คุณสามารถเปลี่ยนจำนวนรายการที่แสดงผลในแต่ละหน้า"
help_reading_speed: "wallabag จะคำนวณเวลาการอ่านในแต่ละรายการซึ่งคุณสามารถกำหนดได้ที่นี้,ต้องขอบคุณรายการนี้,หากคุณเป็นนักอ่านที่เร็วหรือช้า wallabag จะทำการคำนวณเวลาที่อ่านใหม่ในแต่ละรายการ"
help_language: "คุณสามารถเปลี่ยภาษาของ wallabag interface ได้"
@ -318,7 +316,6 @@ howto:
toggle_favorite: เครื่องหมายของสถานะดาวสำหรับรายการ
toggle_archive: เครื่องหมายสถานะการอ่านสำหรับรายการ
delete: ลบรายการ
material_title: ใช้ Shortcut กับ เนื้อหาของธีมเฉพาะ
add_link: เพิ่มลิงค์ใหม่
hide_form: ซ่อนในปัจุบันจาก (ค้นหา หรือ ลิงค์ใหม่)
arrows_navigation: นำไปที่บทความ

View file

@ -69,7 +69,6 @@ config:
form:
save: Kaydet
form_settings:
theme_label: Tema
items_per_page_label: Sayfa başına makale sayısı
language_label: Dil
reading_speed:
@ -86,7 +85,6 @@ config:
pocket_consumer_key_label: Pocket'tan içerikleri aktarmak için Consumer anahtarı
android_configuration: Android uygulamanızı ayarlayın
android_instruction: Android uygulamanızın bilgilerini doldurmak için buraya tıklayın
help_theme: wallabag istediğiniz şekilde özelleştirilebilir. Buradan tercih ettiğiniz temayı seçebilirsiniz.
help_items_per_page: Sayfa başına görüntülenecek makale sayısını değiştirebilirsiniz.
help_reading_speed: wallabag her bir makale için ortalama okuma sürenizi hesaplar. Buradan, bunun sayesinde hızlı veya yavaş okuyan birisi olduğunuzu tanımlayabilirsiniz. Wallabag her bir makale okunması ardından bunu yeniden hesaplayacaktır.
help_language: Wallabag arayüzünü kullanacağınız dili değiştirebilirsiniz.
@ -414,7 +412,6 @@ howto:
toggle_favorite: Makalenin favorileme durumunu değiştir
toggle_archive: Makalenin okundu durumunu değiştir
delete: Makaleyi sil
material_title: Sadece material temasında kullanılabilen kısayollar
add_link: Yeni bir bağlantı ekle
hide_form: Mevcut formu gizle (arama veya yeni bağlantı)
arrows_navigation: Makaleler arasında geçiş yap

View file

@ -67,7 +67,6 @@ config:
form:
save: Зберегти
form_settings:
theme_label: Тема
items_per_page_label: Статей на сторінку
language_label: Мова
reading_speed:
@ -84,7 +83,6 @@ config:
pocket_consumer_key_label: Consumer key із Pocket для імпорту контенту
android_configuration: Налаштувати Android-застосунок
android_instruction: ''
help_theme: ''
help_items_per_page: ''
help_reading_speed: ''
help_language: ''
@ -369,7 +367,6 @@ howto:
toggle_favorite: ''
toggle_archive: ''
delete: Видалити запис
material_title: Гарячі клавіші доступні тільки у темі Material
add_link: Додати нове посилання
hide_form: ''
arrows_navigation: Навігація по статтях

View file

@ -69,7 +69,6 @@ config:
form:
save: '保存'
form_settings:
theme_label: '主题'
items_per_page_label: '每页项目数'
language_label: '语言'
reading_speed:
@ -86,7 +85,6 @@ config:
pocket_consumer_key_label: '用于从 Pocket 导入内容的 Consumer key'
android_configuration: '配置你的 Android 应用程序'
android_instruction: "点按此处以预填充你的 Android 应用"
help_theme: "wallabag 是可定制的,你可以在这里选择你喜欢的主题。"
help_items_per_page: "你可以选择每页显示的文章数目。"
help_reading_speed: "wallabag 会为每篇文章计算阅读时间你可以通过这个列表选择自己是个速读者或是慢读者。wallabag 会根据你的选择重新计算每篇文章的阅读时间。"
help_language: "你可以在此处更改 wallabag 的界面语言。"
@ -414,7 +412,6 @@ howto:
toggle_favorite: 改变项目的收藏状态
toggle_archive: 改变项目的已读状态
delete: 删除项目
material_title: 仅可用于 Material 主题的快捷键
add_link: 保存新链接
hide_form: 隐藏当前表单(搜索或添加新链接时)
arrows_navigation: 在项目间导航

Binary file not shown.

View file

@ -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) }}

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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 %}

View file

@ -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">

View file

@ -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>

View file

@ -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>

View file

Before

Width:  |  Height:  |  Size: 334 KiB

After

Width:  |  Height:  |  Size: 334 KiB

View file

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

View file

@ -16,7 +16,6 @@ use Wallabag\CoreBundle\Entity\Config;
class CreateConfigListener implements EventSubscriberInterface
{
private $em;
private $theme;
private $itemsOnPage;
private $feedLimit;
private $language;
@ -25,10 +24,9 @@ class CreateConfigListener implements EventSubscriberInterface
private $listMode;
private $session;
public function __construct(EntityManagerInterface $em, $theme, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, SessionInterface $session)
public function __construct(EntityManagerInterface $em, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, SessionInterface $session)
{
$this->em = $em;
$this->theme = $theme;
$this->itemsOnPage = $itemsOnPage;
$this->feedLimit = $feedLimit;
$this->language = $language;
@ -52,7 +50,6 @@ class CreateConfigListener implements EventSubscriberInterface
public function createConfig(UserEvent $event)
{
$config = new Config($event->getUser());
$config->setTheme($this->theme);
$config->setItemsPerPage($this->itemsOnPage);
$config->setFeedLimit($this->feedLimit);
$config->setLanguage($this->session->get('_locale', $this->language));

View file

@ -55,7 +55,6 @@ class ConfigControllerTest extends WallabagCoreTestCase
$form = $crawler->filter('button[id=config_save]')->form();
$data = [
'config[theme]' => 'material',
'config[items_per_page]' => '30',
'config[reading_speed]' => '100',
'config[action_mark_as_read]' => '0',
@ -120,7 +119,6 @@ class ConfigControllerTest extends WallabagCoreTestCase
{
return [
[[
'config[theme]' => 'material',
'config[items_per_page]' => '',
'config[language]' => 'en',
]],
@ -837,7 +835,6 @@ class ConfigControllerTest extends WallabagCoreTestCase
$config = new ConfigEntity($user);
$config->setTheme('material');
$config->setItemsPerPage(30);
$config->setReadingSpeed(200);
$config->setLanguage('en');

View file

@ -86,7 +86,6 @@ class EntryControllerTest extends WallabagCoreTestCase
public function testGetNew()
{
$this->logInAs('admin');
$this->useTheme('material');
$client = $this->getClient();
$crawler = $client->request('GET', '/new');

View file

@ -41,7 +41,6 @@ class RedirectTest extends TestCase
$user->addRole('ROLE_SUPER_ADMIN');
$config = new Config($user);
$config->setTheme('material');
$config->setItemsPerPage(30);
$config->setReadingSpeed(200);
$config->setLanguage('en');

View file

@ -11,7 +11,6 @@ use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\UserBundle\Entity\User;
abstract class WallabagCoreTestCase extends WebTestCase
@ -152,14 +151,6 @@ abstract class WallabagCoreTestCase extends WebTestCase
return $this->getLoggedInUser()->getId();
}
public function useTheme($theme)
{
$config = $this->getEntityManager()->getRepository(Config::class)->findOneByUser($this->getLoggedInUser());
$config->setTheme($theme);
$this->getEntityManager()->persist($config);
$this->getEntityManager()->flush();
}
/**
* Check if Redis is installed.
* If not, mark test as skip.

View file

@ -32,7 +32,6 @@ class CreateConfigListenerTest extends TestCase
$this->listener = new CreateConfigListener(
$this->em,
'material',
20,
50,
'fr',
@ -61,7 +60,6 @@ class CreateConfigListenerTest extends TestCase
);
$config = new Config($user);
$config->setTheme('material');
$config->setItemsPerPage(20);
$config->setFeedLimit(50);
$config->setLanguage('fr');