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

Evolution #467: Autoplay: bouille, message

Sevajol Bastien 12 years ago
parent
5a36d40139
commit
a4c91b9740
6 changed files with 40 additions and 15 deletions
Split View Show Diff Stats
  1. 3 0
      app/Resources/translations/userui.fr.yml
  2. 9 5
      src/Muzich/CoreBundle/Resources/views/layout.html.twig
  3. 27 9
      web/bundles/muzichcore/css/main.css
  4. BIN
      web/bundles/muzichcore/img/autoplay_next.png
  5. BIN
      web/bundles/muzichcore/img/autoplay_previous.png
  6. 1 1
      web/bundles/muzichcore/js/muzich.js

+ 3 - 0
app/Resources/translations/userui.fr.yml View File 

@@ -165,3 +165,6 @@ need_tags:
165 165 
                          Les utilisateurs ayant partagés leurs découvertes ont
166 166 
                          demandé de l'aide pour tagger correctement leurs partages.
167 167 
                          Gagnez en réputation en leurs proposants les tags qui conviennent !
168 
+
169 
+autoplay:
170 
+  limitations_players:   La lecture automatique ne supporte actuellement que les lecteurs youtube et soundcloud.

+ 9 - 5
src/Muzich/CoreBundle/Resources/views/layout.html.twig View File 

@@ -86,15 +86,12 @@
86 86 
 <body>
87 87
88 88 
   <div id="autoplay" class="popin_block" style="display: none;">
89 
-    <a href="javascript:void(0);" id="autoplay_close" >
90 
-      <img src="{{ asset('/bundles/muzichcore/img/1353498913_window-close.png') }}" alt="close" />
91 
-    </a>
92 89
93 90 
       <a href="javascript:void(0);" id="autoplay_previous">
94 
-        <img src="{{ asset('/bundles/muzichcore/img/1353505865_button_previous.png') }}" alt="previous" />
91 
+        <img src="{{ asset('/bundles/muzichcore/img/autoplay_previous.png') }}" alt="previous" />
95 92 
       </a>
96 93 
       <a href="javascript:void(0);" id="autoplay_next">
97 
-        <img src="{{ asset('/bundles/muzichcore/img/1353505874_button_next.png') }}" alt="next" />
94 
+        <img src="{{ asset('/bundles/muzichcore/img/autoplay_next.png') }}" alt="next" />
98 95 
       </a>
99 96
100 97 
     <img id="autoplay_element_loader" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loader" />
 
@@ -105,6 +102,13 @@
105 102 
     <div id="autoplay_player_soundcloud"></div>
106 103 
     <img id="autoplay_loader" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loader" />
107 104 
     <p id="autoplay_noelements_text" style="display: none;">{{ 'elements.autoplay.noelements.text'|trans({}, 'elements') }}</p>
105 
+
106 
+    <a href="javascript:void(0);" id="autoplay_close" >
107 
+      <img src="{{ asset('/bundles/muzichcore/img/1317386146_cancel.png') }}" alt="close" />
108 
+    </a>
109 
+
110 
+    <p><span class="sinfo">{{ 'autoplay.limitations_players'|trans({}, 'userui') }}</span></p>
111 
+
108 112 
   </div>
109 113
110 114 
   {% include "MuzichCoreBundle:Language:languages.html.twig" %}

+ 27 - 9
web/bundles/muzichcore/css/main.css View File 

@@ -1329,29 +1329,47 @@ a#autoplay_previous
1329 1329 
 {
1330 1330 
   float: left;
1331 1331 
   text-decoration: none;
1332 
-  margin-left: -50px;
1332 
+  margin-left: -120px;
1333 
+  margin-top: 25px;
1333 1334 
 }
1334 1335
1335 1336 
 a#autoplay_next
1336 1337 
 {
1337 1338 
   float: right;
1338 1339 
   text-decoration: none;
1339 
-  margin-right: -50px;
1340 
+  margin-right: -120px;
1341 
+  margin-top: 25px;
1340 1342 
 }
1341 1343
1342 
-div#autoplay_title
1344 
+a#autoplay_previous, a#autoplay_next, a#autoplay_close
1343 1345 
 {
1344 
-  font-weight: bold;
1345 
-  margin-left: 35px;
1346 
-  margin-right: 35px;
1346 
+  background: #fff;
1347 
+	padding: 5px;
1348 
+	border: 10px solid #ddd;
1349 
+	z-index: 99999;
1350 
+	/*--Les différentes définitions de Box Shadow en CSS3--*/
1351 
+	-webkit-box-shadow: 0px 0px 20px #000;
1352 
+	-moz-box-shadow: 0px 0px 20px #000;
1353 
+	box-shadow: 0px 0px 20px #000;
1354 
+	/*--Coins arrondis en CSS3--*/
1355 
+	-webkit-border-radius: 10px;
1356 
+	-moz-border-radius: 10px;
1357 
+	border-radius: 10px;
1347 1358 
 }
1348 1359
1349 1360 
 a#autoplay_close
1350 1361 
 {
1351 
-  float: right;
1362 
+  float: left;
1352 1363 
   text-decoration: none;
1353 
-  margin-top: -32px;
1354 
-  margin-right: -32px;
1364 
+  margin-top: -100px;
1365 
+  margin-left: -120px;
1366 
+}
1367 
+
1368 
+div#autoplay_title
1369 
+{
1370 
+  font-weight: bold;
1371 
+  margin-left: 35px;
1372 
+  margin-right: 35px;
1355 1373 
 }
1356 1374
1357 1375 
 div#autoplay_player_container

BIN
web/bundles/muzichcore/img/autoplay_next.png View File


BIN
web/bundles/muzichcore/img/autoplay_previous.png View File


+ 1 - 1
web/bundles/muzichcore/js/muzich.js View File 

@@ -2400,7 +2400,7 @@ $(document).ready(function(){
2400 2400 
         - $('#'+object_id).width())/2,
2401 2401 
 //      top: ($(window).height()
2402 2402 
 //        - $('#'+object_id).height())/2
2403 
-        top: '20%'
2403 
+        top: '10%'
2404 2404 
       });
2405 2405 
     $('#'+object_id).show();
2406 2406 
   }