Sevajol Bastien 11 lat temu
rodzic
commit
e9559d89ee

+ 6 - 6
composer.lock Wyświetl plik

@@ -98,7 +98,7 @@
98 98
             ],
99 99
             "authors": [
100 100
                 {
101
-                    "name": "Cedric LOMBARDOT",
101
+                    "name": "Cédric Lombardot",
102 102
                     "email": "cedric.lombardot@gmail.com"
103 103
                 },
104 104
                 {
@@ -647,19 +647,19 @@
647 647
             "source": {
648 648
                 "type": "git",
649 649
                 "url": "https://github.com/Gregwar/ImageBundle.git",
650
-                "reference": "9c76744f1715da673cf194a5c6baed1597b55f53"
650
+                "reference": "255d20676a53c921a7a1832d360b6eca705f5b44"
651 651
             },
652 652
             "dist": {
653 653
                 "type": "zip",
654
-                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/9c76744f1715da673cf194a5c6baed1597b55f53",
655
-                "reference": "9c76744f1715da673cf194a5c6baed1597b55f53",
654
+                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/255d20676a53c921a7a1832d360b6eca705f5b44",
655
+                "reference": "255d20676a53c921a7a1832d360b6eca705f5b44",
656 656
                 "shasum": ""
657 657
             },
658 658
             "require": {
659 659
                 "ext-gd": "*",
660 660
                 "php": ">=5.3.0"
661 661
             },
662
-            "time": "2013-04-24 17:00:58",
662
+            "time": "2013-04-25 11:48:38",
663 663
             "type": "symfony-bundle",
664 664
             "autoload": {
665 665
                 "psr-0": {
@@ -1540,7 +1540,7 @@
1540 1540
                 },
1541 1541
                 {
1542 1542
                     "name": "Sonata Community",
1543
-                    "homepage": "https://github.com/sonata-project/SonataAdminBundle/contributors"
1543
+                    "homepage": "https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/contributors"
1544 1544
                 }
1545 1545
             ],
1546 1546
             "description": "Symfony SonataAdminBundle",

+ 4 - 1
web/bundles/admingeneratorgenerator/javascripts/double_list.js Wyświetl plik

@@ -2,9 +2,12 @@ var sfDoubleList =
2 2
 {
3 3
   init: function(id, className)
4 4
   {
5
+    if(id == null)
6
+    return;
7
+    
5 8
     form = sfDoubleList.get_current_form(id);
6 9
 
7
-    callback = function() { sfDoubleList.submit(form, className) };
10
+      callback = function() { sfDoubleList.submit(form, className) };
8 11
 
9 12
     if (form.addEventListener)
10 13
     {

+ 17 - 0
web/bundles/muzichcore/css/main.css Wyświetl plik

@@ -1178,6 +1178,23 @@ div#footer_logo img
1178 1178
   padding-right: 10px;
1179 1179
 }
1180 1180
 
1181
+div#footer_logo_2
1182
+{
1183
+  line-height: 18px;
1184
+  margin-top: 25px;
1185
+  padding-left: 0;
1186
+  padding-right: 40px;
1187
+  text-align: left;
1188
+  width: 135px;
1189
+  float: left;
1190
+}
1191
+
1192
+div#footer_logo_2 img
1193
+{
1194
+  float: none;
1195
+  padding-right: 0px;
1196
+}
1197
+
1181 1198
 span.fotter_muzich_big
1182 1199
 {
1183 1200
   font-size: 22px;

+ 0 - 0
web/img/floor26.png Wyświetl plik