Merge pull request #1702 from wallabag/v2-piwik

Added Piwik implementation

src/Wallabag/CoreBundle/Command/InstallCommand.php

@@ -312,6 +312,21 @@ class InstallCommand extends ContainerAwareCommand
                 'value' => 'http://v2.wallabag.org',
                 'section' => 'misc',
             ],
+            [
+                'name' => 'piwik_enabled',
+                'value' => '0',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_host',
+                'value' => 'http://v2.wallabag.org',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_site_id',
+                'value' => '1',
+                'section' => 'analytics',
+            ],
         ];
 
         foreach ($settings as $setting) {

src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php

@@ -110,6 +110,21 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
                 'value' => 'http://v2.wallabag.org',
                 'section' => 'misc',
             ],
+            [
+                'name' => 'piwik_enabled',
+                'value' => '0',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_host',
+                'value' => 'http://v2.wallabag.org',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_site_id',
+                'value' => '1',
+                'section' => 'analytics',
+            ],
         ];
 
         foreach ($settings as $setting) {

src/Wallabag/CoreBundle/Resources/views/base.html.twig

@@ -71,5 +71,9 @@
         <div id="warning_message">
             You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
         </div>
+
+        {% if craue_setting('piwik_enabled') %}
+            {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
+        {% endif %}
     </body>
 </html>