mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 08:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4272 from Simounet/feat/load-custom-css-only-if-exists

Browse source 
Load custom.css only if exists
This commit is contained in:
Jérémy Benoist 2020-03-28 16:49:29 +01:00 committed by GitHub
commit 11079d204d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
GNUmakefile
View file

@ -17,14 +17,14 @@ help: ## Display this help menu
clean: ## Clear the application cache
rm -rf var/cache/*
install: customcss ## Install wallabag with the latest version
install: ## Install wallabag with the latest version
@./scripts/install.sh $(ENV)
update: ## Update the wallabag installation to the latest version
@./scripts/update.sh $(ENV)
dev: ENV=dev
dev: build customcss ## Install the latest dev version
dev: build ## Install the latest dev version
@./scripts/dev.sh
run: ## Run the wallabag built-in server
@ -34,9 +34,6 @@ build: ## Run webpack
@npm install
@npm run build:$(ENV)
customcss:
@touch web/custom.css
prepare: clean ## Prepare database for testsuite
ifdef DB
cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml

1
app/config/services.yml
View file

@ -16,6 +16,7 @@ services:
- "@security.token_storage"
- "%wallabag_core.cache_lifetime%"
- "@translator"
- "%kernel.root_dir%"
tags:
- { name: twig.extension }

4
src/Wallabag/CoreBundle/Resources/views/base.html.twig
View file

@ -44,7 +44,9 @@
{% block css %}
{% endblock %}
<link rel="stylesheet" href="{{ asset('custom.css') }}">
{% if asset_file_exists('custom.css') %}
<link rel="stylesheet" href="{{ asset('custom.css') }}">
{% endif %}
{% block scripts %}
<script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
<script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>

10
src/Wallabag/CoreBundle/Twig/WallabagExtension.php
View file

@ -18,14 +18,16 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
private $tagRepository;
private $lifeTime;
private $translator;
private $rootDir;
public function __construct(EntryRepository $entryRepository, TagRepository $tagRepository, TokenStorageInterface $tokenStorage, $lifeTime, TranslatorInterface $translator)
public function __construct(EntryRepository $entryRepository, TagRepository $tagRepository, TokenStorageInterface $tokenStorage, $lifeTime, TranslatorInterface $translator, string $rootDir)
{
$this->entryRepository = $entryRepository;
$this->tagRepository = $tagRepository;
$this->tokenStorage = $tokenStorage;
$this->lifeTime = $lifeTime;
$this->translator = $translator;
$this->rootDir = $rootDir;
}
public function getGlobals()
@ -48,6 +50,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
new TwigFunction('count_entries', [$this, 'countEntries']),
new TwigFunction('count_tags', [$this, 'countTags']),
new TwigFunction('display_stats', [$this, 'displayStats']),
new TwigFunction('asset_file_exists', [$this, 'assetFileExists']),
];
}
@ -165,6 +168,11 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
]);
}
public function assetFileExists($name)
{
return file_exists(realpath($this->rootDir . '/../web/' . $name));
}
public function getName()
{
return 'wallabag_extension';

6
tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php
View file

@ -25,7 +25,7 @@ class WallabagExtensionTest extends TestCase
->disableOriginalConstructor()
->getMock();
$extension = new WallabagExtension($entryRepository, $tagRepository, $tokenStorage, 0, $translator);
$extension = new WallabagExtension($entryRepository, $tagRepository, $tokenStorage, 0, $translator, '');
$this->assertSame('lemonde.fr', $extension->removeWww('www.lemonde.fr'));
$this->assertSame('lemonde.fr', $extension->removeWww('lemonde.fr'));
@ -50,7 +50,7 @@ class WallabagExtensionTest extends TestCase
->disableOriginalConstructor()
->getMock();
$extension = new WallabagExtension($entryRepository, $tagRepository, $tokenStorage, 0, $translator);
$extension = new WallabagExtension($entryRepository, $tagRepository, $tokenStorage, 0, $translator, '');
$this->assertSame('lemonde.fr', $extension->removeScheme('lemonde.fr'));
$this->assertSame('gist.github.com', $extension->removeScheme('gist.github.com'));
@ -75,7 +75,7 @@ class WallabagExtensionTest extends TestCase
->disableOriginalConstructor()
->getMock();
$extension = new WallabagExtension($entryRepository, $tagRepository, $tokenStorage, 0, $translator);
$extension = new WallabagExtension($entryRepository, $tagRepository, $tokenStorage, 0, $translator, '');
$this->assertSame('lemonde.fr', $extension->removeSchemeAndWww('www.lemonde.fr'));
$this->assertSame('lemonde.fr', $extension->removeSchemeAndWww('http://lemonde.fr'));