Home Explore Help
Sign In
bux
/
muzich
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

modif ancienne et non commit

Bastien Sevajol 9 years ago
parent
54c608af1c
commit
bcbf8d16d8
7 changed files with 28 additions and 14 deletions
Split View Show Diff Stats
  1. 1 0
      src/Muzich/CoreBundle/Command/MineTagsDataCommand.php
  2. 1 1
      src/Muzich/CoreBundle/Resources/views/layout_iframe.html.twig
  3. 2 2
      web/app_dev.php
  4. 0 4
      web/bundles/muzichcore/css/main.css
  5. 4 3
      web/bundles/muzichcore/js/muzich.js
  6. 12 3
      web/bundles/muzichcore/js/player/SoundCloudPlayer.js
  7. 8 1
      web/bundles/muzichcore/js/player/YoutubePlayer.js

+ 1 - 0
src/Muzich/CoreBundle/Command/MineTagsDataCommand.php View File 

@@ -101,6 +101,7 @@ class MineTagsDataCommand extends ContainerAwareCommand
101 101
102 102 
   protected function mineDiffusions()
103 103 
   {
104 
+    $this->output->writeln('<info>Retriving users ...</info>');
104 105 
     $users = $this->getUsersToProceed(User::DATA_DIFF_UPDATED);
105 106 
     $this->output->writeln('<info>Diffusions: '.count($users).' utilisateurs</info>');
106 107 
     $this->progress->start($this->output, count($users));

+ 1 - 1
src/Muzich/CoreBundle/Resources/views/layout_iframe.html.twig View File 

@@ -3,7 +3,7 @@
3 3 
   <head>
4 4 
     <title>Muzi.ch - {% block title %}{% endblock %}</title>
5 5 
     {% include 'MuzichCoreBundle:Layout:head.html.twig' with {
6 
-      'userecho' : false
6 
+      'userecho' : true
7 7 
     } %}
8 8 
     {% block css %}{% endblock %}
9 9 
     {% block js %}{% endblock %}

+ 2 - 2
web/app_dev.php View File 

@@ -1,5 +1,5 @@
1 1 
 <?php
2 
-
2 
+die();
3 3 
 use Symfony\Component\HttpFoundation\Request;
4 4
5 5 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
 
@@ -14,7 +14,7 @@ if (isset($_SERVER['HTTP_CLIENT_IP'])
14 14 
         '127.0.0.1',
15 15 
         '::1',
16 16 
     ))
17 
-) {
17 
+&& false) {
18 18 
     header('HTTP/1.0 403 Forbidden');
19 19 
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
20 20 
 }

+ 0 - 4
web/bundles/muzichcore/css/main.css View File 

@@ -2542,10 +2542,6 @@ div.social_buttons ul li
2542 2542 
   float:left;
2543 2543 
 }
2544 2544
2545 
-div.social_buttons ul li.googleplus {
2546 
-    margin-left: -25px;
2547 
-}
2548 
-
2549 2545 
 a.button.toplist:visited
2550 2546 
 {
2551 2547 
   color: white;

+ 4 - 3
web/bundles/muzichcore/js/muzich.js View File 

@@ -3414,9 +3414,10 @@ var facebook_like_rendereds_autoplay = new Array();
3414 3414
3415 3415 
 function refresh_social_buttons(autoplay)
3416 3416 
 {
3417 
-  proceed_facebook_like_buttons(autoplay);
3418 
-  gapi.plusone.go();
3419 
-  twttr.widgets.load();
3417 
+  // On n'utilise plus ca
3418 
+//  proceed_facebook_like_buttons(autoplay);
3419 
+//  gapi.plusone.go();
3420 
+//  twttr.widgets.load();
3420 3421 
 }
3421 3422
3422 3423 
 function proceed_facebook_like_buttons(autoplay)

+ 12 - 3
web/bundles/muzichcore/js/player/SoundCloudPlayer.js View File 

@@ -3,7 +3,16 @@ function SoundCloudPlayer(ref_id, object_for_player, finish_callback, autoplay)
3 3 
   autoplay = typeof autoplay !== 'undefined' ? autoplay : false;
4 4 
   var _autoplay = autoplay;
5 5 
   var _iframe_id = '';
6 
-  var _ref_id = ref_id;
6 
+
7 
+  if (typeof(ref_id) == 'string')
8 
+  {
9 
+    var _ref_id = ref_id.replace('http://', 'https://');
10 
+  }
11 
+  else
12 
+  {
13 
+    var _ref_id = ref_id
14 
+  }
15 
+
7 16 
   var _object_for_player = object_for_player;
8 17 
   var _player = null;
9 18 
   var _sounds_count = 0;
 
@@ -24,13 +33,13 @@ function SoundCloudPlayer(ref_id, object_for_player, finish_callback, autoplay)
24 33 
     _iframe_id = 'soundcloud_player_'+new Date().getTime();
25 34 
     if (!_autoplay)
26 35 
     {
27 
-      _object_for_player.html('<iframe id="'+_iframe_id+'" src="http://w.soundcloud.com/player/?url='
36 
+      _object_for_player.html('<iframe id="'+_iframe_id+'" src="https://w.soundcloud.com/player/?url='
28 37 
             +_ref_id+'&show_artwork=false&auto_play=true" width="100%" '
29 38 
             +'height="350" scrolling="no" frameborder="no"></iframe>');
30 39 
     }
31 40 
     else
32 41 
     {
33 
-      $('#autoplay_player_soundcloud').append('<iframe id="'+_iframe_id+'" src="http://w.soundcloud.com/player/?url='
42 
+      $('#autoplay_player_soundcloud').append('<iframe id="'+_iframe_id+'" src="https://w.soundcloud.com/player/?url='
34 43 
         +_ref_id+'&show_artwork=false&auto_play=true" width="100%" '
35 44 
         +'height="350" scrolling="no" frameborder="no"></iframe>');
36 45 
     }

+ 8 - 1
web/bundles/muzichcore/js/player/YoutubePlayer.js View File 

@@ -78,7 +78,14 @@ function YoutubePlayer(ref_id, object_for_player, finish_callback)
78 78 
     {
79 79 
       if(typeof(_yt_player.stopVideo)!=='undefined')
80 80 
       {
81 
-        _yt_player.stopVideo();
81 
+        try
82 
+        {
83 
+          _yt_player.stopVideo();
84 
+        }
85 
+        catch (e)
86 
+        {
87 
+
88 
+        }
82 89 
       }
83 90 
     }
84 91 
   }