Explorar el Código

upgrade to 2.2.3

Bastien Sevajol hace 11 años
padre
commit
30ff965d9d
Se han modificado 39 ficheros con 2508 adiciones y 2611 borrados
  1. 13 5
      app/SymfonyRequirements.php
  2. 978 1575
      app/bootstrap.php.cache
  3. 15 15
      composer.json
  4. 451 282
      composer.lock
  5. BIN
      composer.phar
  6. 1 2
      src/Muzich/CoreBundle/Form/User/DeleteForm.php
  7. 4 5
      src/Muzich/CoreBundle/Resources/views/Layout/side.html.twig
  8. 2 3
      src/Muzich/FavoriteBundle/Controller/FavoriteController.php
  9. 1 1
      src/Muzich/FavoriteBundle/Resources/config/routing.yml
  10. 1 1
      src/Muzich/HomeBundle/Resources/config/routing.yml
  11. 1 1
      src/Muzich/UserBundle/Resources/views/Account/topBar.html.twig
  12. 150 0
      web/bundles/framework/css/body.css
  13. 28 152
      web/bundles/framework/css/exception.css
  14. 0 141
      web/bundles/framework/css/exception_layout.css
  15. 72 0
      web/bundles/framework/css/structure.css
  16. BIN
      web/bundles/framework/images/border_l.png
  17. BIN
      web/bundles/framework/images/border_r.png
  18. BIN
      web/bundles/framework/images/btn_bg.png
  19. BIN
      web/bundles/framework/images/close_quote.gif
  20. BIN
      web/bundles/framework/images/exception_detected.gif
  21. BIN
      web/bundles/framework/images/exception_detected.png
  22. BIN
      web/bundles/framework/images/icon_log.png
  23. BIN
      web/bundles/framework/images/input_bg.gif
  24. BIN
      web/bundles/framework/images/logo_symfony.gif
  25. BIN
      web/bundles/framework/images/open_quote.gif
  26. 451 91
      web/bundles/muzichcore/css/main.css
  27. 16 0
      web/bundles/muzichcore/js/TagPrompt.js
  28. 5 2
      web/bundles/muzichcore/js/autoplay.js
  29. 180 68
      web/bundles/muzichcore/js/muzich.js
  30. 73 0
      web/bundles/sensiodistribution/webconfigurator/css/configurator.css
  31. 0 153
      web/bundles/sensiodistribution/webconfigurator/css/configure.css
  32. 31 105
      web/bundles/sensiodistribution/webconfigurator/css/install.css
  33. BIN
      web/bundles/sensiodistribution/webconfigurator/images/background-textfield.gif
  34. BIN
      web/bundles/sensiodistribution/webconfigurator/images/logo-big.gif
  35. BIN
      web/bundles/sensiodistribution/webconfigurator/images/logo-small.gif
  36. 35 9
      web/config.php
  37. 0 0
      web/img/1372949806_web-hosting-px-png.png
  38. 0 0
      web/img/1372956700_gnome-dev-symlink.png
  39. 0 0
      web/img/icon_friends_little.png

+ 13 - 5
app/SymfonyRequirements.php Ver fichero

@@ -475,11 +475,19 @@ class SymfonyRequirements extends RequirementCollection
475 475
         );
476 476
 
477 477
         if (function_exists('apc_store') && ini_get('apc.enabled')) {
478
-            $this->addRequirement(
479
-                version_compare(phpversion('apc'), '3.0.17', '>='),
480
-                'APC version must be at least 3.0.17',
481
-                'Upgrade your <strong>APC</strong> extension (3.0.17+).'
482
-            );
478
+            if (version_compare($installedPhpVersion, '5.4.0', '>=')) {
479
+                $this->addRequirement(
480
+                    version_compare(phpversion('apc'), '3.1.13', '>='),
481
+                    'APC version must be at least 3.1.13 when using PHP 5.4',
482
+                    'Upgrade your <strong>APC</strong> extension (3.1.13+).'
483
+                );
484
+            } else {
485
+                $this->addRequirement(
486
+                    version_compare(phpversion('apc'), '3.0.17', '>='),
487
+                    'APC version must be at least 3.0.17',
488
+                    'Upgrade your <strong>APC</strong> extension (3.0.17+).'
489
+                );
490
+            }
483 491
         }
484 492
 
485 493
         $this->addPhpIniRequirement('detect_unicode', false);

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 978 - 1575
app/bootstrap.php.cache


+ 15 - 15
composer.json Ver fichero

@@ -7,19 +7,19 @@
7 7
     },
8 8
     "require": {
9 9
         "php": ">=5.3.3",
10
-        "symfony/symfony": "2.1.8",
11
-        "doctrine/orm": ">=2.2.3,<2.5-dev",
12
-        "doctrine/doctrine-bundle": "1.1.*",
10
+        "symfony/symfony": "v2.2.3",
11
+        "doctrine/orm": "2.3.4",
12
+        "doctrine/doctrine-bundle": "v1.2.0",
13 13
         "twig/extensions": "1.0.*@dev",
14
-        "symfony/assetic-bundle": "2.3.*",
15
-        "symfony/swiftmailer-bundle": "2.1.*",
16
-        "symfony/monolog-bundle": "2.1.*",
17
-        "sensio/distribution-bundle": "2.1.*",
18
-        "sensio/framework-extra-bundle": "2.1.*",
19
-        "sensio/generator-bundle": "2.1.*",
20
-        "jms/security-extra-bundle": "1.2.*",
21
-        "jms/di-extra-bundle": "1.1.*",
22
-        "kriswallsmith/assetic": "1.1.*@dev",
14
+        "symfony/assetic-bundle": "v2.3.0",
15
+        "symfony/swiftmailer-bundle": "v2.2.3",
16
+        "symfony/monolog-bundle": "v2.2.0",
17
+        "sensio/distribution-bundle": "v2.2.3",
18
+        "sensio/framework-extra-bundle": "v2.2.3",
19
+        "sensio/generator-bundle": "v2.2.3",
20
+        "jms/security-extra-bundle": "1.5.1",
21
+        "jms/di-extra-bundle": "1.4.0",
22
+        "kriswallsmith/assetic": "v1.1.1",
23 23
         
24 24
         "friendsofsymfony/user-bundle": "v1.3.1",
25 25
         "doctrine/data-fixtures" : "dev-master", 
@@ -31,10 +31,10 @@
31 31
         "white-october/pagerfanta-bundle": "2.1.*@dev",
32 32
         "pagerfanta/pagerfanta": "1.0.*@dev",
33 33
         "shtumi/useful-bundle": "dev-master",
34
-        "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
35
-        "sonata-project/admin-bundle": "2.1.*@dev",
34
+        "sonata-project/doctrine-orm-admin-bundle": "2.2.1",
35
+        "sonata-project/admin-bundle": "2.2.2",
36 36
         "sonata-project/jquery-bundle": "1.8.*@dev",
37
-        "sonata-project/block-bundle": "2.1.*@dev",
37
+        "sonata-project/block-bundle": "2.2.3",
38 38
         "friendsofsymfony/facebook-bundle": "dev-master"
39 39
     },
