Merge branch 'stable/v0.9.7' of peyruis.bux.fr:/home/git/repositories/muzich into stable/v0.9.7

app/AppKernel.php

@@ -32,6 +32,7 @@ class AppKernel extends Kernel
             new Knp\Bundle\MenuBundle\KnpMenuBundle(),
             new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
             new Shtumi\UsefulBundle\ShtumiUsefulBundle(),
+            new FOS\FacebookBundle\FOSFacebookBundle(),
             
             new Muzich\CoreBundle\MuzichCoreBundle(),
             new Muzich\UserBundle\MuzichUserBundle(),

app/Resources/translations/text.fr.yml

@@ -103,9 +103,10 @@ help:
     text1:            |
                       Vous devez mettre dans ce champ l'adresse de la page internet
                       contenant la musique à partager. Faites bien attention a vous 
-                      trouver sur la page représentant la musique que vous souahitez 
+                      trouver sur la page représentant la musique que vous souaihtez 
                       partager. Evitez par exemple de partager une adresse après 
                       avoir effectué une recherche.
+    text1_plugin:     Bientôt un plugin firefox, chrome (et d'autres) pour partager encore plus facilement !
     title2:           Exemple avec Youtube
     title3:           Exemple avec Soundcloud
   tags_prompt:

app/Resources/translations/userui.en.yml

@@ -170,7 +170,7 @@ element_add:
     help:     |
               Copier ici le lien internet (http://) pointant sur la ressource 
               que vous souhaitez partager.
-    more_help: Cliquez ici pour plus de détails
+    more_help: Cliquez ici pour plus d'aide
               
   need_tags:
     name:     Demander de l'aide pour tagger votre partage

app/Resources/translations/userui.fr.yml

@@ -175,7 +175,7 @@ element_add:
     help:     |
               Copier ici le lien internet (http://) pointant sur la ressource 
               que vous souhaitez partager.
-    more_help: Cliquez ici pour plus de détails
+    more_help: Cliquez ici pour plus d'aide
               
   need_tags:
     name:     Demander de l'aide pour tagger votre partage

app/config/routing.yml

@@ -1,3 +1,9 @@
+_security_check:
+  pattern:  /login_facebook_check
+  
+_security_logout:
+    pattern:  /logout
+
 MuzichIndexBundle:
   resource: "@MuzichIndexBundle/Resources/config/routing.yml"
   prefix: /

composer.json

@@ -28,13 +28,14 @@
         "gregwar/image-bundle": "dev-master",
         "cedriclombardot/admingenerator-generator-bundle": "2.1.*@dev",
         "cedriclombardot/twig-generator": "dev-master",
-        "white-october/pagerfanta-bundle": "1.0.*@dev",
+        "white-october/pagerfanta-bundle": "2.1.*@dev",
         "pagerfanta/pagerfanta": "1.0.*@dev",
         "shtumi/useful-bundle": "dev-master",
         "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
         "sonata-project/admin-bundle": "2.1.*@dev",
         "sonata-project/jquery-bundle": "1.8.*@dev",
-        "sonata-project/block-bundle": "2.1.*@dev"
+        "sonata-project/block-bundle": "2.1.*@dev",
+        "friendsofsymfony/facebook-bundle": "dev-master"
     },
     "scripts": {
         "post-install-cmd": [

composer.lock

@@ -1,5 +1,5 @@
 {
-    "hash": "dd5c41c30319b0b4e3eff5370c6bedd2",
+    "hash": "ca864c17169224f4d52600e48be0f467",
     "packages": [
         {
             "name": "cedriclombardot/admingenerator-generator-bundle",
@@ -8,12 +8,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
-                "reference": "1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3"
+                "reference": "294adb5a1766445e2f2fd3f28c28279084c38435"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3",
-                "reference": "1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3",
+                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/294adb5a1766445e2f2fd3f28c28279084c38435",
+                "reference": "294adb5a1766445e2f2fd3f28c28279084c38435",
                 "shasum": ""
             },
             "require": {
@@ -22,7 +22,7 @@
                 "symfony/symfony": ">= 2.1.0",
                 "twig/extensions": "dev-master",
                 "twig/twig": ">= 1.9.0",
-                "white-october/pagerfanta-bundle": "dev-master"
+                "white-october/pagerfanta-bundle": "2.1.*@dev"
             },
             "require-dev": {
                 "doctrine/common": ">=2.2.3,<2.5-dev",
@@ -33,7 +33,7 @@
                 "avalanche123/imagine-bundle": "Image manipulation using Imagine and Twig Filters",
                 "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
             },
-            "time": "2013-04-14 09:22:28",
+            "time": "2013-05-14 12:00:41",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -238,23 +238,23 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "2.3.3",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "2.3.3"
+                "reference": "2.3.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.3",
-                "reference": "2.3.3",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.4",
+                "reference": "2.3.4",
                 "shasum": ""
             },
             "require": {
                 "doctrine/common": ">=2.3.0,<2.5-dev",
                 "php": ">=5.3.2"
             },
-            "time": "2013-03-24 19:16:29",
+            "time": "2013-05-11 07:45:37",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -428,16 +428,16 @@
         },
         {
             "name": "doctrine/orm",
-            "version": "2.3.3",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/doctrine2.git",
-                "reference": "2.3.3"
+                "reference": "2.3.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2.3.3",
-                "reference": "2.3.3",
+                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2.3.4",
+                "reference": "2.3.4",
                 "shasum": ""
             },
             "require": {
@@ -449,7 +449,7 @@
             "suggest": {
                 "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
             },
-            "time": "2013-03-24 20:43:58",
+            "time": "2013-05-11 07:51:12",
             "bin": [
                 "bin/doctrine",
                 "bin/doctrine.php"
@@ -497,6 +497,109 @@
             ]
         },
         {
+            "name": "facebook/php-sdk",
+            "version": "v3.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/facebook-php-sdk.git",
+                "reference": "v3.2.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/facebook-php-sdk/zipball/v3.2.2",
+                "reference": "v3.2.2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "php": ">=5.2.0"
+            },
+            "time": "2013-01-15 21:37:15",
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Facebook",
+                    "homepage": "https://github.com/facebook/facebook-php-sdk/contributors"
+                }
+            ],
+            "description": "Facebook PHP SDK",
+            "homepage": "https://github.com/facebook/facebook-php-sdk",
+            "keywords": [
+                "facebook",
+                "sdk"
+            ]
+        },
+        {
+            "name": "friendsofsymfony/facebook-bundle",
+            "version": "dev-master",
+            "target-dir": "FOS/FacebookBundle",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfSymfony/FOSFacebookBundle.git",
+                "reference": "9c93669fd8f93941602d348daa58273c29be229f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSFacebookBundle/zipball/9c93669fd8f93941602d348daa58273c29be229f",
+                "reference": "9c93669fd8f93941602d348daa58273c29be229f",
+                "shasum": ""
+            },
+            "require": {
+                "facebook/php-sdk": "3.2.*",
+                "php": ">=5.3.2",
+                "symfony/http-foundation": ">=2.1,<2.3",
+                "symfony/security": ">=2.1,<2.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*",
+                "symfony/framework-bundle": ">=2.1,<2.3",
+                "symfony/security-bundle": ">=2.1,<2.3",
+                "symfony/twig-bundle": ">=2.1,<2.3"
+            },
+            "time": "2013-05-14 18:06:07",
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "FOS\\FacebookBundle": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kris Wallsmith",
+                    "email": "kris.wallsmith@gmail.com",
+                    "homepage": "http://kriswallsmith.net/"
+                },
+                {
+                    "name": "FriendsOfSymfony Community",
+                    "homepage": "https://github.com/friendsofsymfony/FOSFacebookBundle/contributors"
+                }
+            ],
+            "description": "Integrate the Facebook Platform into your Symfony2 application.",
+            "homepage": "http://friendsofsymfony.github.com",
+            "keywords": [
+                "facebook"
+            ]
+        },
+        {
             "name": "friendsofsymfony/user-bundle",
             "version": "v1.3.1",
             "target-dir": "FOS/UserBundle",
@@ -647,19 +750,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Gregwar/ImageBundle.git",
-                "reference": "255d20676a53c921a7a1832d360b6eca705f5b44"
+                "reference": "d6d8c1aa8c4fe03a9b8470d2bf195c4dbf89643b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/255d20676a53c921a7a1832d360b6eca705f5b44",
-                "reference": "255d20676a53c921a7a1832d360b6eca705f5b44",
+                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/d6d8c1aa8c4fe03a9b8470d2bf195c4dbf89643b",
+                "reference": "d6d8c1aa8c4fe03a9b8470d2bf195c4dbf89643b",
                 "shasum": ""
             },
             "require": {
                 "ext-gd": "*",
                 "php": ">=5.3.0"
             },
