From 32da2a70ef278bd42f66eb82c3fbf1905a417b87 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 23 Feb 2015 22:55:06 +0100 Subject: 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 :)) --- app/config/config.yml | 21 +++++++++++++++++++++ app/config/config_test.yml | 4 +++- app/config/routing.yml | 6 +++--- 3 files changed, 27 insertions(+), 4 deletions(-) (limited to 'app/config') 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: allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] max_age: 3600 hosts: ['^api\.'] + +liip_theme: + load_controllers: false + themes: + - baggy + - dark + - default + - dmagenta + - solarized + - solarized-dark + autodetect_theme: wallabag_core.helper.detect_active_theme + + path_patterns: + app_resource: + - %%app_path%%/views/themes/%%current_theme%%/%%template%% + - %%app_path%%/views/%%template%% + bundle_resource: + - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% + bundle_resource_dir: + - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%% + - %%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: doctrine: dbal: - path: %kernel.root_dir%/../data/db/poche_test.sqlite + driver: pdo_sqlite + path: %kernel.root_dir%/../data/db/wallabag_test.sqlite + 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: path: /logout rest : - type : rest - resource : "routing_rest.yml" - prefix : /api \ No newline at end of file + type : rest + resource : "routing_rest.yml" + prefix : /api -- cgit v1.2.3 From 71798e4ec428d03b1ce7116ae918a05a2d9b5044 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 28 Feb 2015 19:01:09 +0100 Subject: Remove old themes --- app/config/config.yml | 5 ----- 1 file changed, 5 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 1bd93d64..b751c0bb 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -133,11 +133,6 @@ liip_theme: load_controllers: false themes: - baggy - - dark - - default - - dmagenta - - solarized - - solarized-dark autodetect_theme: wallabag_core.helper.detect_active_theme path_patterns: -- cgit v1.2.3 From 3e30422cdae3cc45f44c3039c2d38b99121dd9e9 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 1 Mar 2015 20:25:43 +0100 Subject: Only one pattern for LiipTheme Others patterns aren't required (but I think it's still important to have them around) --- app/config/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index b751c0bb..367aa276 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -136,11 +136,11 @@ liip_theme: autodetect_theme: wallabag_core.helper.detect_active_theme path_patterns: - app_resource: - - %%app_path%%/views/themes/%%current_theme%%/%%template%% - - %%app_path%%/views/%%template%% + # app_resource: + # - %%app_path%%/views/themes/%%current_theme%%/%%template%% + # - %%app_path%%/views/%%template%% bundle_resource: - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% - bundle_resource_dir: - - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%% - - %%dir%%/views/%%bundle_name%%/%%override_path%% + # bundle_resource_dir: + # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%% + # - %%dir%%/views/%%bundle_name%%/%%override_path%% -- cgit v1.2.3