upgrade to 2.2.3

app/SymfonyRequirements.php

@@ -475,11 +475,19 @@ class SymfonyRequirements extends RequirementCollection
         );
 
         if (function_exists('apc_store') && ini_get('apc.enabled')) {
-            $this->addRequirement(
-                version_compare(phpversion('apc'), '3.0.17', '>='),
-                'APC version must be at least 3.0.17',
-                'Upgrade your <strong>APC</strong> extension (3.0.17+).'
-            );
+            if (version_compare($installedPhpVersion, '5.4.0', '>=')) {
+                $this->addRequirement(
+                    version_compare(phpversion('apc'), '3.1.13', '>='),
+                    'APC version must be at least 3.1.13 when using PHP 5.4',
+                    'Upgrade your <strong>APC</strong> extension (3.1.13+).'
+                );
+            } else {
+                $this->addRequirement(
+                    version_compare(phpversion('apc'), '3.0.17', '>='),
+                    'APC version must be at least 3.0.17',
+                    'Upgrade your <strong>APC</strong> extension (3.0.17+).'
+                );
+            }
         }
 
         $this->addPhpIniRequirement('detect_unicode', false);

composer.json

@@ -7,19 +7,19 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "symfony/symfony": "2.1.8",
-        "doctrine/orm": ">=2.2.3,<2.5-dev",
-        "doctrine/doctrine-bundle": "1.1.*",
+        "symfony/symfony": "v2.2.3",
+        "doctrine/orm": "2.3.4",
+        "doctrine/doctrine-bundle": "v1.2.0",
         "twig/extensions": "1.0.*@dev",
-        "symfony/assetic-bundle": "2.3.*",
-        "symfony/swiftmailer-bundle": "2.1.*",
-        "symfony/monolog-bundle": "2.1.*",
-        "sensio/distribution-bundle": "2.1.*",
-        "sensio/framework-extra-bundle": "2.1.*",
-        "sensio/generator-bundle": "2.1.*",
-        "jms/security-extra-bundle": "1.2.*",
-        "jms/di-extra-bundle": "1.1.*",
-        "kriswallsmith/assetic": "1.1.*@dev",
+        "symfony/assetic-bundle": "v2.3.0",
+        "symfony/swiftmailer-bundle": "v2.2.3",
+        "symfony/monolog-bundle": "v2.2.0",
+        "sensio/distribution-bundle": "v2.2.3",
+        "sensio/framework-extra-bundle": "v2.2.3",
+        "sensio/generator-bundle": "v2.2.3",
+        "jms/security-extra-bundle": "1.5.1",
+        "jms/di-extra-bundle": "1.4.0",
+        "kriswallsmith/assetic": "v1.1.1",
         
         "friendsofsymfony/user-bundle": "v1.3.1",
         "doctrine/data-fixtures" : "dev-master", 
@@ -31,10 +31,10 @@
         "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/doctrine-orm-admin-bundle": "2.2.1",
+        "sonata-project/admin-bundle": "2.2.2",
         "sonata-project/jquery-bundle": "1.8.*@dev",