-            "time": "2013-04-25 11:48:38",
+            "time": "2013-05-09 10:44:43",
             "type": "symfony-bundle",
             "autoload": {
                 "psr-0": {
@@ -1108,12 +1211,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kriswallsmith/assetic.git",
-                "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19"
+                "reference": "5441014f28b8fe024c547fb7a15cd737c6cb1a05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/1b17f9a239276f24344f9f7d7be8293f6dca4e19",
-                "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19",
+                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/5441014f28b8fe024c547fb7a15cd737c6cb1a05",
+                "reference": "5441014f28b8fe024c547fb7a15cd737c6cb1a05",
                 "shasum": ""
             },
             "require": {
@@ -1128,9 +1231,9 @@
                 "leafo/scssphp": "*",
                 "leafo/scssphp-compass": "*",
                 "mrclay/minify": "*",
-                "phpunit/phpunit": "3.7.*",
+                "phpunit/phpunit": ">=3.7,<4.0",
                 "ptachoire/cssembed": "*",
-                "twig/twig": ">=1.6.0,<2.0"
+                "twig/twig": ">=1.6,<2.0"
             },
             "suggest": {
                 "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
@@ -1139,11 +1242,11 @@
                 "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
                 "twig/twig": "Assetic provides the integration with the Twig templating engine"
             },
-            "time": "2013-04-27 14:32:20",
+            "time": "2013-05-18 16:31:41",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -1235,12 +1338,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/whiteoctober/Pagerfanta.git",
-                "reference": "65c24acf84410837aa873801f5a09b4039a5735b"
+                "reference": "55544f3af5b409d4ee9d618934f4d92ef874672c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/65c24acf84410837aa873801f5a09b4039a5735b",
-                "reference": "65c24acf84410837aa873801f5a09b4039a5735b",
+                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/55544f3af5b409d4ee9d618934f4d92ef874672c",
+                "reference": "55544f3af5b409d4ee9d618934f4d92ef874672c",
                 "shasum": ""
             },
             "require": {
@@ -1260,7 +1363,7 @@
                 "propel/propel1": "To use the PropelAdapter",
                 "solarium/solarium": "To use the SolariumAdapter."
             },
