diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-09-03 16:13:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-03 16:13:08 +0200 |
commit | 8f8654913ce82be12219a37a24630066bbe950c2 (patch) | |
tree | 303a416dc4fd95bc124abaaf183f2ca9f39494d8 /app | |
parent | 9972ab467af3a9d6d1c7f3588dbb940b38298aaa (diff) | |
parent | b3f4a11a81b520b8dcc2bcebeeafea2cc0338a70 (diff) | |
download | wallabag-8f8654913ce82be12219a37a24630066bbe950c2.tar.gz wallabag-8f8654913ce82be12219a37a24630066bbe950c2.tar.zst wallabag-8f8654913ce82be12219a37a24630066bbe950c2.zip |
Merge pull request #2002 from wallabag/feature-display-itemsNumber
Feature display items number
Diffstat (limited to 'app')
-rwxr-xr-x | app/Resources/static/themes/material/css/main.css | 4 | ||||
-rw-r--r-- | app/config/config.yml | 1 | ||||
-rw-r--r-- | app/config/config_dev.yml | 8 | ||||
-rw-r--r-- | app/config/services.yml | 3 |
4 files changed, 16 insertions, 0 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 68f3f2ee..f4230734 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -308,6 +308,10 @@ nav input { | |||
308 | margin: 0 1rem; | 308 | margin: 0 1rem; |
309 | } | 309 | } |
310 | 310 | ||
311 | span.numberItems { | ||
312 | float: right; | ||
313 | } | ||
314 | |||
311 | /* ========================================================================== | 315 | /* ========================================================================== |
312 | * 3 = Filters slider | 316 | * 3 = Filters slider |
313 | * ========================================================================== */ | 317 | * ========================================================================== */ |
diff --git a/app/config/config.yml b/app/config/config.yml index 30fd6063..31bd8a8c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -49,6 +49,7 @@ wallabag_core: | |||
49 | language: en | 49 | language: en |
50 | rss_limit: 50 | 50 | rss_limit: 50 |
51 | reading_speed: 1 | 51 | reading_speed: 1 |
52 | cache_lifetime: 10 | ||
52 | 53 | ||
53 | wallabag_user: | 54 | wallabag_user: |
54 | registration_enabled: "%fosuser_registration%" | 55 | registration_enabled: "%fosuser_registration%" |
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 77840682..3b67d8f6 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml | |||
@@ -40,3 +40,11 @@ swiftmailer: | |||
40 | transport: smtp | 40 | transport: smtp |
41 | host: 'localhost' | 41 | host: 'localhost' |
42 | port: 1025 | 42 | port: 1025 |
43 | |||
44 | # If you want to use cache for queries used in WallabagExtension | ||
45 | # Uncomment the following lines | ||
46 | #doctrine: | ||
47 | # orm: | ||
48 | # metadata_cache_driver: apcu | ||
49 | # result_cache_driver: apcu | ||
50 | # query_cache_driver: apcu | ||
diff --git a/app/config/services.yml b/app/config/services.yml index 480408d9..95b8f26f 100644 --- a/app/config/services.yml +++ b/app/config/services.yml | |||
@@ -16,6 +16,9 @@ services: | |||
16 | wallabag.twig_extension: | 16 | wallabag.twig_extension: |
17 | class: Wallabag\CoreBundle\Twig\WallabagExtension | 17 | class: Wallabag\CoreBundle\Twig\WallabagExtension |
18 | public: false | 18 | public: false |
19 | arguments: | ||
20 | - "@wallabag_core.entry_repository" | ||
21 | - "@security.token_storage" | ||
19 | tags: | 22 | tags: |
20 | - { name: twig.extension } | 23 | - { name: twig.extension } |
21 | 24 | ||