-        "sonata-project/block-bundle": "2.1.*@dev",
+        "sonata-project/block-bundle": "2.2.3",
         "friendsofsymfony/facebook-bundle": "dev-master"
     },
     "scripts": {

src/Muzich/CoreBundle/Form/User/DeleteForm.php

@@ -2,9 +2,8 @@
 
 namespace Muzich\CoreBundle\Form\User;
 
-use Symfony\Component\Security\Core\Validator\Constraint\UserPassword;
+use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Form\AbstractType;
 
 class DeleteForm extends AbstractType

src/Muzich/CoreBundle/Resources/views/Layout/side.html.twig

@@ -8,8 +8,8 @@
 {% if app.user %}
   
   <div id="user_statusbox" class="nicebox">
-    {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
-      {% render "MuzichUserBundle:Event:infoBar" %}
+    {% if app.user %}
+      {% render(controller("MuzichUserBundle:Event:infoBar")) %}
     {% endif %}
   </div>
 
@@ -40,12 +40,11 @@
 {% endif %}
 
   <div id="searchbox" class="nicebox">
-    {% render "MuzichCoreBundle:Search:renderGlobalSearchForm" %}
+    {% render(controller("MuzichCoreBundle:Search:renderGlobalSearchForm")) %}
   </div>
   
-  
   {% include 'MuzichCoreBundle:Layout:social.html.twig' %}
 
 {% if app.user %}
-  {% render 'MuzichCoreBundle:Core:renderSideMenu' %}
+  {% render(controller('MuzichCoreBundle:Core:renderSideMenu')) %}
 {% endif %}

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -154,7 +154,6 @@ class FavoriteController extends Controller
   /**
    * Page affichant les elements favoris de l'utilisateur
    * 
-   * @Template()
    */
   public function myListAction()
   {
@@ -182,12 +181,12 @@ class FavoriteController extends Controller
       $tags_id[] = $tag->getId();
     }
     
-    return array(
+    return $this->render('MuzichFavoriteBundle:Favorite:myList.html.twig', array(
       'tags'          => $tags,
       'tags_id_json'  => json_encode($tags_id),
       'user'          => $this->getUser(),
       'elements'      => $search_object->getElements($this->getDoctrine(), $this->getUserId())
-    );
+    ));
   }
   
   /**

src/Muzich/FavoriteBundle/Resources/config/routing.yml

@@ -17,4 +17,4 @@ favorite_user_list:
 
 favorite_get:
   pattern:   /favoritesajax/{user_id}/getElements/{tags_ids_json}/{id_limit}/{invert}
-  defaults: { _controller: MuzichFavoriteBundle:Favorite:getElements, id_limit: null, invert: false }
+  defaults: { _controller: MuzichFavoriteBundle:Favorite:getElements, tags_ids_json: null, id_limit: null, invert: false }

src/Muzich/HomeBundle/Resources/config/routing.yml

@@ -30,6 +30,6 @@ show_group_more:
 
 show_elements_get:
   pattern:   /show/{type}/{object_id}/getElements/{tags_ids_json}/{id_limit}/{invert}
-  defaults: { _controller: MuzichHomeBundle:Show:getElements, id_limit: null, invert: false }
+  defaults: { _controller: MuzichHomeBundle:Show:getElements, tags_ids_json: null, id_limit: null, invert: false }
 
   

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

@@ -2,7 +2,7 @@
 {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
 
   <div id="top_search">
-    {% render "MuzichCoreBundle:Search:renderGlobalSearchForm" %}
+    {% render(controller("MuzichCoreBundle:Search:renderGlobalSearchForm")) %}
   </div>
 
   <div id="top_bar">

web/bundles/framework/css/body.css

@@ -0,0 +1,150 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.1.2
+build: 56
+*/
+.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;}
+.sf-reset html,
+.sf-reset body {
+    width: 100%;
+    min-height: 100%;
+    _height: 100%;
+    margin: 0;
+    padding: 0;
+}
+.sf-reset body {
+    font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+    text-align: left;
+    background-color: #efefef;
+}
+.sf-reset abbr {
+    border-bottom: 1px dotted #000;
+    cursor: help;
+}
+.sf-reset p {
+    font-size: 14px;
+    line-height: 20px;
+    padding-bottom: 20px;
+}
+.sf-reset strong {
+    color: #313131;
+    font-weight: bold;
+}
+.sf-reset a {
+    color: #6c6159;
+}
+.sf-reset a img {
+    border: none;
+}
+.sf-reset a:hover {
+    text-decoration: underline;
+}
+.sf-reset em {
+    font-style: italic;
+}
+.sf-reset h2,
+.sf-reset h3 {
+    font-weight: bold;
+}
+.sf-reset h1 {
+    font-family: Georgia, "Times New Roman", Times, serif;
+    font-size: 20px;
+    color: #313131;
+    word-break: break-all;
+}
+.sf-reset li {
+    padding-bottom: 10px;
+}
+.sf-reset .block {
+    -moz-border-radius: 16px;
+    -webkit-border-radius: 16px;
+    border-radius: 16px;
+    margin-bottom: 20px;
+    background-color: #FFFFFF;
+    border: 1px solid #dfdfdf;
+    padding: 40px 50px;
+}
+.sf-reset h2 {
+    font-size: 16px;
+    font-family: Arial, Helvetica, sans-serif;
+}
+.sf-reset li a {
+    background: none;
+    color: #868686;
+    text-decoration: none;
+}
+.sf-reset li a:hover {
+    background: none;
+    color: #313131;
+    text-decoration: underline;
+}
+.sf-reset ol {
+    padding: 10px 0;
+}
+.sf-reset ol li {
+    list-style: decimal;
+    margin-left: 20px;
+    padding: 2px;
+    padding-bottom: 20px;
+}
+.sf-reset ol ol li {
+    list-style-position: inside;
+    margin-left: 0;
+    white-space: nowrap;
+    font-size: 12px;
+    padding-bottom: 0;
+}
+.sf-reset li .selected {
+    background-color: #ffd;
+}
+.sf-button {
+    display: -moz-inline-box;
+    display: inline-block;
+    text-align: center;
+    vertical-align: middle;
+    border: 0;
+    background: transparent none;
+    text-transform: uppercase;
+    cursor: pointer;
+    font: bold 11px Arial, Helvetica, sans-serif;
+}
+.sf-button span {
+    text-decoration: none;
+    display: block;
+    height: 28px;
+    float: left;
+}
+.sf-button .border-l {
+    text-decoration: none;
+    display: block;
+    height: 28px;
+    float: left;
+    padding: 0 0 0 7px;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQtJREFUeNpiPHnyJAMakARiByDWYEGT8ADiYGVlZStubm5xlv///4MEQYoKZGRkQkRERLRYWVl5wYJQyXBZWdkwCQkJUxAHKgaWlAHSLqKiosb//v1DsYMFKGCvoqJiDmQzwXTAJYECulxcXNLoumCSoszMzDzoumDGghQwYZUECWIzkrAkSIIGOmlkLI10AiX//P379x8jIyMTNmPf/v79+ysLCwsvuiQoNi5//fr1Kch4dAyS3P/gwYMTQBP+wxwHw0xA4gkQ73v9+vUZdJ2w1Lf82bNn4iCHCQoKasHsZw4ODgbRIL8c+/Lly5M3b978Y2dn5wC6npkFLXnsAOKLjx49AmUHLYAAAwBoQubG016R5wAAAABJRU5ErkJggg==) no-repeat top left;
+}
+.sf-button .border-r {
+    padding: 0 7px 0 0;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
+}
+.sf-button .btn-bg {
+    padding: 0px 14px;
+    color: #636363;
+    line-height: 28px;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;
+}
+.sf-button:hover .border-l,
+.sf-button-selected .border-l {
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR9JREFUeNpi/P//PwMyOHfunDqQSgNiexZkibNnzxYBqZa3HOs5v7PcYQBLnjlzhg1IbfzIdsTjA/t+ht9Mr8GKwZL//v3r+sB+0OMN+zqIEf8gFMvJkyd1gXTOa9YNDP//otrPAtSV/Jp9HfPff78Z0AEL0LUeXxivMfxD0wXTqfjj/2ugkf+wSrL9/YtpJEyS4S8WI5Ek/+GR/POPFjr//cenE6/kP9q4Fo/kr39/mdj+M/zFkGQCSj5i+ccPjLJ/GBgkuYOHQR1sNDpmAkb2LBmWwL///zKCIxwZM0VHR18G6p4uxeLLAA4tJMwEshiou1iMxXaHLGswA+t/YbhORuQUv2DBAnCifvxzI+enP3dQJUFg/vz5sOzgBBBgAPxX9j0YnH4JAAAAAElFTkSuQmCC) no-repeat top left;
+}
+.sf-button:hover .border-r,
+.sf-button-selected .border-r {
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAT5JREFUeNpiPHv27BkGBoaDQDzLyMjoJgMSYHrM3WX8hn1d0f///88DFRYhSzIuv2X5H8Rg/SfKIPDTkYH/l80OINffxMTkF9O/f/8ZQPgnwyuGl+wrGd6x7vf49+9fO9jYf3+Bkkj4NesmBqAV+SdPntQC6vzHgIz//gOawbqOGchOxtAJwp8Zr4F0e7D8/fuPAR38/P8eZIo0yz8skv8YvoIk+YE6/zNgAyD7sRqLkPzzjxY6/+HS+R+fTkZ8djLh08lCUCcuSWawJGbwMTGwg7zyBatX2Bj5QZKPsBrLzaICktzN8g/NWEYGZgYZjoC/wMiei5FMpFh8QPSU6Ojoy3Cd7EwiDBJsDgxiLNY7gLrKQGIsHAxSDHxAO2TZ/b8D+TVxcXF9MCtYtLiKLgDpfUDVsxITE1GyA0CAAQA2E/N8VuHyAAAAAABJRU5ErkJggg==) right top no-repeat;
+}
+.sf-button:hover .btn-bg,
+.sf-button-selected .btn-bg {
+    color: #FFFFFF;
+    text-shadow:0 1px 1px #6b9311;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAIAAAAvP0KbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEFJREFUeNpiPnv2LNMdvlymf///M/37B8R/QfQ/MP33L4j+B6Qh7L9//sHpf2h8MA1V+w/KRjYLaDaLCU8vQIABAFO3TxZriO4yAAAAAElFTkSuQmCC) repeat-x top left;
+}

web/bundles/framework/css/exception.css