-            "time": "2013-04-24 11:37:27",
+            "time": "2013-05-16 12:46:53",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1293,23 +1396,23 @@
         },
         {
             "name": "sensio/distribution-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Sensio/Bundle/DistributionBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioDistributionBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioDistributionBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/sensio/SensioDistributionBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
                 "symfony/framework-bundle": "2.1.*"
             },
-            "time": "2013-02-04 19:54:42",
+            "time": "2013-04-09 09:20:26",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1339,24 +1442,24 @@
         },
         {
             "name": "sensio/framework-extra-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Sensio/Bundle/FrameworkExtraBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioFrameworkExtraBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioFrameworkExtraBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/sensio/SensioFrameworkExtraBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
                 "doctrine/common": ">=2.1,<2.5-dev",
                 "symfony/framework-bundle": "2.1.*"
             },
-            "time": "2013-02-22 17:57:31",
+            "time": "2013-04-05 06:59:04",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1386,17 +1489,17 @@
         },
         {
             "name": "sensio/generator-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Sensio/Bundle/GeneratorBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioGeneratorBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioGeneratorBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/sensio/SensioGeneratorBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
@@ -1408,7 +1511,7 @@
                 "symfony/doctrine-bridge": "2.1.*",
                 "twig/twig": ">=1.8,<2.0-dev"
             },
-            "time": "2013-01-04 17:09:08",
+            "time": "2013-04-01 18:11:18",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1486,12 +1589,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-                "reference": "c611614f23d5d42257747ae81bcc36df86216bae"
+                "reference": "2.1.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/c611614f23d5d42257747ae81bcc36df86216bae",
-                "reference": "c611614f23d5d42257747ae81bcc36df86216bae",
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/2.1.0",
+                "reference": "2.1.0",
                 "shasum": ""
             },
             "require": {
@@ -1562,12 +1665,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataBlockBundle.git",
-                "reference": "3f18e2df3171bb1149f55ffcb34ecc41169bf15f"
+                "reference": "2.1.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/3f18e2df3171bb1149f55ffcb34ecc41169bf15f",
-                "reference": "3f18e2df3171bb1149f55ffcb34ecc41169bf15f",
+                "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/2.1.2",
+                "reference": "2.1.2",
                 "shasum": ""
             },
             "require": {
@@ -1677,16 +1780,16 @@
         },
         {
             "name": "sonata-project/exporter",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/exporter.git",
-                "reference": "1.2.1"
+                "reference": "1.2.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/exporter/zipball/1.2.1",
-                "reference": "1.2.1",
+                "url": "https://api.github.com/repos/sonata-project/exporter/zipball/1.2.2",
+                "reference": "1.2.2",
                 "shasum": ""
             },
             "require": {
@@ -1700,7 +1803,7 @@
                 "ext-curl": "*",
                 "symfony/routing": "*"
             },
-            "time": "2013-03-04 14:20:46",
+            "time": "2013-05-02 17:17:04",
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -2011,17 +2114,17 @@
         },
         {
             "name": "symfony/swiftmailer-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Symfony/Bundle/SwiftmailerBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/SwiftmailerBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
@@ -2201,26 +2304,26 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.12.3",
+            "version": "v1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fabpot/Twig.git",
-                "reference": "v1.12.3"
+                "reference": "v1.13.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3",
-                "reference": "v1.12.3",
+                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.13.0",
+                "reference": "v1.13.0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2013-04-08 12:40:11",
+            "time": "2013-05-10 15:12:43",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -2250,7 +2353,7 @@
         },
         {
             "name": "white-october/pagerfanta-bundle",
-            "version": "dev-master",
+            "version": "2.1.x-dev",
             "target-dir": "WhiteOctober/PagerfantaBundle",
             "source": {
                 "type": "git",
@@ -2317,6 +2420,7 @@
         "sonata-project/doctrine-orm-admin-bundle": 20,
         "sonata-project/admin-bundle": 20,
         "sonata-project/jquery-bundle": 20,
-        "sonata-project/block-bundle": 20
+        "sonata-project/block-bundle": 20,
+        "friendsofsymfony/facebook-bundle": 20
     }
 }

src/Muzich/AdminBundle/Resources/config/Moderate_tag-generator.yml

@@ -14,10 +14,14 @@ builders:
       object_actions:
         accept:
           route: Muzich_AdminBundle_Moderate_tag_accept
+          params:
+            pk: "{{ Tag.id }}"
           icon: icon-ok-sign
           class: moderate_accept
         refuse:
           route: Muzich_AdminBundle_Moderate_tag_refuse
+          params:
+            pk: "{{ Tag.id }}"
           icon: icon-trash
           class: moderate_refuse
       sort: [ tomoderate, DESC ]

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -364,11 +364,6 @@ class ElementController extends Controller
       return $this->redirect($this->generateUrl('home'));
     }
     
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
     if ($this->getRequest()->getMethod() != 'POST')
     {
       throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException();
@@ -396,7 +391,7 @@ class ElementController extends Controller
     ));
     
     // Récupération de ces nouveaux élméents