40 40
     "scripts": {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 451 - 282
composer.lock


BIN
composer.phar Ver fichero


+ 1 - 2
src/Muzich/CoreBundle/Form/User/DeleteForm.php Ver fichero

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

+ 4 - 5
src/Muzich/CoreBundle/Resources/views/Layout/side.html.twig Ver fichero

@@ -8,8 +8,8 @@
8 8
 {% if app.user %}
9 9
   
10 10
   <div id="user_statusbox" class="nicebox">
11
-    {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
12
-      {% render "MuzichUserBundle:Event:infoBar" %}
11
+    {% if app.user %}
12
+      {% render(controller("MuzichUserBundle:Event:infoBar")) %}
13 13
     {% endif %}
14 14
   </div>
15 15
 
@@ -40,12 +40,11 @@
40 40
 {% endif %}
41 41
 
42 42
   <div id="searchbox" class="nicebox">
43
-    {% render "MuzichCoreBundle:Search:renderGlobalSearchForm" %}
43
+    {% render(controller("MuzichCoreBundle:Search:renderGlobalSearchForm")) %}
44 44
   </div>
45 45
   
46
-  
47 46
   {% include 'MuzichCoreBundle:Layout:social.html.twig' %}
48 47
 
49 48
 {% if app.user %}
50
-  {% render 'MuzichCoreBundle:Core:renderSideMenu' %}
49
+  {% render(controller('MuzichCoreBundle:Core:renderSideMenu')) %}
51 50
 {% endif %}

+ 2 - 3
src/Muzich/FavoriteBundle/Controller/FavoriteController.php Ver fichero

@@ -154,7 +154,6 @@ class FavoriteController extends Controller
154 154
   /**
155 155
    * Page affichant les elements favoris de l'utilisateur
156 156
    * 
157
-   * @Template()
158 157
    */
159 158
   public function myListAction()
160 159
   {
@@ -182,12 +181,12 @@ class FavoriteController extends Controller
182 181
       $tags_id[] = $tag->getId();
183 182
     }
184 183
     
185
-    return array(
184
+    return $this->render('MuzichFavoriteBundle:Favorite:myList.html.twig', array(
186 185
       'tags'          => $tags,
187 186
       'tags_id_json'  => json_encode($tags_id),
188 187
       'user'          => $this->getUser(),
189 188
       'elements'      => $search_object->getElements($this->getDoctrine(), $this->getUserId())
190
-    );
189
+    ));
191 190
   }
192 191
   
193 192
   /**

+ 1 - 1
src/Muzich/FavoriteBundle/Resources/config/routing.yml Ver fichero

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

+ 1 - 1
src/Muzich/HomeBundle/Resources/config/routing.yml Ver fichero

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

+ 1 - 1
src/Muzich/UserBundle/Resources/views/Account/topBar.html.twig Ver fichero

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

+ 150 - 0
web/bundles/framework/css/body.css Ver fichero

@@ -0,0 +1,150 @@
1
+/*
2
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
3
+Code licensed under the BSD License:
4
+http://developer.yahoo.com/yui/license.html
5
+version: 3.1.2
6
+build: 56
7
+*/
8
+.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;}
9
+.sf-reset html,
10
+.sf-reset body {
11
+    width: 100%;
12
+    min-height: 100%;
13
+    _height: 100%;
14
+    margin: 0;
15
+    padding: 0;
16
+}
17
+.sf-reset body {
18
+    font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
19
+    text-align: left;
20
+    background-color: #efefef;
21
+}
22
+.sf-reset abbr {
23
+    border-bottom: 1px dotted #000;
24
+    cursor: help;
25
+}
26
+.sf-reset p {
27
+    font-size: 14px;
28
+    line-height: 20px;
29
+    padding-bottom: 20px;
30
+}
31
+.sf-reset strong {
32
+    color: #313131;
33
+    font-weight: bold;
34
+}
35
+.sf-reset a {
36
+    color: #6c6159;
37
+}
38
+.sf-reset a img {
39
+    border: none;
40
+}
41
+.sf-reset a:hover {
42
+    text-decoration: underline;
43
+}
44
+.sf-reset em {
45
+    font-style: italic;
46
+}
47
+.sf-reset h2,
48
+.sf-reset h3 {
49
+    font-weight: bold;
50
+}
51
+.sf-reset h1 {
52
+    font-family: Georgia, "Times New Roman", Times, serif;
53
+    font-size: 20px;
54
+    color: #313131;
55
+    word-break: break-all;
56
+}
57
+.sf-reset li {
58
+    padding-bottom: 10px;
59
+}
60
+.sf-reset .block {
61
+    -moz-border-radius: 16px;
62
+    -webkit-border-radius: 16px;
63
+    border-radius: 16px;
64
+    margin-bottom: 20px;
65
+    background-color: #FFFFFF;
66
+    border: 1px solid #dfdfdf;
67
+    padding: 40px 50px;
68
+}
69
+.sf-reset h2 {
70
+    font-size: 16px;
71
+    font-family: Arial, Helvetica, sans-serif;
72
+}
73
+.sf-reset li a {
74
+    background: none;
75
+    color: #868686;
76
+    text-decoration: none;
77
+}
78
+.sf-reset li a:hover {
79
+    background: none;
80
+    color: #313131;
81
+    text-decoration: underline;
82
+}
83
+.sf-reset ol {
84
+    padding: 10px 0;
85
+}
86
+.sf-reset ol li {
87
+    list-style: decimal;
88
+    margin-left: 20px;
89
+    padding: 2px;
90
+    padding-bottom: 20px;
91
+}
92
+.sf-reset ol ol li {
93
+    list-style-position: inside;
94
+    margin-left: 0;
95
+    white-space: nowrap;
96
+    font-size: 12px;
97
+    padding-bottom: 0;
98
+}
99
+.sf-reset li .selected {
100
+    background-color: #ffd;
101
+}
102
+.sf-button {
103
+    display: -moz-inline-box;
104
+    display: inline-block;
105
+    text-align: center;
106
+    vertical-align: middle;
107
+    border: 0;
108
+    background: transparent none;
109
+    text-transform: uppercase;
110
+    cursor: pointer;
111
+    font: bold 11px Arial, Helvetica, sans-serif;
112
+}
113
+.sf-button span {
114
+    text-decoration: none;
115
+    display: block;
116
+    height: 28px;
117
+    float: left;
118
+}
119
+.sf-button .border-l {
120
+    text-decoration: none;
121
+    display: block;
122
+    height: 28px;
123
+    float: left;
124
+    padding: 0 0 0 7px;
125
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQtJREFUeNpiPHnyJAMakARiByDWYEGT8ADiYGVlZStubm5xlv///4MEQYoKZGRkQkRERLRYWVl5wYJQyXBZWdkwCQkJUxAHKgaWlAHSLqKiosb//v1DsYMFKGCvoqJiDmQzwXTAJYECulxcXNLoumCSoszMzDzoumDGghQwYZUECWIzkrAkSIIGOmlkLI10AiX//P379x8jIyMTNmPf/v79+ysLCwsvuiQoNi5//fr1Kch4dAyS3P/gwYMTQBP+wxwHw0xA4gkQ73v9+vUZdJ2w1Lf82bNn4iCHCQoKasHsZw4ODgbRIL8c+/Lly5M3b978Y2dn5wC6npkFLXnsAOKLjx49AmUHLYAAAwBoQubG016R5wAAAABJRU5ErkJggg==) no-repeat top left;
126
+}
127
+.sf-button .border-r {
128
+    padding: 0 7px 0 0;
129
+    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;
130
+}
131
+.sf-button .btn-bg {
132
+    padding: 0px 14px;
133
+    color: #636363;
134
+    line-height: 28px;
135
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;
136
+}
137
+.sf-button:hover .border-l,
138
+.sf-button-selected .border-l {
139
+    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;
140
+}
141
+.sf-button:hover .border-r,
142
+.sf-button-selected .border-r {
143
+    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;
144
+}
145
+.sf-button:hover .btn-bg,
146
+.sf-button-selected .btn-bg {
147
+    color: #FFFFFF;
148
+    text-shadow:0 1px 1px #6b9311;
149
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAIAAAAvP0KbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEFJREFUeNpiPnv2LNMdvlymf///M/37B8R/QfQ/MP33L4j+B6Qh7L9//sHpf2h8MA1V+w/KRjYLaDaLCU8vQIABAFO3TxZriO4yAAAAAElFTkSuQmCC) repeat-x top left;
150
+}

+ 28 - 152
web/bundles/framework/css/exception.css Ver fichero

@@ -1,76 +1,7 @@
1
-/*
2
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
3
-Code licensed under the BSD License:
4
-http://developer.yahoo.com/yui/license.html
5
-version: 3.1.2
6
-build: 56
7
-*/
8
-.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;}
9
-
10
-.sf-exceptionreset html,
11
-.sf-exceptionreset body {
12
-    width: 100%;
13
-    min-height: 100%;
14
-    _height: 100%;
15
-    margin: 0;
16
-    padding: 0;
17
-}
18
-.sf-exceptionreset body {
19
-    font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
20
-    text-align: left;
21
-    background-color: #efefef;
22
-}
23
-
24
-.sf-exceptionreset abbr {
25
-    border-bottom: 1px dotted #000;
26
-    cursor: help;
27
-}
28
-
29
-.sf-exceptionreset p {
30
-    font-size: 14px;
31
-    line-height: 20px;
32
-    color: #868686;
33
-    padding-bottom: 20px;
34
-}
35
-
36
-.sf-exceptionreset strong {
37
-    color: #313131;
38
-    font-weight: bold;
39
-}
40
-
41
-.sf-exceptionreset a {
42
-    color: #6c6159;
43
-}
44
-.sf-exceptionreset a img {
45
-    border: none;
46
-}
47
-.sf-exceptionreset a:hover {
48
-    text-decoration: underline;
49
-}
50
-
51
-.sf-exceptionreset em {
52
-    font-style: italic;
53
-}
54
-
55
-.sf-exceptionreset h2,
56
-.sf-exceptionreset h3 {
57
-    font-weight: bold;
58
-}
59
-.sf-exceptionreset h1 {
60
-    font-family: Georgia, "Times New Roman", Times, serif;
61
-    font-size: 20px;
62
-    color: #313131;
63
-    word-break: break-all;
64
-}
65
-
66
-.sf-exceptionreset li {
67
-    padding-bottom: 10px;
68
-}
69
-
70
-.sf-exceptionreset .traces {
1
+.sf-reset .traces {
71 2
     padding-bottom: 14px;
72 3
 }
73
-.sf-exceptionreset .traces li {
4
+.sf-reset .traces li {
74 5
     font-size: 12px;
75 6
     color: #868686;
76 7
     padding: 5px 4px;
@@ -78,113 +9,81 @@ build: 56
78 9
     margin-left: 20px;
79 10
     white-space: break-word;
80 11
 }
81
-.sf-exceptionreset #logs .traces li.error {
12
+.sf-reset #logs .traces li.error {
82 13
     font-style: normal;
83 14
     color: #AA3333;
84 15
     background: #f9ecec;
85 16
 }
86
-.sf-exceptionreset #logs .traces li.warning {
17
+.sf-reset #logs .traces li.warning {
87 18
     font-style: normal;
88 19
     background: #ffcc00;
89 20
 }
90 21
 /* fix for Opera not liking empty <li> */