@@ -1,76 +1,7 @@
-/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 3.1.2
-build: 56
-*/
-.sf-exceptionreset html{color:#000;background:#FFF;}.sf-exceptionreset body,.sf-exceptionreset div,.sf-exceptionreset dl,.sf-exceptionreset dt,.sf-exceptionreset dd,.sf-exceptionreset ul,.sf-exceptionreset ol,.sf-exceptionreset li,.sf-exceptionreset h1,.sf-exceptionreset h2,.sf-exceptionreset h3,.sf-exceptionreset h4,.sf-exceptionreset h5,.sf-exceptionreset h6,.sf-exceptionreset pre,.sf-exceptionreset code,.sf-exceptionreset form,.sf-exceptionreset fieldset,.sf-exceptionreset legend,.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset p,.sf-exceptionreset blockquote,.sf-exceptionreset th,.sf-exceptionreset td{margin:0;padding:0;}.sf-exceptionreset table{border-collapse:collapse;border-spacing:0;}.sf-exceptionreset fieldset,.sf-exceptionreset img{border:0;}.sf-exceptionreset address,.sf-exceptionreset caption,.sf-exceptionreset cite,.sf-exceptionreset code,.sf-exceptionreset dfn,.sf-exceptionreset em,.sf-exceptionreset strong,.sf-exceptionreset th,.sf-exceptionreset var{font-style:normal;font-weight:normal;}.sf-exceptionreset li{list-style:none;}.sf-exceptionreset caption,.sf-exceptionreset th{text-align:left;}.sf-exceptionreset h1,.sf-exceptionreset h2,.sf-exceptionreset h3,.sf-exceptionreset h4,.sf-exceptionreset h5,.sf-exceptionreset h6{font-size:100%;font-weight:normal;}.sf-exceptionreset q:before,.sf-exceptionreset q:after{content:'';}.sf-exceptionreset abbr,.sf-exceptionreset acronym{border:0;font-variant:normal;}.sf-exceptionreset sup{vertical-align:text-top;}.sf-exceptionreset sub{vertical-align:text-bottom;}.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset select{*font-size:100%;}.sf-exceptionreset legend{color:#000;}
-
-.sf-exceptionreset html,
-.sf-exceptionreset body {
-    width: 100%;
-    min-height: 100%;
-    _height: 100%;
-    margin: 0;
-    padding: 0;
-}
-.sf-exceptionreset body {
-    font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-    text-align: left;
-    background-color: #efefef;
-}
-
-.sf-exceptionreset abbr {
-    border-bottom: 1px dotted #000;
-    cursor: help;
-}
-
-.sf-exceptionreset p {
-    font-size: 14px;
-    line-height: 20px;
-    color: #868686;
-    padding-bottom: 20px;
-}
-
-.sf-exceptionreset strong {
-    color: #313131;
-    font-weight: bold;
-}
-
-.sf-exceptionreset a {
-    color: #6c6159;
-}
-.sf-exceptionreset a img {
-    border: none;
-}
-.sf-exceptionreset a:hover {
-    text-decoration: underline;
-}
-
-.sf-exceptionreset em {
-    font-style: italic;
-}
-
-.sf-exceptionreset h2,
-.sf-exceptionreset h3 {
-    font-weight: bold;
-}
-.sf-exceptionreset h1 {
-    font-family: Georgia, "Times New Roman", Times, serif;
-    font-size: 20px;
-    color: #313131;
-    word-break: break-all;
-}
-
-.sf-exceptionreset li {
-    padding-bottom: 10px;
-}
-
-.sf-exceptionreset .traces {
+.sf-reset .traces {
     padding-bottom: 14px;
 }
-.sf-exceptionreset .traces li {
+.sf-reset .traces li {
     font-size: 12px;
     color: #868686;
     padding: 5px 4px;
@@ -78,113 +9,81 @@ build: 56
     margin-left: 20px;
     white-space: break-word;
 }
-.sf-exceptionreset #logs .traces li.error {
+.sf-reset #logs .traces li.error {
     font-style: normal;
     color: #AA3333;
     background: #f9ecec;
 }
-.sf-exceptionreset #logs .traces li.warning {
+.sf-reset #logs .traces li.warning {
     font-style: normal;
     background: #ffcc00;
 }
 /* fix for Opera not liking empty <li> */
-.sf-exceptionreset .traces li:after {
+.sf-reset .traces li:after {
     content: "\00A0";
 }
-
-.sf-exceptionreset .trace {
+.sf-reset .trace {
     border: 1px solid #D3D3D3;
     padding: 10px;
     overflow: auto;
     margin: 10px 0 20px;
 }
-
-.sf-exceptionreset .block,
-.sf-exceptionreset .block_exception {
+.sf-reset .block-exception {
     -moz-border-radius: 16px;
     -webkit-border-radius: 16px;
     border-radius: 16px;
     margin-bottom: 20px;
-}
-.sf-exceptionreset .block {
-    background-color: #FFFFFF;
-    border: 1px solid #dfdfdf;
-    padding: 40px 50px;
-}
-.sf-exceptionreset .block_exception {
     background-color: #f6f6f6;
     border: 1px solid #dfdfdf;
     padding: 30px 28px;
+    word-wrap: break-word;
+    overflow: hidden;
 }
-.sf-exceptionreset .block_exception div {
+.sf-reset .block-exception div {
     color: #313131;
     font-size: 10px;
 }
-
-.sf-exceptionreset .block_exception_detected .illustration_exception,
-.sf-exceptionreset .block_exception_detected .text_exception {
+.sf-reset .block-exception-detected .illustration-exception,
+.sf-reset .block-exception-detected .text-exception {
     float: left;
 }
-.sf-exceptionreset .block_exception_detected .illustration_exception {
+.sf-reset .block-exception-detected .illustration-exception {
     width: 152px;
 }
-.sf-exceptionreset .block_exception_detected .text_exception {
+.sf-reset .block-exception-detected .text-exception {
     width: 670px;
     padding: 30px 44px 24px 46px;
     position: relative;
 }
-
-.sf-exceptionreset .text_exception .open_quote,
-.sf-exceptionreset .text_exception .close_quote {
+.sf-reset .text-exception .open-quote,
+.sf-reset .text-exception .close-quote {
     position: absolute;
 }
-.sf-exceptionreset .open_quote {
+.sf-reset .open-quote {
     top: 0;
     left: 0;
 }
-.sf-exceptionreset .close_quote {
+.sf-reset .close-quote {
     bottom: 0;
     right: 50px;
 }
-
-.sf-exceptionreset .block_exception p {
+.sf-reset .block-exception p {
     font-family: Arial, Helvetica, sans-serif;
 }
-.sf-exceptionreset .block_exception p a,
-.sf-exceptionreset .block_exception p a:hover {
+.sf-reset .block-exception p a,
+.sf-reset .block-exception p a:hover {
     color: #565656;
 }
-
-.sf-exceptionreset h2 {
-    font-size: 16px;
-    font-family: Arial, Helvetica, sans-serif;
-    padding-bottom: 16px;
-}
-
-.sf-exceptionreset li a {
-    background: none;
-    color: #868686;
-    text-decoration: none;
-}
-
-.sf-exceptionreset li a:hover {
-    background: none;
-    color: #313131;
-    text-decoration: underline;
-}
-
-.sf-exceptionreset .logs h2 {
+.sf-reset .logs h2 {
     float: left;
     width: 654px;
 }
-
-.sf-exceptionreset .error_count {
+.sf-reset .error-count {
     float: right;
     width: 170px;
     text-align: right;
 }
-
-.sf-exceptionreset .error_count span {
+.sf-reset .error-count span {
     display: inline-block;
     background-color: #aacd4e;
     -moz-border-radius: 6px;
@@ -196,37 +95,14 @@ build: 56
     font-size: 11px;
     font-weight: bold;
 }
-
-.sf-exceptionreset .toggle {
+.sf-reset .toggle {
     vertical-align: middle;
 }
-
-.sf-exceptionreset .linked ul,
-.sf-exceptionreset .linked li {
+.sf-reset .linked ul,
+.sf-reset .linked li {
     display: inline;
 }
-
-.sf-exceptionreset #output_content {
+.sf-reset #output-content {
     color: #000;
     font-size: 12px;
 }
-
-.sf-exceptionreset ol {
-    padding: 10px 0;
-}
-.sf-exceptionreset ol li {
-    list-style: decimal;
-    margin-left: 20px;
-    padding: 2px;
-    padding-bottom: 20px;
-}
-.sf-exceptionreset ol ol li {
-    list-style-position: inside;
-    margin-left: 0;
-    white-space: nowrap;
-    font-size: 12px;
-    padding-bottom: 0;
-}
-.sf-exceptionreset li .selected {
-    background-color: #ffd;
-}

web/bundles/framework/css/exception_layout.css

@@ -1,141 +0,0 @@
-html {
-    background: #eee;
-}
-
-body {
-    font: 11px Verdana, Arial, sans-serif;
-    color: #333;
-}
-
-.sf-exceptionreset, .sf-exceptionreset .block, .sf-exceptionreset #message {
-    margin: auto;
-}
-
-img {
-    border: 0;
-}
-
-.clear {
-    clear: both;
-    height: 0;
-    font-size: 0;
-    line-height: 0;
-}
-
-.clear_fix:after {
-    content: "\0020";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.clear_fix {
-    display: inline-block;
-}
-* html .clear_fix {
-    height: 1%;
-}
-.clear_fix {
-    display: block;
-}
-
-.header {
-    padding: 30px 30px 20px 30px;
-}
-
-.header_logo {
-    float: left;
-}
-
-.search {
-    float: right;
-    padding-top: 20px;
-}
-
-.search label {
-    line-height: 28px;
-    vertical-align: middle;
-}
-
-.search input {
-    width: 188px;
-    margin-right: 10px;
-    font-size: 12px;
-    border: 1px solid #dadada;
-    background: #FFFFFF url(../images/input_bg.gif) repeat-x left top;
-    padding: 5px 6px;
-    color: #565656;
-}
-
-.search input[type="search"] {
-    -webkit-appearance: textfield;
-}
-
-.search button {
-    -webkit-appearance: button-bevel;
-    float: none;
-    padding: 0;
-    margin: 0;
-    overflow: visible;
-    width: auto;
-    text-decoration: none;
-    cursor: pointer;
-    white-space: nowrap;
-    display: inline-block;
-    text-align: center;
-    vertical-align: middle;
-    border: 0;
-    background: none;
-}
-
-.search button:-moz-focus-inner {
-    padding: 0;
-    border: none;
-}
-
-.search button:hover {
-    text-decoration: none;
-}
-
-.search button span span,
-.search button span span span {
-    position: static;
-}
-
-.search button span {
-    position: relative;
-    text-decoration: none;
-    display: block;
-    height: 28px;
-    float: left;
-    padding: 0 0 0 8px;
-    background: transparent url(../images/border_l.png) no-repeat top left;
-}
-
-.search button span span {
-    padding: 0 8px 0 0;
-    background: transparent url(../images/border_r.png) right top no-repeat;
-}
-
-.search button span span span {
-    padding: 0 7px;
-    font: bold 11px Arial, Helvetica, sans-serif;
-    color: #6b6b6b;
-    line-height: 28px;
-    background: transparent url(../images/btn_bg.png) repeat-x top left;
-}
-
-#content {
-    width: 970px;
-    margin: 0 auto;
-}
-
-pre {
-    white-space: normal;
-    font-family: Arial, Helvetica, sans-serif;
-}
-
-pre.xdebug-var-dump{
-    white-space: pre;
-    font-family: monospace;
-}

web/bundles/framework/css/structure.css

@@ -0,0 +1,72 @@
+html {
+    background: #eee;
+}
+body {
+    font: 11px Verdana, Arial, sans-serif;
+    color: #333;
+}
+.sf-reset, .sf-reset .block, .sf-reset #message {
+    margin: auto;
+}
+img {
+    border: 0;
+}
+.clear {
+    clear: both;
+    height: 0;
+    font-size: 0;
+    line-height: 0;
+}
+.clear-fix:after {
+    content: "\0020";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+.clear-fix {
+    display: inline-block;
+}
+* html .clear-fix {
+    height: 1%;
+}
+.clear-fix {
+    display: block;
+}
+.header {
+    padding: 30px 30px 20px 30px;
+}
+.header-logo {
+    float: left;
+}
+.search {
+    float: right;
+    padding-top: 20px;
+}
+.search label {
+    line-height: 28px;
+    vertical-align: middle;
+}
+.search input {
+    width: 195px;
+    font-size: 12px;
+    border: 1px solid #dadada;
+    background: #fff url(data:image/gif;base64,R0lGODlhAQAFAKIAAPX19e/v7/39/fr6+urq6gAAAAAAAAAAACH5BAAAAAAALAAAAAABAAUAAAMESAEjCQA7) repeat-x left top;
+    padding: 5px 6px;
+    color: #565656;
+}
+.search input[type="search"] {
+    -webkit-appearance: textfield;
+}
+#content {
+    width: 970px;
+    margin: 0 auto;
+}
+pre {
+    white-space: normal;
+    font-family: Arial, Helvetica, sans-serif;
+}
+pre.xdebug-var-dump{
+    white-space: pre;
+    font-family: monospace;
+}

web/bundles/muzichcore/css/main.css

@@ -37,6 +37,7 @@ div#header
   background-image: url("/img/header_background.png");
   background-repeat: repeat-x;
   border-bottom: 3px solid #e51936;
+  
 }
 
 div#header div#hgroup
@@ -237,18 +238,48 @@ div#languages:hover
   display: table-cell;
   width: 650px;
   padding-right: 30px;
+  float: left;
+  position: relative;
+  margin-top: 25px;
+}
+
+aside#sidebar
+{
+  display: table-cell;
+/*  vertical-align: top;*/
+  float: left;
+  position: relative;
+}
+
+aside#sidebar .sidebar
+{
+  width: 300px;
+  padding-bottom: 25px;
+  padding-top: 25px;
+/* height: 800px;
+ background-color: blue;*/
+}
+
+.top-fixed {
+    position: fixed;
+    top: 0;
+}
+
+.bottom-fixed {
+    position:fixed;
+    bottom: 0;
 }
 
 #mainbox
 {
-  margin-top: 25px;
+  margin-top: 0px;
   /*padding: 10px;*/
   padding-bottom: 23px;
 }
 
 #mainbox.mainbox_margintop
 {
-  margin-top: 80px;
+  margin-top: 60px;
 }
 
 #mainbox.mainbox_nopadding
@@ -274,13 +305,6 @@ div#languages:hover
   border: 1px solid #d3d3d3;
 }
 
-aside#sidebar
-{
-  display: table-cell;
-  width: 300px;
-  vertical-align: top;
-}
-
 ul.elements
 {
   margin-top: 0px;
@@ -570,7 +594,7 @@ aside#sidebar div.nicebox
 
 div#user_statusbox
 {
-  margin-top: 25px;
+  margin-top: 0px;
 }
 
 div.user_score
@@ -688,7 +712,7 @@ div.seachboxcontainer input
   margin: 0;
   padding: 0;
   padding-left: 6px;
-  width: 222px;
+  width: 220px;
 }
 div.seachboxcontainer img
 {
@@ -804,6 +828,12 @@ div#secondarymenu ul.secondarymenu li.top_menu_element.open ul.submenu
   display: block;
 }
 
+ul.submenu
+{
+  direction: rtl;
+  text-align: left;
+}
+
 #tabs_tag_search_buttons
 {
   margin: 0;
@@ -840,7 +870,10 @@ div#secondarymenu ul.secondarymenu li.top_menu_element.open ul.submenu
   list-style-type: none;
   display: inline;
   float: left;
-  padding: 20px;
+  padding-left: 15px;
+  padding-top: 20px;
+  padding-right: 20px;
+  padding-bottom: 20px;
   
   background: #dddddd; /* Old browsers */
   /* IE9 SVG, needs conditional override of 'filter' to 'none' */
@@ -977,8 +1010,9 @@ ul#favorite_tags li
 
 #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;
+  margin-left: -5px;
+  margin-right: 5px;
+  margin-top: -1px;
 }
 
 #element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_link_disabled.justtopright, #group_add_close_link.justtopright
@@ -1088,7 +1122,7 @@ div#form_add_first_part #element_add_url
 
 #tabs_tag_search_buttons a
 {
-  padding-left: 5px;
+  padding-left: 10px;
 }
 
 #tabs_tag_search_buttons img
@@ -1180,13 +1214,8 @@ div#footer_logo img
 
 div#footer_logo_2
 {
-  line-height: 18px;
   margin-top: 25px;
-  padding-left: 0;
-  padding-right: 40px;
-  text-align: left;
-  width: 135px;
-  float: left;
+  float: right;
 }
 
 div#footer_logo_2 img
@@ -1619,7 +1648,7 @@ form.changeemail input[type="text"]
   width: 388px;
 }
 
-form.changeemail input[type="submit"]
+form.changeemail input[type="submit"], form.privacy input[type="submit"], form.delete input[type="submit"]
 {
   float: right;
   margin-top: 5px;
@@ -1867,7 +1896,7 @@ p.group_description
 
 #login_box input[id="username"], #login_box input[id="password"]
 {
-  width: 228px;
+  width: 220px;
 }
 
 #login_box div.login
@@ -2089,71 +2118,6 @@ 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;
@@ -2234,10 +2198,406 @@ ul.playlists ul.tags_cloud li
   padding: 4px;
 }
 
+ul.playlist_elements
+{
+  margin-left: 0px;
+}
+
+li.playlist_element div.actions, li.playlist div.actions
+{
+  float: left;
+  margin-top: 4px;
+}
+
+li.playlist_element div.actions img.autoplay_off
+{
+  margin-left: -5px;
+}
+
+li.playlist_element div.actions_right
+{
+  float: right;
+  margin-top: 4px;
+}
+
+li.playlist_element div.actions a, li.playlist div.actions a
+{
+  margin-left: -5px;
+}
+
+li.playlist_element div.actions a.drag
+{
+  cursor: move;
+}
+
+li.playlist_element div.title
+{
+  margin-left: 53px;
+  margin-top: 4px;
+}
+
+ul.playlist_elements li.playlist_element a
+{
+  color: black;
+}
+
+ul.playlist_elements li.playlist_element
+{
+  border-top: 1px solid #C8C8C8;
+  height: 27px;
+  list-style: none outside none;
+  background-color: #F8F8F8;
+}
+
+ul.playlist_elements li.playlist_element ul.elements li.element
+{
+  border-top: none;
+}
+
+a.button img
+{
+  float: left;
+}
+
+a.button.simpleimg
+{
+  padding: 6px;
+  
+}
+
+a.button.simpleimg img
+{
+  float: none;
+}
+
+
+
+a.button span
+{
+  float: left;
+  margin-top: 4px;
+}
+
+ul.playlists
+{
+  margin-left: 0px;
+  margin-bottom: 10px;
+}
+
+ul.playlists li.playlist
+{
+  border-top: 1px solid #C8C8C8;
+  list-style: none outside none;
+  background-color: #F8F8F8;
+}
+
+ul.playlists li.playlist a.title
+{
+  font-weight: bold;
+  font-size: 127%;
+}
+
+ul.playlists li.playlist a.title:hover
+{
+  text-decoration: underline;
+}
+
+ul.playlists li.playlist ul.tags_cloud
+{
+  margin-left: 25px;
+}
+
+li.playlist div.title
+{
+  margin-left: 42px;
+  margin-top: 3px;
+}
+
 div.playlists_prompt
 {
   padding: 10px;
-  border: 1px solid red;
-  width: 320px;
-  background-color: white;
+  width: 375px;
+  background-color: #F8F8F8;
+}
+
+div.playlists_prompt h2
+{
+  font-size: 1em;
+  margin-top: 7px;
+}
+
+div.playlists_prompt h2.nomargintop
+{
+  margin-top: 0px;
+}
+
+div.playlists_prompt input.niceinput
+{
+  font-size: 13px;
+  height: 23px;
+}
+
+div.playlists_prompt a.close_playlists_prompt
+{
+  float: right;
+  margin-top: -5px;
+  margin-right: -5px;
+}
+
+li.playlist.remarquable
+{
+  font-weight: bold;
+}
+
+ul.form-errors
+{
+  margin-left: 10px;
+}
+
+ul.form-errors li
+{
+  color: red;
+  list-style-type: none;
+}
+
+div.playlists_prompt ul.form-errors li
+{
+  font-size: 85%;
+}
+
+p.solop
+{
+  margin: 15px;
+}
+
+div.tags_proposition_view
+{
+  padding: 10px;
+  margin: 5px;
+  margin-top: 10px;
+  /*--Les différentes définitions de Box Shadow en CSS3--*/
+  -webkit-box-shadow: 0px 0px 6px #999999;
+  -moz-box-shadow: 0px 0px 6px #999999;
+  box-shadow: 0px 0px 6px #999999;
+  /*--Coins arrondis en CSS3--*/
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+
+div.tags_proposition_view a.darkbutton
+{
+  margin: 2px;
+  padding: 6px 6px 4px 4px;
+}
+
+a.button_arrow span
+{
+  
+}
+
+a.button_arrow span
+{
+  margin-top: 2px;
+}
+
+ul.playlists_for_element
+{
+  margin-left: 28px;
+  margin-top: 8px;
+}
+
+ul.playlists_for_element li
+{
+  list-style-image: url(/img/notin.png);
+}
+
+ul.playlists_for_element li.in
+{
+  list-style-image: url(/img/in.png);
+}
+
+form.playlist_edit input#playlist_name
+{
+  width: 600px;
+}
+
+form.playlist_edit input[type="submit"]
+{
+  float: right;
+  margin-right: 10px;
+  margin-top: 5px;
+}
+
+div.playlists_prompt
+{
+  z-index: 100001;
+}
+
+a.all_network
+{
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+div#tags_prompt_search p.help_notags
+{
+  font-weight: bold;
+  margin-top: -10px;
+}
+
+div#tags_prompt_search p.help_notags img
+{
+  float: right;
+  margin: -16px 15px -10px 0;
+}
+
+div#tags_prompt_search p.help_notags span
+{
+  float: left;
+  margin-bottom: 10px;
+  width: 480px;
+}
+
+/*
+*
+*
+*
+*/
+
+@-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;}
+}
+
+
+
+@-webkit-keyframes sidesticktop
+{
+  0%{top: auto;}
+  50%{top: 0px;}
+  100%{top: 25px}
+}
+
+@-moz-keyframes sidesticktop
+{
+  0%{top: auto;}
+  50%{top: 0px;}
+  100%{top: 25px}
+}
+
+@-ms-keyframes sidesticktop
+{
+  0%{top: auto;}
+  50%{top: 0px;}
+  100%{top: 25px}
+}
+
+@-o-keyframes sidesticktop
+{
+  0%{top: auto;}
+  50%{top: 0px;}
+  100%{top: 25px}
+}
+
+@keyframes sidesticktop
+{
+  0%{top: auto;}
+  50%{top: 0px;}
+  100%{top: 25px}
+}
+
+@-webkit-keyframes sidestickbottom
+{
+  0%{bottom: auto;}
+  50%{bottom: 0px;}
+  100%{bottom: 25px}
+}
+
+@-moz-keyframes sidestickbottom
+{
+  0%{bottom: auto;}
+  50%{bottom: 0px;}
+  100%{bottom: 25px}
+}
+
+@-ms-keyframes sidestickbottom
+{
+  0%{bottom: auto;}
+  50%{bottom: 0px;}
+  100%{bottom: 25px}
+}
+
+@-o-keyframes sidestickbottom
+{
+  0%{bottom: auto;}
+  50%{bottom: 0px;}
+  100%{bottom: 25px}
+}
+
+@keyframes sidestickbottom
+{
+  0%{bottom: auto;}
+  50%{bottom: 0px;}
+  100%{bottom: 25px}
+}
+
+
+.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;
 }

web/bundles/muzichcore/js/TagPrompt.js

@@ -341,12 +341,28 @@ function TagPromptConnector(input, output, proposition_list, tag_box, prompt_loa
   var _tag_box_manager = new TagBoxManager(tag_box, this);
   var _prompt_loader = prompt_loader;
   
+  var updateHelpDisplay = function()
+  {
+    if (_tag_prompt.getSelectedTags())
+    {
+      if (_tag_prompt.getSelectedTags().length)
+      {
+        $('#tags_prompt_search p.help_notags').hide();
+      }
+      else
+      {
+        $('#tags_prompt_search p.help_notags').show();
+      }
+    }
+  }
+  
   this.updateOutput = function(tags)
   {
     _output.val(array2json(tagsToArrayIds(tags)));
     _tag_proposition_list.hide();
     _tag_box_manager.update(tags);
     cleanInput();
+    updateHelpDisplay();
   }
   
   var _tag_prompt = new TagPrompt(this.updateOutput, this);

web/bundles/muzichcore/js/autoplay.js

@@ -64,8 +64,11 @@ function Autoplay()
     players = window.players_manager.getAll();
     for (var i in players)
     {
-      players[i].stopAndDestroy();
-      window.players_manager.remove(i);
+      if (i in players)
+      {
+        players[i].stopAndDestroy();
+        window.players_manager.remove(i);
+      }
     }
   }
   

web/bundles/muzichcore/js/muzich.js

@@ -335,10 +335,10 @@ $(document).ready(function(){
       $(this).parent('li').addClass('selected');
     }
     
-    if ($('div.top_tools:visible').length)
-    {
-      $('div.top_tools').slideUp();
-    }
+//    if ($('div.top_tools:visible').length)
+//    {
+//      $('div.top_tools').slideUp();
+//    }
     
     // On initialise la liste de tags déjà ajouté
     window.search_tag_prompt_connector.initializeTags([]);
@@ -357,10 +357,10 @@ $(document).ready(function(){
     $(this).parents('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
     $(this).parent('li').addClass('selected');
     
-    if ($('div.top_tools:visible').length == 0)
-    {
-      $('div.top_tools').slideDown();
-    }
+//    if ($('div.top_tools:visible').length == 0)
+//    {
+//      $('div.top_tools').slideDown();
+//    }
     
     var form = $('form[name="search"]');
     
@@ -401,19 +401,20 @@ $(document).ready(function(){
       {
         $('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
         $('li#tab_li_tag_search_with_tags').addClass('selected');
+        
+        // Ne devrais plus servir puisque on l'affiche toujours maintenant
         if (!$('div.top_tools:visible').length)
         {
           $('div.top_tools').slideDown();
         }
       }
       
-      
       $('img.elements_more_loader').show();
       $('ul.elements').html('');
       
       var form = $('form[name="search"]');
       id = str_replace('element_tag_', '', $(this).attr('id'));
-      var tag = new Tag(id, $(this).text());
+      var tag = new Tag(id, $.trim($(this).text()));
       
       window.search_tag_prompt_connector.initializeTags([tag]);
       
@@ -436,12 +437,12 @@ $(document).ready(function(){
   // 1328283201_emblem-symbolic-link.png
   $('a.element_embed_open_link, a.element_name_embed_open_link').live("click", function(){
     
-     var li = $(this).parents('li.element');
+    var li = $(this).parents('li.element');
      
-     element_last_opened(li);
-     li.find('a.element_embed_close_link').show();
-     li.find('a.element_embed_open_link_text').hide();
-     li.find('div.element_embed').show();
+    element_last_opened(li);
+    li.find('a.element_embed_close_link').show();
+    li.find('a.element_embed_open_link_text').hide();
+    li.find('div.element_embed').show();
      
     if ((player = window.dynamic_player.play(
       li.find('div.element_embed'),
@@ -588,6 +589,7 @@ $(document).ready(function(){
    var last_id = null;
    $('a.elements_more').click(function(){
     
+    sidebar_fix_to_bottom_prepare();
     $('img.elements_more_loader').show();
     // On fait un cas isolé (pour l'instant!!)
     if (!$(this).hasClass('event_view'))
@@ -616,6 +618,8 @@ $(document).ready(function(){
       var data = {};
       var type = 'GET';
     }
+    
+    $('.sidebar').css('bottom', $('#footer').outerHeight());
          
      $.ajax({
        type: type,
@@ -638,6 +642,9 @@ $(document).ready(function(){
             {
               link.attr('href', response.data.more_link_href);
             }
+            
+            sidebar_fix_to_bottom_finish();
+          
           }
           
           if (response.end || response.count < 1)
@@ -672,7 +679,9 @@ $(document).ready(function(){
     window.ResponseController.execute(
         response,
         function(){},
-        function(){}
+        function(){
+          $('img.elements_more_loader').hide();
+        }
       );
     
     $('ul.elements').html(response.html);
@@ -1277,10 +1286,7 @@ $(document).ready(function(){
       
       if ($('form[name="search"]').length)
       {
-        if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
-        {
-          $('div.top_tools').slideDown();
-        }
+        $('div.top_tools').slideDown();
       }
       remove_tags('add');
       recolorize_element_list();
@@ -2589,17 +2595,44 @@ $(document).ready(function(){
   /* Ouverture des menus deroulants */
   $('ul.secondarymenu a.top_menu_link').click(function(){
     
+    //sidebar_fix_to_bottom_prepare();
+    var sidebar_height = $('.sidebar').height();
+    
     if ($(this).parents('li.top_menu_element').hasClass('close'))
     {
       $(this).parents('li.top_menu_element').find('ul.submenu').hide();
       $(this).parents('li.top_menu_element').removeClass('close');
       $(this).parents('li.top_menu_element').addClass('open');
-      $(this).parents('li.top_menu_element').find('ul.submenu').slideDown();
+      $(this).parents('li.top_menu_element').find('ul.submenu').show();
+        
+        var top = parseInt($('.sidebar').css('top'), 10);
+        var diff = $('.sidebar').height() - sidebar_height;
+        var top_recalculated =  top - diff;
+      //sidebar_fix_to_bottom_finish();
+      if ($('.sidebar').css('position') == 'absolute' || parseInt($('.sidebar').css('top'), 10) < (25+diff))
+      {
+        $(".sidebar").animate({
+          top: top_recalculated
+        }, 500);
+        
+      }
     }
     else
     {
       $(this).parents('li.top_menu_element').removeClass('open');
       $(this).parents('li.top_menu_element').addClass('close');
+      
+        var top = parseInt($('.sidebar').css('top'), 10);
+        var diff = $('.sidebar').height() - sidebar_height;
+      //sidebar_fix_to_bottom_finish();
+      if ($('.sidebar').css('position') == 'absolute' || parseInt($('.sidebar').css('top'), 10) < (25-diff))
+      {
+        var top_recalculated =  top - diff;
+        $(".sidebar").animate({
+          top: top_recalculated
+        }, 500);
+        
+      }
     }
     
     return false;
@@ -2608,6 +2641,7 @@ $(document).ready(function(){
   $('div#secondarymenu ul.submenu').each(function(){
     if ($(this).find('li').length > 7)
     {
+      // TODO:  Hardcode bouh !
       $(this).css('overflow', 'auto');
       $(this).css('height', '283px');
     }
@@ -2719,10 +2753,8 @@ $(document).ready(function(){
      $('#element_add_box').slideDown("slow");
      $('#element_add_link').hide();
      $('#element_add_close_link').show();
-     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
-     {
-       $('div.top_tools').slideUp();
-     }
+     $('div.top_tools').slideUp();
+     
      // Au cas ou firefox garde la valeur step 2:
         $('input#form_add_step').val('1');
     $('form[name="add"]').attr('action', url_datas_api);
@@ -2734,11 +2766,7 @@ $(document).ready(function(){
      $('#element_add_box').slideUp("slow");
      $('#element_add_link').show();
      $('#element_add_close_link').hide();
-     
-     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
-     {
-       $('div.top_tools').slideDown();
-     }
+     $('div.top_tools').slideDown();
      
      //form_add_reinit();
      // copie du contenu de la fonction ci dessus, arrive pas a l'appeler ... huh
@@ -3018,6 +3046,7 @@ $(document).ready(function(){
    
    $('a.tags_prompt_remove_all').click(function(){
      window.search_tag_prompt_connector.initializeTags([]);
+     $('form[name="search"] input[type="submit"]').trigger('click');
    });
    
    $('a.tags_prompt_favorites').click(function(){
@@ -3073,6 +3102,7 @@ $(document).ready(function(){
         });
       }
       
+      $('form[name="search"] input[type="submit"]').trigger('click');
     });
     
     return false;
@@ -3091,32 +3121,44 @@ $(document).ready(function(){
     *PLAYLISTS
     */
    
+  var playlist_line_height = 0;
   $('ul.playlist_elements li a.open_element').live('click', function(){
     
-    // Pour le moment
-    return false;
-    
     var line = $(this).parents('li.playlist_element');
     
-    $.getJSON($(this).attr('href'), function(response) {
-      
-      window.ResponseController.execute(
-        response,
-        function(){},
-        function(){}
-      );
-      
-      if (response.status == 'success')
-      {
-        line.append('<ul class="elements"><li class="element">' + response.data + '</li></ul>');
-      }
+    if (!line.hasClass('open'))
+    {
+      playlist_line_height = line.height();
+      line.css('height', 'auto');
+      line.find('div.content_opened').html('<img class="loader" src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." />');
+      line.addClass('open');
+
+      $.getJSON($(this).attr('href'), function(response) {
+
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(){}
+        );
+
+        if (response.status === 'success')
+        {
+          line.find('div.content_opened').html('<ul class="elements">' + response.data + '</ul>');
+        }
+      });
+    }
+    else
+    {
+      line.find('div.content_opened').html('');
+      line.removeClass('open');
+      line.css('height', playlist_line_height);
+    }
       
-    });
     
     return false;
   });
   
-  $('ul.playlist_elements').sortable({
+  $('ul.playlist_elements.owned').sortable({
     update: function( event, ui ) {
       
       var form = ui.item.parents('form')
@@ -3141,14 +3183,18 @@ $(document).ready(function(){
     }
   });
   
-  $('ul.elements a.add_to_playlist').live('click', function(event){
+  $('div.playlists_prompt form').live('submit', function(){
+    $(this).parents('div.playlists_prompt').find('img.loader').show();
+  });
+  
+  $('a.add_to_playlist').live('click', function(event){
     
     $('div.playlists_prompt').remove();
-    var prompt = $('<div class="playlists_prompt"><img class="loader" src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>');
+    var prompt = $('<div class="playlists_prompt nicebox"><img class="loader" src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>');
     $('body').append(prompt);
     
     prompt.position({
-      my: "left+3 bottom+0",
+      my: "left+15 bottom+0",
       of: event,
       collision: "fit"
     });
@@ -3165,6 +3211,8 @@ $(document).ready(function(){
       {
         prompt.append(response.data);
         prompt.find('div.create_playlist form').ajaxForm(function(response){
+          
+          $('div.playlists_prompt').find('img.loader').hide();
           window.ResponseController.execute(
             response,
             function(){},
@@ -3214,24 +3262,65 @@ $(document).ready(function(){
     return false;
   });
   
+  $('ul.playlist_elements a.remove_element').jConfirmAction({
+    question : string_element_removefromplaylist_confirm_sentence, 
+    yesAnswer : string_element_delete_confirm_yes, 
+    cancelAnswer : string_element_delete_confirm_no,
+    onYes: function(link){
+      
+      $.getJSON(link.attr('href'), function(response) {
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(){}
+        );
+      });
+
+      link.parents('li.playlist_element').remove();
+      return false;
+    },
+    onOpen: function(link){},
+    onClose: function(link){}
+  });
   
-  $('ul.playlist_elements a.remove_element').live('click', function () {
-    
-    $.getJSON($(this).attr('href'), function(response) {
-      window.ResponseController.execute(
-        response,
-        function(){},
-        function(){}
-      );
-    });
-    
-    $(this).parents('li.playlist_element').remove();
-    return false;
+  $('ul.playlists a.playlist_delete').jConfirmAction({
+    question : string_element_deleteplaylist_confirm_sentence, 
+    yesAnswer : string_element_delete_confirm_yes, 
+    cancelAnswer : string_element_delete_confirm_no,
+    onYes: function(link){
+      $(location).attr('href', link.attr('href'));
+    },
+    onOpen: function(link){},
+    onClose: function(link){}
   });
-   
+  
+  $('div.playlists_prompt a.close_playlists_prompt').live('click', function(){
+     $('div.playlists_prompt').remove();
+     return false;
+  });
+  
+  /*
+   * STICK SIDEBAR
+   */
+  
+  window.sidebar_topsticked = false;
+  window.sidebar_sticked = false;
+  if ($('#sidebar .sidebar').height() < $('#content .content').height() &&
+    $('#sidebar .sidebar').height() > $(window).height())
+  {
+    $('#content').stickySidebar();
+    window.sidebar_sticked = true;
+  }
+  else
+  {
+    $('#sidebar .sidebar').css('padding-bottom', '155px');
+    $("#sidebar .sidebar").sticky({topSpacing:25});
+    window.sidebar_topsticked = true;
+  }
+  
 });
 
-function open_ajax_popin(url, callback)
+function open_ajax_popin(url, callback, data)
 {
   if (!popin_opened)
   {
@@ -3240,7 +3329,7 @@ function open_ajax_popin(url, callback)
       '<div id="helpbox" class="popin_block"><img src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>'
     );
     open_popin_dialog('helpbox');
-    JQueryJson(url, {}, function(response){
+    JQueryJson(url, data, function(response){
       if (response.status == 'success')
       {
         $('div#helpbox').html(
@@ -3260,7 +3349,7 @@ function open_ajax_popin(url, callback)
   }
 }
 
-function open_connection_or_subscription_window(open_login_part)
+function open_connection_or_subscription_window(open_login_part, data)
 {
   if (window_login_or_subscription_opened == false)
   {
@@ -3270,6 +3359,7 @@ function open_connection_or_subscription_window(open_login_part)
       {
         $('div#helpbox div#login_box').show();
         $('a#registration_link').show();
+        $('input#username').focus();
       }
       else
       {
@@ -3288,7 +3378,7 @@ function open_connection_or_subscription_window(open_login_part)
         $('div.login form').find('img.loader').hide();
         if (response.status == 'success')
         {
-          $(location).attr('href', url_home);
+          $(location).attr('href', response.data.redirect_url);
         }
         else if (response.status == 'error')
         {
@@ -3316,7 +3406,7 @@ function open_connection_or_subscription_window(open_login_part)
       $('div#facebook_login').prependTo('div#helpbox');
       $('div#facebook_login').show();
       
-    });
+    }, data);
   }
 }
 
@@ -3330,3 +3420,25 @@ function close_popin()
   $('#helpbox').remove();
   popin_opened = false;
 }
+
+function sidebar_fix_to_bottom_prepare()
+{
+  if (window.sidebar_sticked)
+  {
+    $('.sidebar').css('top', '');
+    $('.sidebar').css('position', '');
+    $('.sidebar').addClass('bottom-fixed');
+  }
+}
+
+function sidebar_fix_to_bottom_finish()
+{
+  if (window.sidebar_sticked)
+  {
+    $(".sidebar").animate({
+      bottom: '0'
+    }, 500 , "swing", function(){
+      $('.sidebar').css('bottom', '')
+    });
+  }
+}

web/bundles/sensiodistribution/webconfigurator/css/configurator.css

@@ -0,0 +1,73 @@
+@import url("install.css");
+
+.step h1 {
+    margin-top: 10px;
+    margin-bottom: 30px;
+    font-size: 26px;
+}
+.step p {
+    line-height: 20px;
+    padding-bottom: 20px;
+}
+.step .symfony-block-steps span {
+    display: inline-block;
+    padding: 2px 3px;
+    font-size: 11px;
+    line-height: 15px;
+    color: #868686;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+.step .symfony-block-steps span.selected {
+    background-color: #aacd4e;
+    color: #FFFFFF;
+}
+.step .symfony-form-row {
+    padding-bottom: 40px;
+}
+.step .symfony-form-column {
+    width: 430px;
+    float: left;
+}
+.step .symfony-form-footer {
+    padding-top: 20px;
+    clear: both;
+}
+.step .symfony-form-field {
+    height: 20px;
+}
+.step .symfony-form-row label {
+    display: block;
+    padding-bottom: 8px;
+}
+.step .symfony-form-field input[type=text],
+.step .symfony-form-field input[type=password],
+.step .symfony-form-field textarea,
+.step .symfony-form-field select {
+    font-size: 13px;
+    color: #565656;
+    width: 200px;
+}
+.step .symfony-form-field input[type=text],
+.step .symfony-form-field input[type=password],
+.step .symfony-form-field textarea {
+    border: 1px solid #dadada;
+    background: #FFFFFF url(../../../framework/images/input_bg.gif) repeat-x left top;
+    width: 194px;
+    padding: 5px 6px;
+}
+.step .symfony-form-errors ul {
+    padding: 0;
+}
+.step .symfony-form-errors li {
+    background: url(../images/notification.gif) no-repeat left 6px;
+    font-size: 11px;
+    line-height: 16px;
+    color: #759e1a;
+    padding: 10px 25px;
+}
+.step .symfony-configuration {
+    margin: 10px 0;
+    width: 100%;
+    height: 240px;
+}

web/bundles/sensiodistribution/webconfigurator/css/configure.css

@@ -1,153 +0,0 @@
-@import url("install.css");
-
-h1 {
-    margin-top: 10px;
-    font-size: 26px;
-}
-
-#symfony-wrapper {
-    padding-top: 0;
-}
-
-#symfony-search {
-    position: absolute;
-    top: 50px;
-    right: 30px;
-}
-
-#symfony-search-field {
-    width: 190px;
-}
-
-#symfony-search label {
-    display: block;
-    float: left;
-    width: 20px;
-    height: 25px;
-    background: url(../images/search.png) no-repeat left 5px;
-}
-
-#symfony-search label span {
-    display: none;
-}
-
-input[type=text] {
-    border: 1px solid #DADADA;
-    background: white url(../images/field-background.gif) repeat-x left top;
-    padding: 5px 6px;
-    color: #565656;
-    font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-    font-size: 12px;
-}
-
-
-.symfony-button-grey, .symfony-button-green {
-    font-size: 0.85em;
-    font-weight: bold;
-    cursor: pointer;
-    display: inline-block;
-    outline: none;
-    text-align: center;
-    text-transform: uppercase;
-    padding: 3px 10px;
-    text-shadow: 0 1px 1px rgba(0,0,0,.3);
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.symfony-button-grey {
-    color: #868686;
-    font-weight: normal;
-    padding: 5px 10px;
-    border: solid 1px #d7d7d7;
-    background: #ffffff;
-    background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#d7d7d7));
-    background: -moz-linear-gradient(top,  #ffffff,  #d7d7d7);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#d7d7d7');
-}
-
-.symfony-button-green {
-    padding: 5px 12px;
-    color: white;
-    border: solid 1px #a7da39;
-    background: #a7da39;
-    background: -webkit-gradient(linear, left top, left bottom, from(#a7da39), to(#6a9211));
-    background: -moz-linear-gradient(top,  #a7da39,  #6a9211);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a7da39', endColorstr='#6a9211');
-}
-
-.symfony-block-steps span {
-    display: inline-block;
-    padding: 2px 3px;
-    font-size: 11px;
-    line-height: 15px;
-    color: #868686;
-    font-weight: bold;
-    text-transform: uppercase;
-}
-
-.symfony-block-steps span.selected {
-    background-color: #aacd4e;
-    color: #FFFFFF;
-}
-
-
-.symfony-form-row {
-    padding-bottom: 40px;
-}
-
-.symfony-form-column {
-    width: 430px;
-    float: left;
-}
-
-.symfony-form-footer {
-    padding-top: 20px;
-    clear: both;
-}
-
-.symfony-form-field {
-    height: 20px;
-}
-
-.symfony-form-row label {
-    display: block;
-    padding-bottom: 8px;
-}
-
-.symfony-form-field input[type=text],
-.symfony-form-field input[type=password],
-.symfony-form-field textarea,
-.symfony-form-field select {
-    font-size: 13px;
-    color: #565656;
-    width: 200px;
-}
-
-.symfony-form-field input[type=text],
-.symfony-form-field input[type=password],
-.symfony-form-field textarea {
-    border: 1px solid #dadada;
-    background: #FFFFFF url(../images/background-textfield.gif) repeat-x left top;
-    width: 194px;
-    padding: 5px 6px;
-}
-
-.symfony-form-errors ul {
-    padding: 0;
-}
-
-.symfony-form-errors li {
-    background: url(../images/notification.gif) no-repeat left 6px;
-    font-size: 11px;
-    line-height: 16px;
-    color: #759e1a;
-    padding: 10px 25px;
-}
-
-.symfony-configuration {
-    margin: 10px 0;
-    width: 100%;
-    height: 240px;
-}

web/bundles/sensiodistribution/webconfigurator/css/install.css

@@ -1,52 +1,12 @@
-/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
-
-Reset
-*/
-
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
-
-html, body {
-    background-color: #EFEFEF;
-}
-
 body {
     font-size: 14px;
     font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-    color: #313131;
 }
-
-a {
-    color: #08C;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-strong {
-    font-weight: bold;
-}
-
-em {
-    font-style: italic;
-}
-
-h1, h2, h3 {
-    font-family: Georgia, "Times New Roman", Times, serif;
-    color: #404040;
-}
-
-h1 {
+.sf-reset h1.title {
     font-size: 45px;
     padding-bottom: 30px;
 }
-
-h2 {
+.sf-reset h2 {
     font-weight: bold;
     color: #FFFFFF;
     /* Font is reset to sans-serif (like body) */
@@ -57,92 +17,58 @@ h2 {
     display: inline-block;
     text-transform: uppercase;
 }
-
-p {
-    line-height: 20px;
-    padding-bottom: 20px;
-}
-
-ul a {
+.sf-reset ul a,
+.sf-reset ul a:hover {
     background: url(../images/blue-arrow.png) no-repeat right 6px;
     padding-right: 10px;
 }
-
-ul, ol {
+.sf-reset ul, ol {
     padding-left: 20px;
 }
-
-li {
+.sf-reset li {
     padding-bottom: 18px;
 }
-
-ol li {
+.sf-reset ol li {
     list-style-type: decimal;
 }
-
-ul li {
+.sf-reset ul li {
     list-style-type: none;
 }
-
-#symfony-header {
-    position: relative;
-    padding: 30px 30px 20px 30px;
-}
-
-#symfony-wrapper {
-    width: 970px;
-    margin: 0 auto;
-    padding-top: 50px;
-}
-
-#symfony-content {
-    background-color: white;
-    border: 1px solid #DFDFDF;
-    padding: 50px;
-    -moz-border-radius: 16px;
-    -webkit-border-radius: 16px;
-    border-radius: 16px;
-    margin-bottom: 5px;
-}
-
-
-.symfony-blocks-install {
+.sf-reset .symfony-blocks-install {
     overflow: hidden;
 }
-
-.symfony-blocks-install .symfony-block-logo {
-    float: left;
-    width: 358px;
-}
-
-.symfony-blocks-install .symfony-block-content {
-    float: left;
-    width: 510px;
-}
-
-.symfony-install-continue {
+.sf-reset .symfony-install-continue {
     font-size: 0.95em;
     padding-left: 0;
 }
-
-.symfony-install-continue li {
+.sf-reset .symfony-install-continue li {
     padding-bottom: 10px;
 }
-
-.version {
-    text-align: right;
-    font-size: 10px;
-    margin-right: 20px;
-}
-
-.ok {
+.sf-reset .ok {
     color: #fff;
     font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
     background-color: #6d6;
     padding: 10px;
     margin-bottom: 20px;
 }
-
-.ko {
+.sf-reset .ko {
     background-color: #d66;
 }
+.version {
+    text-align: right;
+    font-size: 10px;
+    margin-right: 20px;
+}
+.sf-reset a,
+.sf-reset li a {
+    color: #08C;
+    text-decoration: none;
+}
+.sf-reset a:hover,
+.sf-reset li a:hover {
+    color: #08C;
+    text-decoration: underline;
+}
+.sf-reset textarea {
+    padding: 7px;
+}

web/config.php

@@ -21,22 +21,48 @@ $minorProblems = $symfonyRequirements->getFailedRecommendations();
 
 ?>
 <!DOCTYPE html>
-<html lang="en">
+<html>
     <head>
-        <meta charset="UTF-8" />
-        <link rel="stylesheet" href="bundles/sensiodistribution/webconfigurator/css/install.css" media="all" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="robots" content="noindex,nofollow" />
         <title>Symfony Configuration</title>
+        <link rel="stylesheet" href="bundles/framework/css/structure.css" media="all" />
+        <link rel="stylesheet" href="bundles/framework/css/body.css" media="all" />
+        <link rel="stylesheet" href="bundles/sensiodistribution/webconfigurator/css/install.css" media="all" />
     </head>
     <body>
-        <div id="symfony-wrapper">
-            <div id="symfony-content">
-                <div class="symfony-blocks-install">
-                    <div class="symfony-block-logo">
-                        <img src="bundles/sensiodistribution/webconfigurator/images/logo-big.gif" alt="Symfony logo" />
+        <div id="content">
+            <div class="header clear-fix">
+                <div class="header-logo">
+                    <img src="bundles/framework/images/logo_symfony.png" alt="Symfony" />
+                </div>
+
+                <div class="search">
+                  <form method="get" action="http://symfony.com/search">
+                    <div class="form-row">
+
+                      <label for="search-id">
+                          <img src="bundles/framework/images/grey_magnifier.png" alt="Search on Symfony website" />
+                      </label>
+
+                      <input name="q" id="search-id" type="search" placeholder="Search on Symfony website" />
+
+                      <button type="submit" class="sf-button">
+                          <span class="border-l">
+                            <span class="border-r">
+                                <span class="btn-bg">OK</span>
+                            </span>
+                        </span>
+                      </button>
                     </div>
+                   </form>
+                </div>
+            </div>
 
+            <div class="sf-reset">
+                <div class="block">
                     <div class="symfony-block-content">
-                        <h1>Welcome!</h1>
+                        <h1 class="title">Welcome!</h1>
                         <p>Welcome to your new Symfony project.</p>
                         <p>
                             This script will guide you through the basic configuration of your project.