-    $elements = $es->getElements($this->getDoctrine(), $this->getUserId());
+    $elements = $es->getElements($this->getDoctrine(), $this->getUserId(true));
     
     // On en fait un rendu graphique
     $html_elements = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(
@@ -416,7 +411,7 @@ class ElementController extends Controller
         // On n'en récupère que x
         'count'     => $this->container->getParameter('search_default_count')
       ));
-      $count = $es->getElements($this->getDoctrine(), $this->getUserId(), 'count');
+      $count = $es->getElements($this->getDoctrine(), $this->getUserId(true), 'count');
     }
     
     return $this->jsonResponse(array(

src/Muzich/CoreBundle/Entity/User.php

@@ -281,6 +281,9 @@ class User extends BaseUser
    */
   private $password_set = true;
   
+  /** @ORM\Column(name="facebook_id", type="string", length=255, nullable=true) */
+  protected $facebook_id;
+  
   /**
    * 
    */
@@ -1172,4 +1175,30 @@ class User extends BaseUser
     $this->setPasswordSet(true);
   }
   
+  /** @return void */
+  public function setFacebookId($facebook_id)
+  {
+    $this->facebook_id = $facebook_id;
+    $this->password_set = true;
+    $this->setEmailConfirmed(true);
+  }
+
+  /** @return string */
+  public function getFacebookId()
+  {
+    return $this->facebook_id;
+  }
+  
+  /** @param Array */
+  public function setFBData($fbdata) // C'est dans cette méthode que vous ajouterez vos informations
+  {
+    if (isset($fbdata['id'])) {
+      $this->setFacebookId($fbdata['id']);
+      $this->addRole('ROLE_FACEBOOK');
+    }
+    if (isset($fbdata['email'])) {
+      $this->setEmail($fbdata['email']);
+    }
+  }
+  
 }

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -266,4 +266,12 @@ class UserRepository extends EntityRepository
     ;
   }
   
+  public function countUsers()
+  {
+    return $this->getEntityManager()
+      ->createQuery("SELECT COUNT(u.id) FROM MuzichCoreBundle:User u")
+      ->getSingleScalarResult()
+    ;
+  }
+  
 }  

src/Muzich/CoreBundle/Resources/config/security.yml

@@ -1,4 +1,4 @@
-parameters:
+#parameters:
     # ... other parameters
     #security.acl.permission.map.class: Sonata\AdminBundle\Security\Acl\Permission\AdminPermissionMap
     
@@ -6,6 +6,8 @@ security:
     providers:
         fos_userbundle:
             id: fos_user.user_provider.username_email
+        my_facebook_provider:
+            id: my_user.facebook_provider
     encoders:
         "FOS\UserBundle\Model\UserInterface":
             algorithm: sha512
@@ -22,8 +24,13 @@ security:
                 check_path:     /login_check
                 failure_path:   null
                 default_target_path: home
-                success_handler: security.authentication.success_handler
-                failure_handler: security.authentication.failure_handler
+                success_handler: muzich.security.authentication.success_handler
+                failure_handler: muzich.security.authentication.failure_handler
+            fos_facebook:
+                app_url: "%api_facebook_name%"
+                server_url: "%api_facebook_server%"
+                check_path: /login_facebook_check
+                provider: my_facebook_provider
                 
             logout:
                 path:   /logout

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -971,8 +971,8 @@ ul#favorite_tags li
 
 #registration_link, #login_link
 {
-  margin-right: -10px;
-  margin-top: -68px;
+  margin-right: -112px;
+  margin-top: -76px;
 }
 
 #element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_link_disabled img, #group_add_close_link img, #registration_link img, #login_link img
@@ -2207,3 +2207,16 @@ div#helpbox div.center input.button
 {
   float: none;
 }
+
+div#facebook_login
+{
+  float: right;
+  margin-bottom: 0;
+  margin-right: 0;
+  margin-top: -5px;
+}
+
+div#login_box
+{
+  margin-top: 23px;
+}

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -3171,12 +3171,17 @@ function open_connection_or_subscription_window(open_login_part)
         }
       });
       