91
-.sf-exceptionreset .traces li:after {
22
+.sf-reset .traces li:after {
92 23
     content: "\00A0";
93 24
 }
94
-
95
-.sf-exceptionreset .trace {
25
+.sf-reset .trace {
96 26
     border: 1px solid #D3D3D3;
97 27
     padding: 10px;
98 28
     overflow: auto;
99 29
     margin: 10px 0 20px;
100 30
 }
101
-
102
-.sf-exceptionreset .block,
103
-.sf-exceptionreset .block_exception {
31
+.sf-reset .block-exception {
104 32
     -moz-border-radius: 16px;
105 33
     -webkit-border-radius: 16px;
106 34
     border-radius: 16px;
107 35
     margin-bottom: 20px;
108
-}
109
-.sf-exceptionreset .block {
110
-    background-color: #FFFFFF;
111
-    border: 1px solid #dfdfdf;
112
-    padding: 40px 50px;
113
-}
114
-.sf-exceptionreset .block_exception {
115 36
     background-color: #f6f6f6;
116 37
     border: 1px solid #dfdfdf;
117 38
     padding: 30px 28px;
39
+    word-wrap: break-word;
40
+    overflow: hidden;
118 41
 }
119
-.sf-exceptionreset .block_exception div {
42
+.sf-reset .block-exception div {
120 43
     color: #313131;
121 44
     font-size: 10px;
122 45
 }
123
-
124
-.sf-exceptionreset .block_exception_detected .illustration_exception,
125
-.sf-exceptionreset .block_exception_detected .text_exception {
46
+.sf-reset .block-exception-detected .illustration-exception,
47
+.sf-reset .block-exception-detected .text-exception {
126 48
     float: left;
127 49
 }
128
-.sf-exceptionreset .block_exception_detected .illustration_exception {
50
+.sf-reset .block-exception-detected .illustration-exception {
129 51
     width: 152px;
130 52
 }
131
-.sf-exceptionreset .block_exception_detected .text_exception {
53
+.sf-reset .block-exception-detected .text-exception {
132 54
     width: 670px;
133 55
     padding: 30px 44px 24px 46px;
134 56
     position: relative;
135 57
 }
136
-
137
-.sf-exceptionreset .text_exception .open_quote,
138
-.sf-exceptionreset .text_exception .close_quote {
58
+.sf-reset .text-exception .open-quote,
59
+.sf-reset .text-exception .close-quote {
139 60
     position: absolute;
140 61
 }
141
-.sf-exceptionreset .open_quote {
62
+.sf-reset .open-quote {
142 63
     top: 0;
143 64
     left: 0;
144 65
 }
145
-.sf-exceptionreset .close_quote {
66
+.sf-reset .close-quote {
146 67
     bottom: 0;
147 68
     right: 50px;
148 69
 }
149
-
150
-.sf-exceptionreset .block_exception p {
70
+.sf-reset .block-exception p {
151 71
     font-family: Arial, Helvetica, sans-serif;
152 72
 }
153
-.sf-exceptionreset .block_exception p a,
154
-.sf-exceptionreset .block_exception p a:hover {
73
+.sf-reset .block-exception p a,
74
+.sf-reset .block-exception p a:hover {
155 75
     color: #565656;
156 76
 }
157
-
158
-.sf-exceptionreset h2 {
159
-    font-size: 16px;
160
-    font-family: Arial, Helvetica, sans-serif;
161
-    padding-bottom: 16px;
162
-}
163
-
164
-.sf-exceptionreset li a {
165
-    background: none;
166
-    color: #868686;
167
-    text-decoration: none;
168
-}
169
-
170
-.sf-exceptionreset li a:hover {
171
-    background: none;
172
-    color: #313131;
173
-    text-decoration: underline;
174
-}
175
-
176
-.sf-exceptionreset .logs h2 {
77
+.sf-reset .logs h2 {
177 78
     float: left;
178 79
     width: 654px;
179 80
 }
180
-
181
-.sf-exceptionreset .error_count {
81
+.sf-reset .error-count {
182 82
     float: right;
183 83
     width: 170px;
184 84
     text-align: right;
185 85
 }
186
-
187
-.sf-exceptionreset .error_count span {
86
+.sf-reset .error-count span {
188 87
     display: inline-block;
189 88
     background-color: #aacd4e;
190 89
     -moz-border-radius: 6px;
@@ -196,37 +95,14 @@ build: 56
196 95
     font-size: 11px;
197 96
     font-weight: bold;
198 97
 }
199
-
200
-.sf-exceptionreset .toggle {
98
+.sf-reset .toggle {
201 99
     vertical-align: middle;
202 100
 }
203
-
204
-.sf-exceptionreset .linked ul,
205
-.sf-exceptionreset .linked li {
101
+.sf-reset .linked ul,
102
+.sf-reset .linked li {
206 103
     display: inline;
207 104
 }
208
-
209
-.sf-exceptionreset #output_content {
105
+.sf-reset #output-content {
210 106
     color: #000;
211 107
     font-size: 12px;
212 108
 }
213
-
214
-.sf-exceptionreset ol {
215
-    padding: 10px 0;
216
-}
217
-.sf-exceptionreset ol li {
218
-    list-style: decimal;
219
-    margin-left: 20px;
220
-    padding: 2px;
221
-    padding-bottom: 20px;
222
-}
223
-.sf-exceptionreset ol ol li {
224
-    list-style-position: inside;
225
-    margin-left: 0;
226
-    white-space: nowrap;
227
-    font-size: 12px;
228
-    padding-bottom: 0;
229
-}
230
-.sf-exceptionreset li .selected {
231
-    background-color: #ffd;
232
-}

+ 0 - 141
web/bundles/framework/css/exception_layout.css Ver fichero

@@ -1,141 +0,0 @@
1
-html {
2
-    background: #eee;
3
-}
4
-
5
-body {
6
-    font: 11px Verdana, Arial, sans-serif;
7
-    color: #333;
8
-}
9
-
10
-.sf-exceptionreset, .sf-exceptionreset .block, .sf-exceptionreset #message {
11
-    margin: auto;
12
-}
13
-
14
-img {
15
-    border: 0;
16
-}
17
-
18
-.clear {
19
-    clear: both;
20
-    height: 0;
21
-    font-size: 0;
22
-    line-height: 0;
23
-}
24
-
25
-.clear_fix:after {
26
-    content: "\0020";
27
-    display: block;
28
-    height: 0;
29
-    clear: both;
30
-    visibility: hidden;
31
-}
32
-.clear_fix {
33
-    display: inline-block;
34
-}
35
-* html .clear_fix {
36
-    height: 1%;
37
-}
38
-.clear_fix {
39
-    display: block;
40
-}
41
-
42
-.header {
43
-    padding: 30px 30px 20px 30px;
44
-}
45
-
46
-.header_logo {
47
-    float: left;
48
-}
49
-
50
-.search {
51
-    float: right;
52
-    padding-top: 20px;
53
-}
54
-
55
-.search label {
56
-    line-height: 28px;
57
-    vertical-align: middle;
58
-}
59
-
60
-.search input {
61
-    width: 188px;
62
-    margin-right: 10px;
63
-    font-size: 12px;
64
-    border: 1px solid #dadada;
65
-    background: #FFFFFF url(../images/input_bg.gif) repeat-x left top;
66
-    padding: 5px 6px;
67
-    color: #565656;
68
-}
69
-
70
-.search input[type="search"] {
71
-    -webkit-appearance: textfield;
72
-}
73
-
74
-.search button {
75
-    -webkit-appearance: button-bevel;
76
-    float: none;
77
-    padding: 0;
78
-    margin: 0;
79
-    overflow: visible;
80
-    width: auto;
81
-    text-decoration: none;
82
-    cursor: pointer;
83
-    white-space: nowrap;
84
-    display: inline-block;
85
-    text-align: center;
86
-    vertical-align: middle;
87
-    border: 0;
88
-    background: none;
89
-}
90
-
91
-.search button:-moz-focus-inner {
92
-    padding: 0;
93
-    border: none;
94
-}
95
-
96
-.search button:hover {
97
-    text-decoration: none;
98
-}
99
-
100
-.search button span span,
101
-.search button span span span {
102
-    position: static;
103
-}
104
-
105
-.search button span {
106
-    position: relative;
107
-    text-decoration: none;
108
-    display: block;
109
-    height: 28px;
110
-    float: left;
111
-    padding: 0 0 0 8px;
112
-    background: transparent url(../images/border_l.png) no-repeat top left;
113
-}
114
-
115
-.search button span span {
116
-    padding: 0 8px 0 0;
117
-    background: transparent url(../images/border_r.png) right top no-repeat;
118
-}
119
-
120
-.search button span span span {
121
-    padding: 0 7px;
122
-    font: bold 11px Arial, Helvetica, sans-serif;
123
-    color: #6b6b6b;
124
-    line-height: 28px;
125
-    background: transparent url(../images/btn_bg.png) repeat-x top left;
126
-}
127
-
128
-#content {
129
-    width: 970px;
130
-    margin: 0 auto;
131
-}
132
-
133
-pre {
134
-    white-space: normal;
135
-    font-family: Arial, Helvetica, sans-serif;
136
-}
137
-
138
-pre.xdebug-var-dump{
139
-    white-space: pre;
140
-    font-family: monospace;
141
-}

+ 72 - 0
web/bundles/framework/css/structure.css Ver fichero

@@ -0,0 +1,72 @@
1
+html {
2
+    background: #eee;
3
+}
4
+body {
5
+    font: 11px Verdana, Arial, sans-serif;
6
+    color: #333;
7
+}
8
+.sf-reset, .sf-reset .block, .sf-reset #message {
9
+    margin: auto;
10
+}
11
+img {
12
+    border: 0;
13
+}
14
+.clear {
15
+    clear: both;
16
+    height: 0;
17
+    font-size: 0;
18
+    line-height: 0;
19
+}
20
+.clear-fix:after {
21
+    content: "\0020";
22
+    display: block;
23
+    height: 0;
24
+    clear: both;
25
+    visibility: hidden;
26
+}
27
+.clear-fix {
28
+    display: inline-block;
29
+}
30
+* html .clear-fix {
31
+    height: 1%;
32
+}
33
+.clear-fix {
34
+    display: block;
35
+}
36
+.header {
37
+    padding: 30px 30px 20px 30px;
38
+}
39
+.header-logo {
40
+    float: left;
41
+}
42
+.search {
43
+    float: right;
44
+    padding-top: 20px;
45
+}
46
+.search label {
47
+    line-height: 28px;
48
+    vertical-align: middle;
49
+}
50
+.search input {
51
+    width: 195px;
52
+    font-size: 12px;
53
+    border: 1px solid #dadada;
54
+    background: #fff url(data:image/gif;base64,R0lGODlhAQAFAKIAAPX19e/v7/39/fr6+urq6gAAAAAAAAAAACH5BAAAAAAALAAAAAABAAUAAAMESAEjCQA7) repeat-x left top;
55
+    padding: 5px 6px;
56
+    color: #565656;
57
+}
58
+.search input[type="search"] {
59
+    -webkit-appearance: textfield;
60
+}
61
+#content {
62
+    width: 970px;
63
+    margin: 0 auto;
64
+}
65
+pre {
66
+    white-space: normal;
67
+    font-family: Arial, Helvetica, sans-serif;
68
+}
69
+pre.xdebug-var-dump{
70
+    white-space: pre;
71
+    font-family: monospace;
72
+}

BIN
web/bundles/framework/images/border_l.png Ver fichero


BIN
web/bundles/framework/images/border_r.png Ver fichero


BIN
web/bundles/framework/images/btn_bg.png Ver fichero


BIN
web/bundles/framework/images/close_quote.gif Ver fichero


BIN
web/bundles/framework/images/exception_detected.gif Ver fichero


BIN
web/bundles/framework/images/exception_detected.png Ver fichero


BIN
web/bundles/framework/images/icon_log.png Ver fichero


BIN
web/bundles/framework/images/input_bg.gif Ver fichero


BIN
web/bundles/framework/images/logo_symfony.gif Ver fichero


BIN
web/bundles/framework/images/open_quote.gif Ver fichero


+ 451 - 91
web/bundles/muzichcore/css/main.css Ver fichero

@@ -37,6 +37,7 @@ div#header
37 37
   background-image: url("/img/header_background.png");
38 38
   background-repeat: repeat-x;
39 39
   border-bottom: 3px solid #e51936;
40
+  
40 41
 }
41 42
 
42 43
 div#header div#hgroup
@@ -237,18 +238,48 @@ div#languages:hover
237 238
   display: table-cell;
238 239
   width: 650px;
239 240
   padding-right: 30px;
241
+  float: left;
242
+  position: relative;
243
+  margin-top: 25px;
244
+}
245
+
246
+aside#sidebar
247
+{
248
+  display: table-cell;
249
+/*  vertical-align: top;*/
250
+  float: left;
251
+  position: relative;
252
+}
253
+
254
+aside#sidebar .sidebar
255
+{
256
+  width: 300px;
257
+  padding-bottom: 25px;
258
+  padding-top: 25px;
259
+/* height: 800px;
260
+ background-color: blue;*/
261
+}
262
+
263
+.top-fixed {
264
+    position: fixed;
265
+    top: 0;
266
+}
267
+
268
+.bottom-fixed {
269
+    position:fixed;
270
+    bottom: 0;
240 271
 }
241 272
 
242 273
 #mainbox
243 274
 {
244
-  margin-top: 25px;
275
+  margin-top: 0px;
245 276
   /*padding: 10px;*/
246 277
   padding-bottom: 23px;
247 278
 }
248 279
 
249 280
 #mainbox.mainbox_margintop
250 281
 {
251
-  margin-top: 80px;
282
+  margin-top: 60px;
252 283
 }
253 284
 
254 285
 #mainbox.mainbox_nopadding
@@ -274,13 +305,6 @@ div#languages:hover
274 305
   border: 1px solid #d3d3d3;
275 306
 }
276 307
 
277
-aside#sidebar
278
-{
279
-  display: table-cell;
280
-  width: 300px;
281
-  vertical-align: top;
282
-}
283
-
284 308
 ul.elements
285 309
 {
286 310
   margin-top: 0px;
@@ -570,7 +594,7 @@ aside#sidebar div.nicebox
570 594
 
571 595
 div#user_statusbox
572 596
 {
573
-  margin-top: 25px;
597
+  margin-top: 0px;
574 598
 }
575 599
 
576 600
 div.user_score
@@ -688,7 +712,7 @@ div.seachboxcontainer input
688 712
   margin: 0;
689 713
   padding: 0;
690 714
   padding-left: 6px;
691
-  width: 222px;
715
+  width: 220px;
692 716
 }
693 717
 div.seachboxcontainer img
694 718
 {
@@ -804,6 +828,12 @@ div#secondarymenu ul.secondarymenu li.top_menu_element.open ul.submenu
804 828
   display: block;
805 829
 }
806 830
 
831
+ul.submenu
832
+{
833
+  direction: rtl;
834
+  text-align: left;
835
+}
836
+
807 837
 #tabs_tag_search_buttons
808 838
 {
809 839
   margin: 0;
@@ -840,7 +870,10 @@ div#secondarymenu ul.secondarymenu li.top_menu_element.open ul.submenu
840 870
   list-style-type: none;
841 871
   display: inline;
842 872
   float: left;
843
-  padding: 20px;
873
+  padding-left: 15px;
874
+  padding-top: 20px;
875
+  padding-right: 20px;
876
+  padding-bottom: 20px;
844 877
   
845 878
   background: #dddddd; /* Old browsers */
846 879
   /* IE9 SVG, needs conditional override of 'filter' to 'none' */
@@ -977,8 +1010,9 @@ ul#favorite_tags li
977 1010
 
978 1011
 #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
979 1012
 {
980
-  margin-bottom: -5px;
981
-    margin-right: -5px;
1013
+  margin-left: -5px;
1014
+  margin-right: 5px;
1015
+  margin-top: -1px;
982 1016
 }
983 1017
 
984 1018
 #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
1088 1122
 
1089 1123
 #tabs_tag_search_buttons a
1090 1124
 {
1091
-  padding-left: 5px;
1125
+  padding-left: 10px;
1092 1126
 }
1093 1127
 
1094 1128
 #tabs_tag_search_buttons img
@@ -1180,13 +1214,8 @@ div#footer_logo img
1180 1214
 
1181 1215
 div#footer_logo_2
1182 1216
 {
1183
-  line-height: 18px;
1184 1217
   margin-top: 25px;
1185
-  padding-left: 0;
1186
-  padding-right: 40px;
1187
-  text-align: left;
1188
-  width: 135px;
1189
-  float: left;
1218
+  float: right;
1190 1219
 }
1191 1220
 
1192 1221
 div#footer_logo_2 img
@@ -1619,7 +1648,7 @@ form.changeemail input[type="text"]
1619 1648
   width: 388px;
1620 1649
 }
1621 1650
 
1622
-form.changeemail input[type="submit"]
1651
+form.changeemail input[type="submit"], form.privacy input[type="submit"], form.delete input[type="submit"]
1623 1652
 {
1624 1653
   float: right;
1625 1654
   margin-top: 5px;
@@ -1867,7 +1896,7 @@ p.group_description
1867 1896
 
1868 1897
 #login_box input[id="username"], #login_box input[id="password"]
1869 1898
 {
1870
-  width: 228px;
1899
+  width: 220px;
1871 1900
 }
1872 1901
 
1873 1902
 #login_box div.login
@@ -2089,71 +2118,6 @@ li.user_name a:hover
2089 2118
   text-decoration: underline;
2090 2119
 }
2091 2120
 
2092
-@-webkit-keyframes clignote
2093
-{
2094
-  0%{box-shadow:0px 0px 10px #909090;}
2095
-  50%{box-shadow:0px 0px 2px #909090;}
2096
-  100%{box-shadow:0px 0px 10px #909090;}
2097
-}
2098
-
2099
-@-moz-keyframes clignote
2100
-{
2101
-  0%{box-shadow:0px 0px 10px #909090;}
2102
-  50%{box-shadow:0px 0px 2px #909090;}
2103
-  100%{box-shadow:0px 0px 10px #909090;}
2104
-}
2105
-
2106
-@-ms-keyframes clignote
2107
-{
2108
-  0%{box-shadow:0px 0px 10px #909090;}
2109
-  50%{box-shadow:0px 0px 2px #909090;}
2110
-  100%{box-shadow:0px 0px 10px #909090;}
2111
-}
2112
-
2113
-@-o-keyframes clignote
2114
-{
2115
-  0%{box-shadow:0px 0px 10px #909090;}
2116
-  50%{box-shadow:0px 0px 2px #909090;}
2117
-  100%{box-shadow:0px 0px 10px #909090;}
2118
-}
2119
-
2120
-@keyframes clignote
2121
-{
2122
-  0%{box-shadow:0px 0px 10px #909090;}
2123
-  50%{box-shadow:0px 0px 2px #909090;}
2124
-  100%{box-shadow:0px 0px 10px #909090;}
2125
-}
2126
-
2127
-
2128
-.flashing
2129
-{
2130
-  font-weight: bold;
2131
-  text-shadow: 0 1px 0 white;
2132
-  border-radius: 3px;
2133
-  padding: 5px 10px;
2134
-  box-shadow:0px 0px 10px #909090;
2135
-  
2136
-  -webkit-animation-name: clignote;
2137
-  -webkit-animation-duration: 1s;
2138
-  -webkit-animation-iteration-count:infinite;
2139
-  
2140
-  -moz-animation-name: clignote;
2141
-  -moz-animation-duration: 1s;
2142
-  -moz-animation-iteration-count:infinite;
2143
-  
2144
-  -ms-animation-name: clignote;
2145
-  -ms-animation-duration: 1s;
2146
-  -ms-animation-iteration-count:infinite;
2147
-  
2148
-  -o-animation-name: clignote;
2149
-  -o-animation-duration: 1s;
2150
-  -o-animation-iteration-count:infinite;
2151
-  
2152
-  animation-name: clignote;
2153
-  animation-duration: 1s;
2154
-  animation-iteration-count:infinite;
2155
-}
2156
-
2157 2121
 div.myaccount_part.flashing
2158 2122
 {
2159 2123
   padding: 2px;
@@ -2234,10 +2198,406 @@ ul.playlists ul.tags_cloud li
2234 2198
   padding: 4px;
2235 2199
 }
2236 2200
 
2201
+ul.playlist_elements
2202
+{
2203
+  margin-left: 0px;
2204
+}
2205
+
2206
+li.playlist_element div.actions, li.playlist div.actions
2207
+{
2208
+  float: left;
2209
+  margin-top: 4px;
2210
+}
2211
+
2212
+li.playlist_element div.actions img.autoplay_off
2213
+{
2214
+  margin-left: -5px;
2215
+}
2216
+
2217
+li.playlist_element div.actions_right
2218
+{
2219
+  float: right;
2220
+  margin-top: 4px;
2221
+}
2222
+
2223
+li.playlist_element div.actions a, li.playlist div.actions a
2224
+{
2225
+  margin-left: -5px;
2226
+}
2227
+
2228
+li.playlist_element div.actions a.drag
2229
+{
2230
+  cursor: move;
2231
+}
2232
+
2233
+li.playlist_element div.title
2234
+{
2235
+  margin-left: 53px;
2236
+  margin-top: 4px;
2237
+}
2238
+
2239
+ul.playlist_elements li.playlist_element a
2240
+{
2241
+  color: black;
2242
+}
2243
+
2244
+ul.playlist_elements li.playlist_element
2245
+{
2246
+  border-top: 1px solid #C8C8C8;
2247
+  height: 27px;
2248
+  list-style: none outside none;
2249
+  background-color: #F8F8F8;
2250
+}
2251
+
2252
+ul.playlist_elements li.playlist_element ul.elements li.element
2253
+{
2254
+  border-top: none;
2255
+}
2256
+
2257
+a.button img
2258
+{
2259
+  float: left;
2260
+}
2261
+
2262
+a.button.simpleimg
2263
+{
2264
+  padding: 6px;
2265
+  
2266
+}
2267
+
2268
+a.button.simpleimg img
2269
+{
2270
+  float: none;
2271
+}
2272
+
2273
+
2274
+
2275
+a.button span
2276
+{
2277
+  float: left;
2278
+  margin-top: 4px;
2279
+}
2280
+
2281
+ul.playlists
2282
+{
2283
+  margin-left: 0px;
2284
+  margin-bottom: 10px;
2285
+}
2286
+
2287
+ul.playlists li.playlist
2288
+{
2289
+  border-top: 1px solid #C8C8C8;
2290
+  list-style: none outside none;
2291
+  background-color: #F8F8F8;
2292
+}
2293
+
2294
+ul.playlists li.playlist a.title
2295
+{
2296
+  font-weight: bold;
2297
+  font-size: 127%;
2298
+}
2299
+
2300
+ul.playlists li.playlist a.title:hover
2301
+{
2302
+  text-decoration: underline;
2303
+}
2304
+
2305
+ul.playlists li.playlist ul.tags_cloud
2306
+{
2307
+  margin-left: 25px;
2308
+}
2309
+
2310
+li.playlist div.title
2311
+{
2312
+  margin-left: 42px;
2313
+  margin-top: 3px;
2314
+}
2315
+
2237 2316
 div.playlists_prompt
2238 2317
 {
2239 2318
   padding: 10px;
2240
-  border: 1px solid red;
2241
-  width: 320px;
2242
-  background-color: white;
2319
+  width: 375px;
2320
+  background-color: #F8F8F8;
2321
+}
2322
+
2323
+div.playlists_prompt h2
2324
+{
2325
+  font-size: 1em;
2326
+  margin-top: 7px;
2327
+}
2328
+
2329
+div.playlists_prompt h2.nomargintop
2330
+{
2331
+  margin-top: 0px;
2332
+}
2333
+
2334
+div.playlists_prompt input.niceinput
2335
+{
2336
+  font-size: 13px;
2337
+  height: 23px;
2338
+}
2339
+
2340
+div.playlists_prompt a.close_playlists_prompt
2341
+{
2342
+  float: right;
2343
+  margin-top: -5px;
2344
+  margin-right: -5px;
2345
+}
2346
+
2347
+li.playlist.remarquable
2348
+{
2349
+  font-weight: bold;
2350
+}
2351
+
2352
+ul.form-errors
2353
+{
2354
+  margin-left: 10px;
2355
+}
2356
+
2357
+ul.form-errors li
2358
+{
2359
+  color: red;
2360
+  list-style-type: none;
2361
+}
2362
+
2363
+div.playlists_prompt ul.form-errors li
2364
+{
2365
+  font-size: 85%;
2366
+}
2367
+
2368
+p.solop
2369
+{
2370
+  margin: 15px;
2371
+}
2372
+
2373
+div.tags_proposition_view
2374
+{
2375
+  padding: 10px;
2376
+  margin: 5px;
2377
+  margin-top: 10px;
2378
+  /*--Les différentes définitions de Box Shadow en CSS3--*/
2379
+  -webkit-box-shadow: 0px 0px 6px #999999;
2380
+  -moz-box-shadow: 0px 0px 6px #999999;
2381
+  box-shadow: 0px 0px 6px #999999;
2382
+  /*--Coins arrondis en CSS3--*/
2383
+  -webkit-border-radius: 5px;
2384
+  -moz-border-radius: 5px;
2385
+  border-radius: 5px;
2386
+}
2387
+
2388
+div.tags_proposition_view a.darkbutton
2389
+{
2390
+  margin: 2px;
2391
+  padding: 6px 6px 4px 4px;
2392
+}
2393
+
2394
+a.button_arrow span
2395
+{
2396
+  
2397
+}
2398
+
2399
+a.button_arrow span
2400
+{
2401
+  margin-top: 2px;
2402
+}
2403
+
2404
+ul.playlists_for_element
2405
+{
2406
+  margin-left: 28px;
2407
+  margin-top: 8px;
2408
+}
2409
+
2410
+ul.playlists_for_element li
2411
+{
2412
+  list-style-image: url(/img/notin.png);
2413
+}
2414
+
2415
+ul.playlists_for_element li.in
2416
+{
2417
+  list-style-image: url(/img/in.png);
2418
+}
2419
+
2420
+form.playlist_edit input#playlist_name
2421
+{
2422
+  width: 600px;
2423
+}
2424
+
2425
+form.playlist_edit input[type="submit"]
2426
+{
2427
+  float: right;
2428
+  margin-right: 10px;
2429
+  margin-top: 5px;
2430
+}
2431
+
2432
+div.playlists_prompt
2433
+{
2434
+  z-index: 100001;
2435
+}
2436
+
2437
+a.all_network
2438
+{
2439
+  padding-left: 15px;
2440
+  padding-right: 15px;
2441
+}
2442
+
2443
+div#tags_prompt_search p.help_notags
2444
+{
2445
+  font-weight: bold;
2446
+  margin-top: -10px;
2447
+}
2448
+
2449
+div#tags_prompt_search p.help_notags img
2450
+{
2451
+  float: right;
2452
+  margin: -16px 15px -10px 0;
2453
+}
2454
+
2455
+div#tags_prompt_search p.help_notags span
2456
+{
2457
+  float: left;
2458
+  margin-bottom: 10px;
2459
+  width: 480px;
2460
+}
2461
+
2462
+/*
2463
+*
2464
+*
2465
+*
2466
+*/
2467
+
2468
+@-webkit-keyframes clignote
2469
+{
2470
+  0%{box-shadow:0px 0px 10px #909090;}
2471
+  50%{box-shadow:0px 0px 2px #909090;}
2472
+  100%{box-shadow:0px 0px 10px #909090;}
2473
+}
2474
+
2475
+@-moz-keyframes clignote
2476
+{
2477
+  0%{box-shadow:0px 0px 10px #909090;}
2478
+  50%{box-shadow:0px 0px 2px #909090;}
2479
+  100%{box-shadow:0px 0px 10px #909090;}
2480
+}
2481
+
2482
+@-ms-keyframes clignote
2483
+{
2484
+  0%{box-shadow:0px 0px 10px #909090;}
2485
+  50%{box-shadow:0px 0px 2px #909090;}
2486
+  100%{box-shadow:0px 0px 10px #909090;}
2487
+}
2488
+
2489
+@-o-keyframes clignote
2490
+{
2491
+  0%{box-shadow:0px 0px 10px #909090;}
2492
+  50%{box-shadow:0px 0px 2px #909090;}
2493
+  100%{box-shadow:0px 0px 10px #909090;}
2494
+}
2495
+
2496
+@keyframes clignote
2497
+{
2498
+  0%{box-shadow:0px 0px 10px #909090;}
2499
+  50%{box-shadow:0px 0px 2px #909090;}
2500
+  100%{box-shadow:0px 0px 10px #909090;}
2501
+}
2502
+
2503
+
2504
+
2505
+@-webkit-keyframes sidesticktop
2506
+{
2507
+  0%{top: auto;}
2508
+  50%{top: 0px;}
2509
+  100%{top: 25px}
2510
+}
2511
+
2512
+@-moz-keyframes sidesticktop
2513
+{
2514
+  0%{top: auto;}
2515
+  50%{top: 0px;}
2516
+  100%{top: 25px}
2517
+}
2518
+
2519
+@-ms-keyframes sidesticktop
2520
+{
2521
+  0%{top: auto;}
2522
+  50%{top: 0px;}
2523
+  100%{top: 25px}
2524
+}
2525
+
2526
+@-o-keyframes sidesticktop
2527
+{
2528
+  0%{top: auto;}
2529
+  50%{top: 0px;}
2530
+  100%{top: 25px}
2531
+}
2532
+
2533
+@keyframes sidesticktop
2534
+{
2535
+  0%{top: auto;}
2536
+  50%{top: 0px;}
2537
+  100%{top: 25px}
2538
+}
2539
+
2540
+@-webkit-keyframes sidestickbottom
2541
+{
2542
+  0%{bottom: auto;}
2543
+  50%{bottom: 0px;}
2544
+  100%{bottom: 25px}
2545
+}
2546
+
2547
+@-moz-keyframes sidestickbottom
2548
+{
2549
+  0%{bottom: auto;}
2550
+  50%{bottom: 0px;}
2551
+  100%{bottom: 25px}
2552
+}
2553
+
2554
+@-ms-keyframes sidestickbottom
2555
+{
2556
+  0%{bottom: auto;}
2557
+  50%{bottom: 0px;}
2558
+  100%{bottom: 25px}
2559
+}
2560
+
2561
+@-o-keyframes sidestickbottom
2562
+{
2563
+  0%{bottom: auto;}
2564
+  50%{bottom: 0px;}
2565
+  100%{bottom: 25px}
2566
+}
2567
+
2568
+@keyframes sidestickbottom
2569
+{
2570
+  0%{bottom: auto;}
2571
+  50%{bottom: 0px;}
2572
+  100%{bottom: 25px}
2573
+}
2574
+
2575
+
2576
+.flashing
2577
+{
2578
+  font-weight: bold;
2579
+  text-shadow: 0 1px 0 white;
2580
+  border-radius: 3px;
2581
+  padding: 5px 10px;
2582
+  box-shadow:0px 0px 10px #909090;
2583
+  
2584
+  -webkit-animation-name: clignote;
2585
+  -webkit-animation-duration: 1s;
2586
+  -webkit-animation-iteration-count:infinite;
2587
+  
2588
+  -moz-animation-name: clignote;
2589
+  -moz-animation-duration: 1s;
2590
+  -moz-animation-iteration-count:infinite;
2591
+  
2592
+  -ms-animation-name: clignote;
2593
+  -ms-animation-duration: 1s;
2594
+  -ms-animation-iteration-count:infinite;
2595
+  
2596
+  -o-animation-name: clignote;
2597
+  -o-animation-duration: 1s;
2598
+  -o-animation-iteration-count:infinite;
2599
+  
2600
+  animation-name: clignote;
2601
+  animation-duration: 1s;
2602
+  animation-iteration-count:infinite;
2243 2603
 }

+ 16 - 0
web/bundles/muzichcore/js/TagPrompt.js Ver fichero

@@ -341,12 +341,28 @@ function TagPromptConnector(input, output, proposition_list, tag_box, prompt_loa
341 341
   var _tag_box_manager = new TagBoxManager(tag_box, this);
342 342
   var _prompt_loader = prompt_loader;
343 343
   
344
+  var updateHelpDisplay = function()
345
+  {
346
+    if (_tag_prompt.getSelectedTags())
347
+    {
348
+      if (_tag_prompt.getSelectedTags().length)
349
+      {
350
+        $('#tags_prompt_search p.help_notags').hide();
351
+      }
352
+      else
353
+      {
354
+        $('#tags_prompt_search p.help_notags').show();
355
+      }
356
+    }
357
+  }
358
+  
344 359
   this.updateOutput = function(tags)
345 360
   {
346 361
     _output.val(array2json(tagsToArrayIds(tags)));
347 362
     _tag_proposition_list.hide();
348 363
     _tag_box_manager.update(tags);
349 364
     cleanInput();
365
+    updateHelpDisplay();
350 366
   }
351 367
   
352 368
   var _tag_prompt = new TagPrompt(this.updateOutput, this);

+ 5 - 2
web/bundles/muzichcore/js/autoplay.js Ver fichero

@@ -64,8 +64,11 @@ function Autoplay()
64 64
     players = window.players_manager.getAll();
65 65
     for (var i in players)
66 66
     {
67
-      players[i].stopAndDestroy();
68
-      window.players_manager.remove(i);
67
+      if (i in players)
68
+      {
69
+        players[i].stopAndDestroy();
70
+        window.players_manager.remove(i);
71
+      }
69 72
     }
70 73
   }
71 74
   

+ 180 - 68
web/bundles/muzichcore/js/muzich.js Ver fichero

@@ -335,10 +335,10 @@ $(document).ready(function(){
335 335
       $(this).parent('li').addClass('selected');
336 336
     }
337 337
     
338
-    if ($('div.top_tools:visible').length)
339
-    {
340
-      $('div.top_tools').slideUp();
341
-    }
338
+//    if ($('div.top_tools:visible').length)
339
+//    {
340
+//      $('div.top_tools').slideUp();
341
+//    }
342 342
     
343 343
     // On initialise la liste de tags déjà ajouté
344 344
     window.search_tag_prompt_connector.initializeTags([]);
@@ -357,10 +357,10 @@ $(document).ready(function(){
357 357
     $(this).parents('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
358 358
     $(this).parent('li').addClass('selected');
359 359
     
360
-    if ($('div.top_tools:visible').length == 0)
361
-    {
362
-      $('div.top_tools').slideDown();
363
-    }
360
+//    if ($('div.top_tools:visible').length == 0)
361
+//    {
362
+//      $('div.top_tools').slideDown();
363
+//    }
364 364
     
365 365
     var form = $('form[name="search"]');
366 366
     
@@ -401,19 +401,20 @@ $(document).ready(function(){
401 401
       {
402 402
         $('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
403 403
         $('li#tab_li_tag_search_with_tags').addClass('selected');
404
+        
405
+        // Ne devrais plus servir puisque on l'affiche toujours maintenant
404 406
         if (!$('div.top_tools:visible').length)
405 407
         {
406 408
           $('div.top_tools').slideDown();
407 409
         }
408 410
       }
409 411
       
410
-      
411 412
       $('img.elements_more_loader').show();
412 413
       $('ul.elements').html('');
413 414
       
414 415
       var form = $('form[name="search"]');
415 416
       id = str_replace('element_tag_', '', $(this).attr('id'));
416
-      var tag = new Tag(id, $(this).text());
417
+      var tag = new Tag(id, $.trim($(this).text()));
417 418
       
418 419
       window.search_tag_prompt_connector.initializeTags([tag]);
419 420
       
@@ -436,12 +437,12 @@ $(document).ready(function(){
436 437
   // 1328283201_emblem-symbolic-link.png
437 438
   $('a.element_embed_open_link, a.element_name_embed_open_link').live("click", function(){
438 439
     
439
-     var li = $(this).parents('li.element');
440
+    var li = $(this).parents('li.element');
440 441
      
441
-     element_last_opened(li);
442
-     li.find('a.element_embed_close_link').show();
443
-     li.find('a.element_embed_open_link_text').hide();
444
-     li.find('div.element_embed').show();
442
+    element_last_opened(li);
443
+    li.find('a.element_embed_close_link').show();
444
+    li.find('a.element_embed_open_link_text').hide();
445
+    li.find('div.element_embed').show();
445 446
      
446 447
     if ((player = window.dynamic_player.play(
447 448
       li.find('div.element_embed'),
@@ -588,6 +589,7 @@ $(document).ready(function(){
588 589
    var last_id = null;
589 590
    $('a.elements_more').click(function(){
590 591
     
592
+    sidebar_fix_to_bottom_prepare();
591 593
     $('img.elements_more_loader').show();
592 594
     // On fait un cas isolé (pour l'instant!!)
593 595
     if (!$(this).hasClass('event_view'))
@@ -616,6 +618,8 @@ $(document).ready(function(){
616 618
       var data = {};
617 619
       var type = 'GET';
618 620
     }
621
+    
622
+    $('.sidebar').css('bottom', $('#footer').outerHeight());
619 623
          
620 624
      $.ajax({
621 625
        type: type,
@@ -638,6 +642,9 @@ $(document).ready(function(){
638 642
             {
639 643
               link.attr('href', response.data.more_link_href);
640 644
             }
645
+            
646
+            sidebar_fix_to_bottom_finish();
647
+          
641 648
           }
642 649
           
643 650
           if (response.end || response.count < 1)
@@ -672,7 +679,9 @@ $(document).ready(function(){
672 679
     window.ResponseController.execute(
673 680
         response,
674 681
         function(){},
675
-        function(){}
682
+        function(){
683
+          $('img.elements_more_loader').hide();
684
+        }
676 685
       );
677 686
     
678 687
     $('ul.elements').html(response.html);
@@ -1277,10 +1286,7 @@ $(document).ready(function(){
1277 1286
       
1278 1287
       if ($('form[name="search"]').length)
1279 1288
       {
1280
-        if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
1281
-        {
1282
-          $('div.top_tools').slideDown();
1283
-        }
1289
+        $('div.top_tools').slideDown();
1284 1290
       }
1285 1291
       remove_tags('add');
1286 1292
       recolorize_element_list();
@@ -2589,17 +2595,44 @@ $(document).ready(function(){
2589 2595
   /* Ouverture des menus deroulants */
2590 2596
   $('ul.secondarymenu a.top_menu_link').click(function(){
2591 2597
     
2598
+    //sidebar_fix_to_bottom_prepare();
2599
+    var sidebar_height = $('.sidebar').height();
2600
+    
2592 2601
     if ($(this).parents('li.top_menu_element').hasClass('close'))
2593 2602
     {
2594 2603
       $(this).parents('li.top_menu_element').find('ul.submenu').hide();
2595 2604
       $(this).parents('li.top_menu_element').removeClass('close');
2596 2605
       $(this).parents('li.top_menu_element').addClass('open');
2597
-      $(this).parents('li.top_menu_element').find('ul.submenu').slideDown();
2606
+      $(this).parents('li.top_menu_element').find('ul.submenu').show();
2607
+        
2608
+        var top = parseInt($('.sidebar').css('top'), 10);
2609
+        var diff = $('.sidebar').height() - sidebar_height;
2610
+        var top_recalculated =  top - diff;
2611
+      //sidebar_fix_to_bottom_finish();
2612
+      if ($('.sidebar').css('position') == 'absolute' || parseInt($('.sidebar').css('top'), 10) < (25+diff))
2613
+      {
2614
+        $(".sidebar").animate({
2615
+          top: top_recalculated
2616
+        }, 500);
2617
+        
2618
+      }
2598 2619
     }
2599 2620
     else
2600 2621
     {
2601 2622
       $(this).parents('li.top_menu_element').removeClass('open');
2602 2623
       $(this).parents('li.top_menu_element').addClass('close');
2624
+      
2625
+        var top = parseInt($('.sidebar').css('top'), 10);
2626
+        var diff = $('.sidebar').height() - sidebar_height;
2627
+      //sidebar_fix_to_bottom_finish();
2628
+      if ($('.sidebar').css('position') == 'absolute' || parseInt($('.sidebar').css('top'), 10) < (25-diff))
2629
+      {
2630
+        var top_recalculated =  top - diff;
2631
+        $(".sidebar").animate({
2632
+          top: top_recalculated
2633
+        }, 500);
2634
+        
2635
+      }
2603 2636
     }
2604 2637
     
2605 2638
     return false;
@@ -2608,6 +2641,7 @@ $(document).ready(function(){
2608 2641
   $('div#secondarymenu ul.submenu').each(function(){
2609 2642
     if ($(this).find('li').length > 7)
2610 2643
     {
2644
+      // TODO:  Hardcode bouh !
2611 2645
       $(this).css('overflow', 'auto');
2612 2646
       $(this).css('height', '283px');
2613 2647
     }
@@ -2719,10 +2753,8 @@ $(document).ready(function(){
2719 2753
      $('#element_add_box').slideDown("slow");
2720 2754
      $('#element_add_link').hide();
2721 2755
      $('#element_add_close_link').show();
2722
-     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
2723
-     {
2724
-       $('div.top_tools').slideUp();
2725
-     }
2756
+     $('div.top_tools').slideUp();
2757
+     
2726 2758
      // Au cas ou firefox garde la valeur step 2:
2727 2759
         $('input#form_add_step').val('1');
2728 2760
     $('form[name="add"]').attr('action', url_datas_api);
@@ -2734,11 +2766,7 @@ $(document).ready(function(){
2734 2766
      $('#element_add_box').slideUp("slow");
2735 2767
      $('#element_add_link').show();
2736 2768
      $('#element_add_close_link').hide();
2737
-     
2738
-     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
2739
-     {
2740
-       $('div.top_tools').slideDown();
2741
-     }
2769
+     $('div.top_tools').slideDown();
2742 2770
      
2743 2771
      //form_add_reinit();
2744 2772
      // copie du contenu de la fonction ci dessus, arrive pas a l'appeler ... huh
@@ -3018,6 +3046,7 @@ $(document).ready(function(){
3018 3046
    
3019 3047
    $('a.tags_prompt_remove_all').click(function(){
3020 3048
      window.search_tag_prompt_connector.initializeTags([]);
3049
+     $('form[name="search"] input[type="submit"]').trigger('click');
3021 3050
    });
3022 3051
    
3023 3052
    $('a.tags_prompt_favorites').click(function(){
@@ -3073,6 +3102,7 @@ $(document).ready(function(){
3073 3102
         });
3074 3103
       }
3075 3104
       
3105
+      $('form[name="search"] input[type="submit"]').trigger('click');
3076 3106
     });
3077 3107
     
3078 3108
     return false;
@@ -3091,32 +3121,44 @@ $(document).ready(function(){
3091 3121
     *PLAYLISTS
3092 3122
     */
3093 3123
    
3124
+  var playlist_line_height = 0;
3094 3125
   $('ul.playlist_elements li a.open_element').live('click', function(){
3095 3126
     
3096
-    // Pour le moment
3097
-    return false;
3098
-    
3099 3127
     var line = $(this).parents('li.playlist_element');
3100 3128
     
3101
-    $.getJSON($(this).attr('href'), function(response) {
3102
-      
3103
-      window.ResponseController.execute(
3104
-        response,
3105
-        function(){},
3106
-        function(){}
3107
-      );
3108
-      
3109
-      if (response.status == 'success')
3110
-      {
3111
-        line.append('<ul class="elements"><li class="element">' + response.data + '</li></ul>');
3112
-      }
3129
+    if (!line.hasClass('open'))
3130
+    {
3131
+      playlist_line_height = line.height();
3132
+      line.css('height', 'auto');
3133
+      line.find('div.content_opened').html('<img class="loader" src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." />');
3134
+      line.addClass('open');
3135
+
3136
+      $.getJSON($(this).attr('href'), function(response) {
3137
+
3138
+        window.ResponseController.execute(
3139
+          response,
3140
+          function(){},
3141
+          function(){}
3142
+        );
3143
+
3144
+        if (response.status === 'success')
3145
+        {
3146
+          line.find('div.content_opened').html('<ul class="elements">' + response.data + '</ul>');
3147
+        }
3148
+      });
3149
+    }
3150
+    else
3151
+    {
3152
+      line.find('div.content_opened').html('');
3153
+      line.removeClass('open');
3154
+      line.css('height', playlist_line_height);
3155
+    }
3113 3156
       
3114
-    });
3115 3157
     
3116 3158
     return false;
3117 3159
   });
3118 3160
   
3119
-  $('ul.playlist_elements').sortable({
3161
+  $('ul.playlist_elements.owned').sortable({
3120 3162
     update: function( event, ui ) {
3121 3163
       
3122 3164
       var form = ui.item.parents('form')
@@ -3141,14 +3183,18 @@ $(document).ready(function(){
3141 3183
     }
3142 3184
   });
3143 3185
   
3144
-  $('ul.elements a.add_to_playlist').live('click', function(event){
3186
+  $('div.playlists_prompt form').live('submit', function(){
3187
+    $(this).parents('div.playlists_prompt').find('img.loader').show();
3188
+  });
3189
+  
3190
+  $('a.add_to_playlist').live('click', function(event){
3145 3191
     
3146 3192
     $('div.playlists_prompt').remove();
3147
-    var prompt = $('<div class="playlists_prompt"><img class="loader" src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>');
3193
+    var prompt = $('<div class="playlists_prompt nicebox"><img class="loader" src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>');
3148 3194
     $('body').append(prompt);
3149 3195
     
3150 3196
     prompt.position({
3151
-      my: "left+3 bottom+0",
3197
+      my: "left+15 bottom+0",
3152 3198
       of: event,
3153 3199
       collision: "fit"
3154 3200
     });
@@ -3165,6 +3211,8 @@ $(document).ready(function(){
3165 3211
       {
3166 3212
         prompt.append(response.data);
3167 3213
         prompt.find('div.create_playlist form').ajaxForm(function(response){
3214
+          
3215
+          $('div.playlists_prompt').find('img.loader').hide();
3168 3216
           window.ResponseController.execute(
3169 3217
             response,
3170 3218
             function(){},
@@ -3214,24 +3262,65 @@ $(document).ready(function(){
3214 3262
     return false;
3215 3263
   });
3216 3264
   
3265
+  $('ul.playlist_elements a.remove_element').jConfirmAction({
3266
+    question : string_element_removefromplaylist_confirm_sentence, 
3267
+    yesAnswer : string_element_delete_confirm_yes, 
3268
+    cancelAnswer : string_element_delete_confirm_no,
3269
+    onYes: function(link){
3270
+      
3271
+      $.getJSON(link.attr('href'), function(response) {
3272
+        window.ResponseController.execute(
3273
+          response,
3274
+          function(){},
3275
+          function(){}
3276
+        );
3277
+      });
3278
+
3279
+      link.parents('li.playlist_element').remove();
3280
+      return false;
3281
+    },
3282
+    onOpen: function(link){},
3283
+    onClose: function(link){}
3284
+  });
3217 3285
   
3218
-  $('ul.playlist_elements a.remove_element').live('click', function () {
3219
-    
3220
-    $.getJSON($(this).attr('href'), function(response) {
3221
-      window.ResponseController.execute(
3222
-        response,
3223
-        function(){},
3224
-        function(){}
3225
-      );
3226
-    });
3227
-    
3228
-    $(this).parents('li.playlist_element').remove();
3229
-    return false;
3286
+  $('ul.playlists a.playlist_delete').jConfirmAction({
3287
+    question : string_element_deleteplaylist_confirm_sentence, 
3288
+    yesAnswer : string_element_delete_confirm_yes, 
3289
+    cancelAnswer : string_element_delete_confirm_no,
3290
+    onYes: function(link){
3291
+      $(location).attr('href', link.attr('href'));
3292
+    },
3293
+    onOpen: function(link){},
3294
+    onClose: function(link){}
3230 3295
   });
3231
-   
3296
+  
3297
+  $('div.playlists_prompt a.close_playlists_prompt').live('click', function(){
3298
+     $('div.playlists_prompt').remove();
3299
+     return false;
3300
+  });
3301
+  
3302
+  /*
3303
+   * STICK SIDEBAR
3304
+   */
3305
+  
3306
+  window.sidebar_topsticked = false;
3307
+  window.sidebar_sticked = false;
3308
+  if ($('#sidebar .sidebar').height() < $('#content .content').height() &&
3309
+    $('#sidebar .sidebar').height() > $(window).height())
3310
+  {
3311
+    $('#content').stickySidebar();
3312
+    window.sidebar_sticked = true;
3313
+  }
3314
+  else
3315
+  {
3316
+    $('#sidebar .sidebar').css('padding-bottom', '155px');
3317
+    $("#sidebar .sidebar").sticky({topSpacing:25});
3318
+    window.sidebar_topsticked = true;
3319
+  }
3320
+  
3232 3321
 });
3233 3322
 
3234
-function open_ajax_popin(url, callback)
3323
+function open_ajax_popin(url, callback, data)
3235 3324
 {
3236 3325
   if (!popin_opened)
3237 3326
   {
@@ -3240,7 +3329,7 @@ function open_ajax_popin(url, callback)
3240 3329
       '<div id="helpbox" class="popin_block"><img src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>'
3241 3330
     );
3242 3331
     open_popin_dialog('helpbox');
3243
-    JQueryJson(url, {}, function(response){
3332
+    JQueryJson(url, data, function(response){
3244 3333
       if (response.status == 'success')
3245 3334
       {
3246 3335
         $('div#helpbox').html(
@@ -3260,7 +3349,7 @@ function open_ajax_popin(url, callback)
3260 3349
   }
3261 3350
 }
3262 3351
 
3263
-function open_connection_or_subscription_window(open_login_part)
3352
+function open_connection_or_subscription_window(open_login_part, data)
3264 3353
 {
3265 3354
   if (window_login_or_subscription_opened == false)
3266 3355
   {
@@ -3270,6 +3359,7 @@ function open_connection_or_subscription_window(open_login_part)
3270 3359
       {
3271 3360
         $('div#helpbox div#login_box').show();
3272 3361
         $('a#registration_link').show();
3362
+        $('input#username').focus();
3273 3363
       }
3274 3364
       else
3275 3365
       {
@@ -3288,7 +3378,7 @@ function open_connection_or_subscription_window(open_login_part)
3288 3378
         $('div.login form').find('img.loader').hide();
3289 3379
         if (response.status == 'success')
3290 3380
         {
3291
-          $(location).attr('href', url_home);
3381
+          $(location).attr('href', response.data.redirect_url);
3292 3382
         }
3293 3383
         else if (response.status == 'error')
3294 3384
         {
@@ -3316,7 +3406,7 @@ function open_connection_or_subscription_window(open_login_part)
3316 3406
       $('div#facebook_login').prependTo('div#helpbox');
3317 3407
       $('div#facebook_login').show();
3318 3408
       
3319
-    });
3409
+    }, data);
3320 3410
   }
3321 3411
 }
3322 3412
 
@@ -3330,3 +3420,25 @@ function close_popin()
3330 3420
   $('#helpbox').remove();
3331 3421
   popin_opened = false;
3332 3422
 }
3423
+
3424
+function sidebar_fix_to_bottom_prepare()
3425
+{
3426
+  if (window.sidebar_sticked)
3427
+  {
3428
+    $('.sidebar').css('top', '');
3429
+    $('.sidebar').css('position', '');
3430
+    $('.sidebar').addClass('bottom-fixed');
3431
+  }
3432
+}
3433
+
3434
+function sidebar_fix_to_bottom_finish()
3435
+{
3436
+  if (window.sidebar_sticked)
3437
+  {
3438
+    $(".sidebar").animate({
3439
+      bottom: '0'
3440
+    }, 500 , "swing", function(){
3441
+      $('.sidebar').css('bottom', '')
3442
+    });
3443
+  }
3444
+}

+ 73 - 0
web/bundles/sensiodistribution/webconfigurator/css/configurator.css Ver fichero

@@ -0,0 +1,73 @@
1
+@import url("install.css");
2
+
3
+.step h1 {
4
+    margin-top: 10px;
5
+    margin-bottom: 30px;
6
+    font-size: 26px;
7
+}
8
+.step p {
9
+    line-height: 20px;
10
+    padding-bottom: 20px;
11
+}
12
+.step .symfony-block-steps span {
13
+    display: inline-block;
14
+    padding: 2px 3px;
15
+    font-size: 11px;
16
+    line-height: 15px;
17
+    color: #868686;
18
+    font-weight: bold;
19
+    text-transform: uppercase;
20
+}
21
+.step .symfony-block-steps span.selected {
22
+    background-color: #aacd4e;
23
+    color: #FFFFFF;
24
+}
25
+.step .symfony-form-row {
26
+    padding-bottom: 40px;
27
+}
28
+.step .symfony-form-column {
29
+    width: 430px;
30
+    float: left;
31
+}
32
+.step .symfony-form-footer {
33
+    padding-top: 20px;
34
+    clear: both;
35
+}
36
+.step .symfony-form-field {
37
+    height: 20px;
38
+}
39
+.step .symfony-form-row label {
40
+    display: block;
41
+    padding-bottom: 8px;
42
+}
43
+.step .symfony-form-field input[type=text],
44
+.step .symfony-form-field input[type=password],
45
+.step .symfony-form-field textarea,
46
+.step .symfony-form-field select {
47
+    font-size: 13px;
48
+    color: #565656;
49
+    width: 200px;
50
+}
51
+.step .symfony-form-field input[type=text],
52
+.step .symfony-form-field input[type=password],
53
+.step .symfony-form-field textarea {
54
+    border: 1px solid #dadada;
55
+    background: #FFFFFF url(../../../framework/images/input_bg.gif) repeat-x left top;
56
+    width: 194px;
57
+    padding: 5px 6px;
58
+}
59
+.step .symfony-form-errors ul {
60
+    padding: 0;
61
+}
62
+.step .symfony-form-errors li {
63
+    background: url(../images/notification.gif) no-repeat left 6px;
64
+    font-size: 11px;
65
+    line-height: 16px;
66
+    color: #759e1a;
67
+    padding: 10px 25px;
68
+}
69
+.step .symfony-configuration {
70
+    margin: 10px 0;
71
+    width: 100%;
72
+    height: 240px;
73
+}

+ 0 - 153
web/bundles/sensiodistribution/webconfigurator/css/configure.css Ver fichero

@@ -1,153 +0,0 @@
1
-@import url("install.css");
2
-
3
-h1 {
4
-    margin-top: 10px;
5
-    font-size: 26px;
6
-}
7
-
8
-#symfony-wrapper {
9
-    padding-top: 0;
10
-}
11
-
12
-#symfony-search {
13
-    position: absolute;
14
-    top: 50px;
15
-    right: 30px;
16
-}
17
-
18
-#symfony-search-field {
19
-    width: 190px;
20
-}
21
-
22
-#symfony-search label {
23
-    display: block;
24
-    float: left;
25
-    width: 20px;
26
-    height: 25px;
27
-    background: url(../images/search.png) no-repeat left 5px;
28
-}
29
-
30
-#symfony-search label span {
31
-    display: none;
32
-}
33
-
34
-input[type=text] {
35
-    border: 1px solid #DADADA;
36
-    background: white url(../images/field-background.gif) repeat-x left top;
37
-    padding: 5px 6px;
38
-    color: #565656;
39
-    font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
40
-    font-size: 12px;
41
-}
42
-
43
-
44
-.symfony-button-grey, .symfony-button-green {
45
-    font-size: 0.85em;
46
-    font-weight: bold;
47
-    cursor: pointer;
48
-    display: inline-block;
49
-    outline: none;
50
-    text-align: center;
51
-    text-transform: uppercase;
52
-    padding: 3px 10px;
53
-    text-shadow: 0 1px 1px rgba(0,0,0,.3);
54
-    -webkit-border-radius: 4px;
55
-    -moz-border-radius: 4px;
56
-    border-radius: 4px;
57
-}
58
-
59
-.symfony-button-grey {
60
-    color: #868686;
61
-    font-weight: normal;
62
-    padding: 5px 10px;
63
-    border: solid 1px #d7d7d7;
64
-    background: #ffffff;
65
-    background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#d7d7d7));
66
-    background: -moz-linear-gradient(top,  #ffffff,  #d7d7d7);
67
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#d7d7d7');
68
-}
69
-
70
-.symfony-button-green {
71
-    padding: 5px 12px;
72
-    color: white;
73
-    border: solid 1px #a7da39;
74
-    background: #a7da39;
75
-    background: -webkit-gradient(linear, left top, left bottom, from(#a7da39), to(#6a9211));
76
-    background: -moz-linear-gradient(top,  #a7da39,  #6a9211);
77
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a7da39', endColorstr='#6a9211');
78
-}
79
-
80
-.symfony-block-steps span {
81
-    display: inline-block;
82
-    padding: 2px 3px;
83
-    font-size: 11px;
84
-    line-height: 15px;
85
-    color: #868686;
86
-    font-weight: bold;
87
-    text-transform: uppercase;
88
-}
89
-
90
-.symfony-block-steps span.selected {
91
-    background-color: #aacd4e;
92
-    color: #FFFFFF;
93
-}
94
-
95
-
96
-.symfony-form-row {
97
-    padding-bottom: 40px;
98
-}
99
-
100
-.symfony-form-column {
101
-    width: 430px;
102
-    float: left;
103
-}
104
-
105
-.symfony-form-footer {
106
-    padding-top: 20px;
107
-    clear: both;
108
-}
109
-
110
-.symfony-form-field {
111
-    height: 20px;
112
-}
113
-
114
-.symfony-form-row label {
115
-    display: block;
116
-    padding-bottom: 8px;
117
-}
118
-
119
-.symfony-form-field input[type=text],
120
-.symfony-form-field input[type=password],
121
-.symfony-form-field textarea,
122
-.symfony-form-field select {
123
-    font-size: 13px;
124
-    color: #565656;
125
-    width: 200px;
126
-}
127
-
128
-.symfony-form-field input[type=text],
129
-.symfony-form-field input[type=password],
130
-.symfony-form-field textarea {
131
-    border: 1px solid #dadada;
132
-    background: #FFFFFF url(../images/background-textfield.gif) repeat-x left top;
133
-    width: 194px;
134
-    padding: 5px 6px;
135
-}
136
-
137
-.symfony-form-errors ul {
138
-    padding: 0;
139
-}
140
-
141
-.symfony-form-errors li {
142
-    background: url(../images/notification.gif) no-repeat left 6px;
143
-    font-size: 11px;
144
-    line-height: 16px;
145
-    color: #759e1a;
146
-    padding: 10px 25px;
147
-}
148
-
149
-.symfony-configuration {
150
-    margin: 10px 0;
151
-    width: 100%;
152
-    height: 240px;
153
-}

+ 31 - 105
web/bundles/sensiodistribution/webconfigurator/css/install.css Ver fichero

@@ -1,52 +1,12 @@
1
-/*
2
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
3
-Code licensed under the BSD License:
4
-http://developer.yahoo.com/yui/license.html
5
-version: 2.8.2r1
6
-
7
-Reset
8
-*/
9
-
10
-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%;}
11
-
12
-html, body {
13
-    background-color: #EFEFEF;
14
-}
15
-
16 1
 body {
17 2
     font-size: 14px;
18 3
     font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
19
-    color: #313131;
20 4
 }
21
-
22
-a {
23
-    color: #08C;
24
-    text-decoration: none;
25
-}
26
-
27
-a:hover {
28
-    text-decoration: underline;
29
-}
30
-
31
-strong {
32
-    font-weight: bold;
33
-}
34
-
35
-em {
36
-    font-style: italic;
37
-}
38
-
39
-h1, h2, h3 {
40
-    font-family: Georgia, "Times New Roman", Times, serif;
41
-    color: #404040;
42
-}
43
-
44
-h1 {
5
+.sf-reset h1.title {
45 6
     font-size: 45px;
46 7
     padding-bottom: 30px;
47 8
 }
48
-
49
-h2 {
9
+.sf-reset h2 {
50 10
     font-weight: bold;
51 11
     color: #FFFFFF;
52 12
     /* Font is reset to sans-serif (like body) */
@@ -57,92 +17,58 @@ h2 {
57 17
     display: inline-block;
58 18
     text-transform: uppercase;
59 19
 }
60
-
61
-p {
62
-    line-height: 20px;
63
-    padding-bottom: 20px;
64
-}
65
-
66
-ul a {
20
+.sf-reset ul a,
21
+.sf-reset ul a:hover {
67 22
     background: url(../images/blue-arrow.png) no-repeat right 6px;
68 23
     padding-right: 10px;
69 24
 }
70
-
71
-ul, ol {
25
+.sf-reset ul, ol {
72 26
     padding-left: 20px;
73 27
 }
74
-
75
-li {
28
+.sf-reset li {
76 29
     padding-bottom: 18px;
77 30
 }
78
-
79
-ol li {
31
+.sf-reset ol li {
80 32
     list-style-type: decimal;
81 33
 }
82
-
83
-ul li {
34
+.sf-reset ul li {
84 35
     list-style-type: none;
85 36
 }
86
-
87
-#symfony-header {
88
-    position: relative;
89
-    padding: 30px 30px 20px 30px;
90
-}
91
-
92
-#symfony-wrapper {
93
-    width: 970px;
94
-    margin: 0 auto;
95
-    padding-top: 50px;
96
-}
97
-
98
-#symfony-content {
99
-    background-color: white;
100
-    border: 1px solid #DFDFDF;
101
-    padding: 50px;
102
-    -moz-border-radius: 16px;
103
-    -webkit-border-radius: 16px;
104
-    border-radius: 16px;
105
-    margin-bottom: 5px;
106
-}
107
-
108
-
109
-.symfony-blocks-install {
37
+.sf-reset .symfony-blocks-install {
110 38
     overflow: hidden;
111 39
 }
112
-
113
-.symfony-blocks-install .symfony-block-logo {
114
-    float: left;
115
-    width: 358px;
116
-}
117
-
118
-.symfony-blocks-install .symfony-block-content {
119
-    float: left;
120
-    width: 510px;
121
-}
122
-
123
-.symfony-install-continue {
40
+.sf-reset .symfony-install-continue {
124 41
     font-size: 0.95em;
125 42
     padding-left: 0;
126 43
 }
127
-
128
-.symfony-install-continue li {
44
+.sf-reset .symfony-install-continue li {
129 45
     padding-bottom: 10px;
130 46
 }
131
-
132
-.version {
133
-    text-align: right;
134
-    font-size: 10px;
135
-    margin-right: 20px;
136
-}
137
-
138
-.ok {
47
+.sf-reset .ok {
139 48
     color: #fff;
140 49
     font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
141 50
     background-color: #6d6;
142 51
     padding: 10px;
143 52
     margin-bottom: 20px;
144 53
 }
145
-
146
-.ko {
54
+.sf-reset .ko {
147 55
     background-color: #d66;
148 56
 }
57
+.version {
58
+    text-align: right;
59
+    font-size: 10px;
60
+    margin-right: 20px;
61
+}
62
+.sf-reset a,
63
+.sf-reset li a {
64
+    color: #08C;
65
+    text-decoration: none;
66
+}
67
+.sf-reset a:hover,
68
+.sf-reset li a:hover {
69
+    color: #08C;
70
+    text-decoration: underline;
71
+}
72
+.sf-reset textarea {
73
+    padding: 7px;
74
+}

BIN
web/bundles/sensiodistribution/webconfigurator/images/background-textfield.gif Ver fichero


BIN
web/bundles/sensiodistribution/webconfigurator/images/logo-big.gif Ver fichero


BIN
web/bundles/sensiodistribution/webconfigurator/images/logo-small.gif Ver fichero


+ 35 - 9
web/config.php Ver fichero

@@ -21,22 +21,48 @@ $minorProblems = $symfonyRequirements->getFailedRecommendations();
21 21
 
22 22
 ?>
23 23
 <!DOCTYPE html>
24
-<html lang="en">
24
+<html>
25 25
     <head>
26
-        <meta charset="UTF-8" />
27
-        <link rel="stylesheet" href="bundles/sensiodistribution/webconfigurator/css/install.css" media="all" />
26
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
27
+        <meta name="robots" content="noindex,nofollow" />
28 28
         <title>Symfony Configuration</title>
29
+        <link rel="stylesheet" href="bundles/framework/css/structure.css" media="all" />
30
+        <link rel="stylesheet" href="bundles/framework/css/body.css" media="all" />
31
+        <link rel="stylesheet" href="bundles/sensiodistribution/webconfigurator/css/install.css" media="all" />
29 32
     </head>
30 33
     <body>
31
-        <div id="symfony-wrapper">
32
-            <div id="symfony-content">
33
-                <div class="symfony-blocks-install">
34
-                    <div class="symfony-block-logo">
35
-                        <img src="bundles/sensiodistribution/webconfigurator/images/logo-big.gif" alt="Symfony logo" />
34
+        <div id="content">
35
+            <div class="header clear-fix">
36
+                <div class="header-logo">
37
+                    <img src="bundles/framework/images/logo_symfony.png" alt="Symfony" />
38
+                </div>
39
+
40
+                <div class="search">
41
+                  <form method="get" action="http://symfony.com/search">
42
+                    <div class="form-row">
43
+
44
+                      <label for="search-id">
45
+                          <img src="bundles/framework/images/grey_magnifier.png" alt="Search on Symfony website" />
46
+                      </label>
47
+
48
+                      <input name="q" id="search-id" type="search" placeholder="Search on Symfony website" />
49
+
50
+                      <button type="submit" class="sf-button">
51
+                          <span class="border-l">
52
+                            <span class="border-r">
53
+                                <span class="btn-bg">OK</span>
54
+                            </span>
55
+                        </span>
56
+                      </button>
36 57
                     </div>
58
+                   </form>
59
+                </div>
60
+            </div>
37 61
 
62
+            <div class="sf-reset">
63
+                <div class="block">
38 64
                     <div class="symfony-block-content">
39
-                        <h1>Welcome!</h1>
65
+                        <h1 class="title">Welcome!</h1>
40 66
                         <p>Welcome to your new Symfony project.</p>
41 67
                         <p>
42 68
                             This script will guide you through the basic configuration of your project.

+ 0 - 0
web/img/1372949806_web-hosting-px-png.png Ver fichero


+ 0 - 0
web/img/1372956700_gnome-dev-symlink.png Ver fichero


+ 0 - 0
web/img/icon_friends_little.png Ver fichero