fix merge of audio part

diff --git a/panikweb_templates/static/css/_specifics.scss b/panikweb_templates/static/css/_specifics.scss
index 85581bb475d4403b787d6d26af303a93c4454aa1..01cf576e9168bdec4040c4cefd14b442ec1b62c9 100644 (file)
--- a/panikweb_templates/static/css/_specifics.scss
+++ b/panikweb_templates/static/css/_specifics.scss
@@ -674,7 +674,7 @@ h1.top#frequence {
 #Playlist ol li .soundControls{
        margin-left: 1ex;
        position: relative;
-       top: -0.5ex;
+       float: right;
        visibility: hidden;
 }
 #Playlist ol li.active .soundControls {

diff --git a/panikweb_templates/static/js/audioPlayer.js b/panikweb_templates/static/js/audioPlayer.js
index 8622f7f2b7bbf83f830f7c7b564ac538eeb62fc5..729998d27817f13dd75b2ed57a24a88a4ddcedf3 100644 (file)
--- a/panikweb_templates/static/js/audioPlayer.js
+++ b/panikweb_templates/static/js/audioPlayer.js
@@ -135,10 +135,10 @@
                                $(document).trigger('panik:play', {'sound_id': sound_id});
                        }).on('pause',function(e){
                                $(this).removeClass('playing');
-                               playpause.addClass('icon-play').removeClass('icon-pause');
+                               playpause.addClass('action-play').removeClass('action-pause');
                                var sound_id = $(e.target).data('sound-id');
                                $(document).trigger('panik:pause', {'sound_id': sound_id});
-                               thePlaylist.controlButtons['playpause'].removeClass('icon-pause').addClass('icon-play');
+                               thePlaylist.controlButtons['playpause'].removeClass('action-pause').addClass('action-play');
                        }).on('stop',function(event){
                                $(this).trigger('pause');
                                if($(this)[0].currentTime){$(this)[0].currentTime = 0;}
@@ -160,7 +160,7 @@
                        });
                        var controls = $('<span>',{'class':'soundControls controls'});
                        var link = $('<a>',{href:sound.url,'class':'button icon-external-link'});
-                       var remove = $('<button>',{title:"Remove from list",'class':'no-icon-remove',click:function(){
+                       var remove = $('<button>',{title:"Stop",'class':'no-icon-remove',click:function(){
                                container.remove();
                                thePlaylist._update();
                        }});

diff --git a/panikweb_templates/templates/includes/audio.html b/panikweb_templates/templates/includes/audio.html
index 6c708f7f2e3120f6cec617a418bbe3e94a712c18..be00baf08a99ae1cd51822103b748eedda6771d3 100644 (file)
--- a/panikweb_templates/templates/includes/audio.html
+++ b/panikweb_templates/templates/includes/audio.html
@@ -1,20 +1,6 @@
 {% load soundfiles paniktags i18n %}
 {% if sound|is_format_available:'mp3' or sound|is_format_available:'ogg' %}
-<<<<<<< HEAD
        <div class="audio" data-sound-id="{{ sound.id }}">
-               {% if not embed %}
-               <button class="resymbol icon-plus-sign big"
-                       title="{% trans "Add to playlist" %}"
-                       data-player-audio="Audio-{{ sound.file.url|slugify }}" 
-                       data-player-action="registerAudio" 
-                       id="addToPlaylist-{{ sound.file.url|slugify }}"
-                       ><span class="sr-only">{% trans "Add to playlist" %}</span></button>
-               {% endif %}
-               <button class="resymbol icon-play-sign big"
-                       title="{% trans "Play" %}"
-                       data-player-audio="Audio-{{ sound.file.url|slugify }}" 
-                       data-player-action="playAudio" 
-                       ><span class="sr-only">{% trans "Play" %}</span></button>
                {% if embed %}
                <button class="icons icon-pause big"
                        title="{% trans "Pause" %}"