+      $('div#facebook_login').prependTo('div#helpbox');
+      $('div#facebook_login').show();
+      
     });
   }
 }
 
 function close_popin()
 {
+  $('div#facebook_login').hide();
+  $('div#facebook_login').appendTo('body');
   // Fond gris
   $('#fade').fadeOut(1000, function(){$('#fade').remove();});
   // On cache le lecteur

src/Muzich/CoreBundle/Resources/views/Component/facebook.html.twig

@@ -0,0 +1,23 @@
+{{ facebook_initialize({'xfbml': true, 'culture': 'fr_FR', 'fbAsyncInit': 'onFbInit();'}) }}
+<script type="text/javascript" > // Script for FOSFacebookBundle
+function goLogIn(){
+    window.location = "{{ path('_security_check') }}";
+}
+
+function onFbInit() {
+    if (typeof(FB) != 'undefined' && FB != null ) {
+        FB.Event.subscribe('auth.statusChange', function(response) {
+            if (response.session || response.authResponse) {
+                setTimeout(goLogIn, 50);
+            } else {
+                window.location = "{{ path('_security_logout') }}";
+            }
+        });
+    }
+}
+</script>
+
+<div id="facebook_login" style="display: none;">
+  {{ facebook_login_button({'autologoutlink': false}) }}
+</div>
+  

src/Muzich/CoreBundle/Resources/views/Element/form.add.html.twig

@@ -15,9 +15,11 @@
 
   <span class="help">
     {{ 'element_add.url.help'|trans({}, 'userui') }}
-    <a href="{{ path('helpbox_bootstrap', {'ressource_id':'element_add_url'}) }}" class="helpbox">
-      {{ 'element_add.url.more_help'|trans({}, 'userui') }}
-    </a>
+    <strong>
+      <a href="{{ path('helpbox_bootstrap', {'ressource_id':'element_add_url'}) }}" class="helpbox">
+        {{ 'element_add.url.more_help'|trans({}, 'userui') }}
+      </a>
+      </strong>
   </span>
   
 

src/Muzich/CoreBundle/Resources/views/Helpbox/element_add_url.html.twig

@@ -1,6 +1,11 @@
 <h1>{{ 'help.element_add_url.title1'|trans({}, 'text') }}</h1>
 
-<p>{{ 'help.element_add_url.text1'|trans({}, 'text') }}</p>
+<p>
+  {{ 'help.element_add_url.text1'|trans({}, 'text') }}
+  <strong>
+    {{ 'help.element_add_url.text1_plugin'|trans({}, 'text') }}
+  </strong>
+</p>
 
 <h2>{{ 'help.element_add_url.title2'|trans({}, 'text') }}</h2>
 

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html xmlns:fb="http://www.facebook.com/2008/fbml">
   <head>
     <title>Muzi.ch - {% block title %}{% endblock %}</title>
     {% include 'MuzichCoreBundle:Layout:head.html.twig' %}
@@ -8,6 +8,7 @@
   </head>
   <body>
     
+    {% include 'MuzichCoreBundle:Component:facebook.html.twig' %}
     {% include 'MuzichCoreBundle:Layout:noscript.html.twig' %}
     {% include 'MuzichCoreBundle:Autoplay:autoplay.html.twig' %}
   

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -217,8 +217,20 @@ class ElementSearcherQueryBuilder
   private function buildStrict()
   {
     // Recherche strict ou non ?
-    if ($this->es->getTagStrict() && count(($tags = $this->es->getTags())))
+    if ($this->es->getTagStrict() && count(($tags = $this->es->getTags())) && $this->es->getTags() != '[]')
     {
+      if (is_null($tags) && !count($tags))
+      {
+        return;
+      }
+      
+      if (is_string($tags))
+      {
+        if (is_null(trim($tags)))
+        {
+          return;
+        }
+      }
       // On a besoin de récupérer la liste des element_id qui ont les tags
       // demandés.
       $tag_ids = '';

src/Muzich/CoreBundle/Security/User/Provider/FacebookProvider.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Muzich\CoreBundle\Security\User\Provider;
+
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+use \BaseFacebook;
+use \FacebookApiException;
+
+class FacebookProvider implements UserProviderInterface
+{
+  /**
+   * @var \Facebook
+   */
+  protected $facebook;
+  protected $userManager;
+  protected $validator;
+
+  public function __construct(BaseFacebook $facebook, $userManager, $validator)
+  {
+    $this->facebook = $facebook;
+    $this->userManager = $userManager;
+    $this->validator = $validator;
+  }
+
+  public function supportsClass($class)
+  {
+    return $this->userManager->supportsClass($class);
+  }
+
+  public function findUserByFbId($fbId)
+  {
+    return $this->userManager->findUserBy(array('facebook_id' => $fbId));
+  }
+
+  public function findUserByEmail($email)
+  {
+    return $this->userManager->findUserBy(array('email' => $this->userManager->canonicalizeEmailLocal($email)));
+  }
+
+  public function loadUserByUsername($username)
+  {
+    $user = $this->findUserByFbId($username);
+
+    try {
+      $fbdata = $this->facebook->api('/me');
+    } catch (FacebookApiException $e) {
+      throw new UsernameNotFoundException('The user is not authenticated on facebook');
+      $fbdata = null;
+    }
+    
+    $user = $this->findUserByEmail($fbdata['email']);
+    
+    if (!empty($fbdata)) {
+      if (empty($user)) {
+        $user = $this->userManager->getNewReadyUser();
+        $user->setFBData($fbdata);
+      }
+
+      if (count($this->validator->validate($user, 'Facebook'))) {
+        throw new UsernameNotFoundException('The facebook user could not be stored');
+      }
+      $this->userManager->updateUser($user);
+    }
+
+    if (empty($user)) {
+      throw new UsernameNotFoundException('The user is not authenticated on facebook');
+    }
+
+    return $user;
+  }
+
+  public function refreshUser(UserInterface $user)
+  {
+    if (!$this->supportsClass(get_class($user)) || !$user->getFacebookId()) {
+      throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
+    }
+    
+    return $this->loadUserByUsername($user->getFacebookId());
+  }
+}

src/Muzich/UserBundle/Controller/UserController.php

@@ -136,58 +136,7 @@ class UserController extends Controller
   /** @return User */
   protected function getNewUser()
   {
-    // Ce serais mieux d'appeler notre user manager et d'utiliser notre createUser
-    // avec ce code.
-    $userManager = $this->container->get('fos_user.user_manager');
-    $user = $userManager->createUser();
-    $user->setUsername($this->generateUsername());
-    $user->setPlainPassword($this->generatePassword(32));
-    $user->setEnabled(true);
-    $user->setCguAccepted(true);
-    $user->setEmailConfirmed(false);
-    $user->setUsernameUpdatable(true);
-    $user->setPasswordSet(false);
-    return $user;
-  }
-  
-  protected function generateUsername()
-  {
-    $qb = $this->getEntityManager()->createQueryBuilder();
-    $qb->select('count(id)');
-    $qb->from('MuzichCoreBundle:User','id');
-    $count = $qb->getQuery()->getSingleScalarResult();
-    
-    while ($this->usernameExist($count))
-    {
-      $count++;
-    }
-    
-    return 'User'.$count;
-  }
-  
-  protected function usernameExist($count)
-  {
-    $username = 'User'.$count;
-    if ($this->getEntityManager()->getRepository('MuzichCoreBundle:User')
-      ->findOneByUsername($username))
-    {
-      return true;
-    }
-    
-    return false;
-  }
-  
-  protected function generatePassword($length = 8)
-  {
-    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    $count = mb_strlen($chars);
-    
-    for ($i = 0, $result = ''; $i < $length; $i++) {
-        $index = rand(0, $count - 1);
-        $result .= mb_substr($chars, $index, 1);
-    }
-    
-    return $result;
+    return $this->container->get('muzich_user_manager')->getNewReadyUser();
   }
   
   protected function checkRegistrationValues($form)

src/Muzich/UserBundle/Entity/UserManager.php

@@ -32,5 +32,58 @@ class UserManager extends UserManagerBase
 
     $this->objectManager->getEventManager()->addEventSubscriber($sluggableListener);
   }
+  
+  public function getNewReadyUser()
+  {
+    $user = $this->createUser();
+    $user->setUsername($this->generateUsername());
+    $user->setPlainPassword($this->generatePassword(32));
+    $user->setEnabled(true);
+    $user->setCguAccepted(true);
+    $user->setEmailConfirmed(false);
+    $user->setUsernameUpdatable(true);
+    $user->setPasswordSet(false);
+    return $user;
+  }
+  
+  protected function generateUsername()
+  {
+    $count = $this->repository->countUsers();
+    while ($this->usernameExist($count))
+    {
+      $count++;
+    }
+    
+    return 'User'.$count;
+  }
+  
+  protected function usernameExist($count)
+  {
+    $username = 'User'.$count;
+    if ($this->repository->findOneByUsername($username))
+    {
+      return true;
+    }
+    
+    return false;
+  }
+  
+  protected function generatePassword($length = 8)
+  {
+    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    $count = mb_strlen($chars);
+    
+    for ($i = 0, $result = ''; $i < $length; $i++) {
+        $index = rand(0, $count - 1);
+        $result .= mb_substr($chars, $index, 1);
+    }
+    
+    return $result;
+  }
+  
+  public function canonicalizeEmailLocal($email)
+  {
+    return $this->emailCanonicalizer->canonicalize($email);
+  }
 
 }

src/Muzich/UserBundle/Resources/views/Account/subscribe_or_login.html.twig

@@ -20,4 +20,4 @@
   
   {% include "MuzichUserBundle:Registration:register.html.twig" %}
   
-</div>
+</div>

web/bundles/admingeneratorgenerator/javascripts/double_list.js

@@ -2,12 +2,9 @@ var sfDoubleList =
 {
   init: function(id, className)
   {
-    if(id == null)
-    return;
-    
     form = sfDoubleList.get_current_form(id);
 
-      callback = function() { sfDoubleList.submit(form, className) };
+    callback = function() { sfDoubleList.submit(form, className) };
 
     if (form.addEventListener)
     {

web/bundles/admingeneratorgenerator/js/admingenerator/general.js

@@ -1,10 +1,30 @@
 $(document).ready(function(){
     // Enable tooltips
-    $('a[rel="tooltip"]').tooltip();
+    $('td.actions button[rel="tooltip"]').tooltip();
     
-    // Enable confirm on object actions
-    $("td.actions a[data-confirm]").click(function(e) {
-        e.preventDefault();        
-    	if(confirm($(this).data('confirm'))) { window.location.href = $(this).attr('href'); }
+    // Convert object action buttons into POST requests
+    $("td.actions button, .form-actions .btn-toolbar button").click(function(e) {
+        e.preventDefault();
+        
+        // Create hidden form
+        var form = $('<form />').attr({
+            method: 'POST',
+            action: $(this).data('action'),
+            style:  'visibility: hidden'
+        }).appendTo($('body'));
+        
+        if($(this).data('csrf-token')) {
+            // Add csrf protection token
+            $('<input />').attr({
+                type:   'hidden',
+                name:   '_csrf_token',
+                value:  $(this).data('csrf-token')
+            }).appendTo(form);
+        }
+        
+        // Submit POST request, if required promt for confirmation
+        if(!$(this).data('confirm') || confirm($(this).data('confirm'))) {
+            form.submit();
+        }
     });
-});
+});

web/bundles/admingeneratorgenerator/js/jquery-bbq/jquery.deparam.js

@@ -0,0 +1,97 @@
+/*
+  jQuery deparam is an extraction of the deparam method from Ben Alman's jQuery BBQ
+  http://benalman.com/projects/jquery-bbq-plugin/
+*/
+(function ($) {
+  $.deparam = function (params, coerce) {
+    var obj = {},
+        coerce_types = { 'true': !0, 'false': !1, 'null': null };
+      
+    // Iterate over all name=value pairs.
+    $.each(params.replace(/\+/g, ' ').split('&'), function (j,v) {
+      var param = v.split('='),
+          key = decodeURIComponent(param[0]),
+          val,
+          cur = obj,
+          i = 0,
+            
+          // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
+          // into its component parts.
+          keys = key.split(']['),
+          keys_last = keys.length - 1;
+        
+      // If the first keys part contains [ and the last ends with ], then []
+      // are correctly balanced.
+      if (/\[/.test(keys[0]) && /\]$/.test(keys[keys_last])) {
+        // Remove the trailing ] from the last keys part.
+        keys[keys_last] = keys[keys_last].replace(/\]$/, '');
+          
+        // Split first keys part into two parts on the [ and add them back onto
+        // the beginning of the keys array.
+        keys = keys.shift().split('[').concat(keys);
+          
+        keys_last = keys.length - 1;
+      } else {
+        // Basic 'foo' style key.
+        keys_last = 0;
+      }
+        
+      // Are we dealing with a name=value pair, or just a name?
+      if (param.length === 2) {
+        val = decodeURIComponent(param[1]);
+          
+        // Coerce values.
+        if (coerce) {
+          val = val && !isNaN(val)              ? +val              // number
+              : val === 'undefined'             ? undefined         // undefined
+              : coerce_types[val] !== undefined ? coerce_types[val] // true, false, null
+              : val;                                                // string
+        }
+          
+        if ( keys_last ) {
+          // Complex key, build deep object structure based on a few rules:
+          // * The 'cur' pointer starts at the object top-level.
+          // * [] = array push (n is set to array length), [n] = array if n is 
+          //   numeric, otherwise object.
+          // * If at the last keys part, set the value.
+          // * For each keys part, if the current level is undefined create an
+          //   object or array based on the type of the next keys part.
+          // * Move the 'cur' pointer to the next level.
+          // * Rinse & repeat.
+          for (; i <= keys_last; i++) {
+            key = keys[i] === '' ? cur.length : keys[i];
+            cur = cur[key] = i < keys_last
+              ? cur[key] || (keys[i+1] && isNaN(keys[i+1]) ? {} : [])
+              : val;
+          }
+            
+        } else {
+          // Simple key, even simpler rules, since only scalars and shallow
+          // arrays are allowed.
+            
+          if ($.isArray(obj[key])) {
+            // val is already an array, so push on the next value.
+            obj[key].push( val );
+              
+          } else if (obj[key] !== undefined) {
+            // val isn't an array, but since a second value has been specified,
+            // convert val into an array.
+            obj[key] = [obj[key], val];
+              
+          } else {
+            // val is a scalar.
+            obj[key] = val;
+          }
+        }
+          
+      } else if (key) {
+        // No value was defined, so set something meaningful.
+        obj[key] = coerce
+          ? undefined
+          : '';
+      }
+    });
+      
+    return obj;
+  };
+})(jQuery);

web/bundles/muzichcore/css/main.css

@@ -544,7 +544,7 @@ img.tag_add_to_favorites
   margin-left: 1px;
 }
 
-td.element_content a.display_comments, td.element_content a.add_comment, td.element_content a.hide_comments, div.comments a.add_comment
+td.element_content a.display_comments, td.element_content a.add_comment, td.element_content a.add_comment_disabled, td.element_content a.hide_comments, div.comments a.add_comment
 {
   color: #404040;
 }
@@ -948,7 +948,7 @@ ul#favorite_tags li
   margin-right: 0px;
 }
 
-#element_add_link, #element_add_close_link, #group_add_link, #group_add_close_link, #registration_link, #login_link, #know_more
+#element_add_link, #element_add_close_link, #group_add_link, #group_add_link_disabled, #group_add_close_link, #registration_link, #login_link, #know_more, #launch_tour
 {
   float: right;
   margin-top: -58px;
@@ -971,17 +971,17 @@ ul#favorite_tags li
 
 #registration_link, #login_link
 {
-  margin-right: -10px;
-  margin-top: -68px;
+  margin-right: -112px;
+  margin-top: -76px;
 }
 
-#element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_close_link img, #registration_link img, #login_link img
+#element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_link_disabled img, #group_add_close_link img, #registration_link img, #login_link img
 {
   margin-bottom: -5px;
     margin-right: -5px;
 }
 
-#element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_close_link.justtopright
+#element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_link_disabled.justtopright, #group_add_close_link.justtopright
 {
   margin-top: 0px;
   margin-right: 0px;
@@ -1261,6 +1261,11 @@ div.search_tag_list ul.search_tag_list li.new
 {
   color: black;
 }
+
+#helpbox div.search_tag_list ul.search_tag_list li.new a
+{
+  color: black;
+}
   
 
 div.search_tag_list ul.search_tag_list li:hover
@@ -1510,12 +1515,17 @@ div#group_add_box input[type="submit"]
 
 div#registration_box input.niceinput
 {
-  width: 430px;
+  width: 250px;
 }
 
 div#registration_box label
 {
-  width: 170px;
+  width: 70px;
+}
+
+div#registration_box input[type="submit"]
+{
+  float: right;
 }
 
 div#registration_box div.field
@@ -1707,7 +1717,7 @@ div.show_options {
     float: right;
 }
 
-#container #group_add_link, #container #group_add_close_link
+#container #group_add_link, #container #group_add_link_disabled, #container #group_add_close_link
 {
   font-size: 120%;
   float: right;
@@ -1857,7 +1867,17 @@ p.group_description
 
 #login_box input[id="username"], #login_box input[id="password"]
 {
-  width: 230px;
+  width: 228px;
+}
+
+#login_box div.login
+{
+  margin-top: 8px;
+}
+
+#login_box div.textcenter
+{
+  margin-top: 12px;
 }
 
 /*#registration_link, #login_link
@@ -1996,12 +2016,13 @@ div#tourControls a#tourEnd
   float: right;
 }
 
-a.tags_prompt_helpbox
+a.tag_prompt_tool
 {
-  float: left;
+  float: right;
   margin-bottom: 0;
   margin-left: 0px;
   margin-top: 5px;
+  margin-right: 11px;
 }
 
 form#address_update input.intext
@@ -2015,11 +2036,12 @@ div#form_add_thumb img
   height: 100px;
 }
   
-#know_more
+#know_more, #launch_tour
 {
-  float: left;
-  margin-left: -11px;
-  margin-top: -67px;
+  float: none;
+  margin-bottom: 16px;
+  margin-top: 0;
+  width: 269px;
 }
 
 div.helpbox_image_container
@@ -2045,4 +2067,156 @@ div.helpbox_image_container img
 
 .fotter_muzich_little{
   font-size: 9px;
+}
+
+div.side_margin_top
+{
+  margin-top: 25px;
+}
+
+p.accept_cgu
+{
+  font-size: 11px;
+}
+
+li.user_name a
+{
+  color: inherit;
+}
+
+li.user_name a:hover
+{
+  text-decoration: underline;
+}
+
+@-webkit-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-moz-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-ms-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-o-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+
+.flashing
+{
+  font-weight: bold;
+  text-shadow: 0 1px 0 white;
+  border-radius: 3px;
+  padding: 5px 10px;
+  box-shadow:0px 0px 10px #909090;
+  
+  -webkit-animation-name: clignote;
+  -webkit-animation-duration: 1s;
+  -webkit-animation-iteration-count:infinite;
+  
+  -moz-animation-name: clignote;
+  -moz-animation-duration: 1s;
+  -moz-animation-iteration-count:infinite;
+  
+  -ms-animation-name: clignote;
+  -ms-animation-duration: 1s;
+  -ms-animation-iteration-count:infinite;
+  
+  -o-animation-name: clignote;
+  -o-animation-duration: 1s;
+  -o-animation-iteration-count:infinite;
+  
+  animation-name: clignote;
+  animation-duration: 1s;
+  animation-iteration-count:infinite;
+}
+
+div.myaccount_part.flashing
+{
+  padding: 2px;
+}
+
+div.choose_password
+{
+  text-align: center;
+}
+
+div.center
+{
+  text-align: center;
+}
+
+div#email_not_confirmed_box input
+{
+  margin: 10px;
+}
+
+div#email_not_confirmed_box p.info
+{
+  font-style: italic;
+}
+
+span.message_success
+{
+  font-weight: bold;
+  color: green;
+}
+
+span.message_error
+{
+  font-weight: bold;
+  color: red;
+}
+
+div#helpbox input.tag_prompt
+{
+  width: 480px;
+}
+
+div#helpbox input.button
+{
+  float: right;
+  margin-right: 11px;
+  margin-top: 5px;
+}
+
+div#helpbox div.center input.button
+{
+  float: none;
+}
+
+div#facebook_login
+{
+  float: right;
+  margin-bottom: 0;
+  margin-right: 0;
+  margin-top: -5px;
+}
+
+div#login_box
+{
+  margin-top: 23px;
 }

web/bundles/muzichcore/js/TagPrompt.js

@@ -35,7 +35,14 @@ function TagPrompt(select_tag_callback, tag_prompt_connector)
   {
     if (!tag_id)
     {
-      openTagSubmission(tag_name);
+      if (!visitor)
+      {
+        openTagSubmission(tag_name);
+      }
+      else
+      {
+        open_connection_or_subscription_window();
+      }
     }
     else
     {
@@ -64,39 +71,34 @@ function TagPrompt(select_tag_callback, tag_prompt_connector)
       .attr('method', 'post')
       .attr('name', 'add_tag')
       .ajaxForm(function(response) {
-        /*
-        *
-        */
-  
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+       
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(response){
+            $('form[name="add_tag"]').find('ul.error_list').remove();
+            var ul_errors = $('<ul>').addClass('error_list');
+
+            for (i in response.errors)
+            {
+              ul_errors.append($('<li>').append(response.errors[i]));
+            }
+
+            $('form[name="add_tag"]').prepend(ul_errors);
+          }
+        );
   
-        if (response.status == 'success')
+        if (response.status === 'success')
         {
           var tag = new Tag(response.tag_id, response.tag_name);
           addTagToProposedTags(tag);
           addTagToSelectedTags(tag);
           _tag_prompt_connector.updateOutput(tags_selected);
-  
+
           $('#fade').fadeOut(400, function(){$('#fade').remove();});
           $('#add_tag').remove();
         }
   
-        if (response.status == 'error')
-        {
-          $('form[name="add_tag"]').find('ul.error_list').remove();
-          var ul_errors = $('<ul>').addClass('error_list');
-  
-          for (i in response.errors)
-          {
-            ul_errors.append($('<li>').append(response.errors[i]));
-          }
-  
-          $('form[name="add_tag"]').prepend(ul_errors);
-        }
-  
         return false;
       })
   
@@ -174,10 +176,11 @@ function TagPrompt(select_tag_callback, tag_prompt_connector)
         *
         */
   
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(){}
+        );
   
         if (response.status == 'success')
         {