Merge pull request #1132 from wallabag/v2-theme

V2 theme

3 files changed, 22 insertions, 4 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index 8e7258ea..367aa276 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -128,3 +128,19 @@ nelmio_cors:
             allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
             max_age: 3600
             hosts: ['^api\.']
+
+liip_theme:
+    load_controllers: false
+    themes:
+        - baggy
+    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