diff options
author | Jeremy <jeremy.benoist@gmail.com> | 2015-02-23 22:55:06 +0100 |
---|---|---|
committer | Jeremy <jeremy.benoist@gmail.com> | 2015-03-01 10:49:16 +0100 |
commit | 32da2a70ef278bd42f66eb82c3fbf1905a417b87 (patch) | |
tree | 587ef3bae1f4881047eb1ceb0c005e7a8287bb71 /app/config | |
parent | fca3c757233940cbe4c431e3e05fe74893225fe0 (diff) | |
download | wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.tar.gz wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.tar.zst wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.zip |
Add LiipThemeBundle
Re-defined the config / user relation to be OneToOne bidirectionnal.
ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle
Force sqlite for test
In case of people use a different driver in parameter.yml (yes I do :))
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 21 | ||||
-rw-r--r-- | app/config/config_test.yml | 4 | ||||
-rw-r--r-- | app/config/routing.yml | 6 |
3 files changed, 27 insertions, 4 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 8e7258ea..1bd93d64 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -128,3 +128,24 @@ nelmio_cors: | |||
128 | allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] | 128 | allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] |
129 | max_age: 3600 | 129 | max_age: 3600 |
130 | hosts: ['^api\.'] | 130 | hosts: ['^api\.'] |
131 | |||
132 | liip_theme: | ||
133 | load_controllers: false | ||
134 | themes: | ||
135 | - baggy | ||
136 | - dark | ||
137 | - default | ||
138 | - dmagenta | ||
139 | - solarized | ||
140 | - solarized-dark | ||
141 | autodetect_theme: wallabag_core.helper.detect_active_theme | ||
142 | |||
143 | path_patterns: | ||
144 | app_resource: | ||
145 | - %%app_path%%/views/themes/%%current_theme%%/%%template%% | ||
146 | - %%app_path%%/views/%%template%% | ||
147 | bundle_resource: | ||
148 | - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% | ||
149 | bundle_resource_dir: | ||
150 | - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%% | ||
151 | - %%dir%%/views/%%bundle_name%%/%%override_path%% | ||
diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 83e2922a..a6ead1e8 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml | |||
@@ -17,4 +17,6 @@ swiftmailer: | |||
17 | 17 | ||
18 | doctrine: | 18 | doctrine: |
19 | dbal: | 19 | dbal: |
20 | path: %kernel.root_dir%/../data/db/poche_test.sqlite | 20 | driver: pdo_sqlite |
21 | path: %kernel.root_dir%/../data/db/wallabag_test.sqlite | ||
22 | host: localhost | ||
diff --git a/app/config/routing.yml b/app/config/routing.yml index 20f6979a..d681b39b 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -19,6 +19,6 @@ logout: | |||
19 | path: /logout | 19 | path: /logout |
20 | 20 | ||
21 | rest : | 21 | rest : |
22 | type : rest | 22 | type : rest |
23 | resource : "routing_rest.yml" | 23 | resource : "routing_rest.yml" |
24 | prefix : /api \ No newline at end of file | 24 | prefix : /api |