From: Radek Czajka Date: Wed, 1 Feb 2012 09:23:51 +0000 (+0100) Subject: jplayer fixes X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/5b5ccdc9dc573482feaded2eaa8110bc65f27cb7?ds=inline;hp=--cc jplayer fixes --- 5b5ccdc9dc573482feaded2eaa8110bc65f27cb7 diff --git a/wolnelektury/static/jplayer/jplayer.blue.monday.css b/wolnelektury/static/jplayer/jplayer.blue.monday.css index 0d90a22b1..3cef6fa0a 100644 --- a/wolnelektury/static/jplayer/jplayer.blue.monday.css +++ b/wolnelektury/static/jplayer/jplayer.blue.monday.css @@ -25,7 +25,7 @@ div.jp-video { font-family:Verdana, Arial, sans-serif; line-height:1.6; - color: #666; + color: #565656; border:1px solid #009be3; background-color:#eee; position:relative; @@ -77,6 +77,10 @@ div.jp-interface { width:100%; } +div.jp-interface a { + color: #0c767d; +} + div.jp-audio div.jp-type-single div.jp-interface { height:80px; } @@ -431,14 +435,14 @@ div.jp-type-playlist div.jp-playlist span.jp-free-media { margin-right:10px; } div.jp-type-playlist div.jp-playlist span.jp-free-media a{ - color:#666; + color:#565656; } div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{ color:#0d88c1; } span.jp-artist { font-size:.8em; - color:#666; + color:#565656; } /* @end */ diff --git a/wolnelektury/static/js/player.js b/wolnelektury/static/js/player.js index fea845029..69dceed55 100755 --- a/wolnelektury/static/js/player.js +++ b/wolnelektury/static/js/player.js @@ -1,11 +1,12 @@ (function($) { $(function() { - - $("#jplayer").jPlayer({ + $("#jplayer").each(function() { + var $self = $(this); + $self.jPlayer({ swfPath: "/static/jplayer/", solution: "html,flash", - supplied: $(this).attr('data-supplied'), + supplied: $self.attr('data-supplied'), ready: function() { var player = $(this); @@ -27,7 +28,7 @@ }); } }); - + }); }); })(jQuery) \ No newline at end of file diff --git a/wolnelektury/templates/404.html b/wolnelektury/templates/404.html index 8083d2865..f3846aac4 100644 --- a/wolnelektury/templates/404.html +++ b/wolnelektury/templates/404.html @@ -10,7 +10,7 @@

{% trans "Page not found" %}

-

+

{% trans "We are sorry, but this page does not exist. Please check if you entered correct address or go to "%} {% trans "main page" %}.

diff --git a/wolnelektury/templates/catalogue/book_text.html b/wolnelektury/templates/catalogue/book_text.html index b1b5d7f56..6754ac6d5 100644 --- a/wolnelektury/templates/catalogue/book_text.html +++ b/wolnelektury/templates/catalogue/book_text.html @@ -58,7 +58,7 @@ {% for fragment in fragments %} {{ forloop.counter }} {% endfor %} -
  • +
  • {% endfor %} diff --git a/wolnelektury/templates/catalogue/player.html b/wolnelektury/templates/catalogue/player.html index 414bf0eeb..d38b53f68 100755 --- a/wolnelektury/templates/catalogue/player.html +++ b/wolnelektury/templates/catalogue/player.html @@ -1,10 +1,8 @@ - - + + {% load i18n compressed %} - {% trans "Wolne Lektury" %} :: @@ -21,7 +19,7 @@ <div class="jp-type-playlist"> <div id="jplayer" class="jp-jplayer" - data-supplied="{% if have_oggs %}ogg,{% endif %}mp3"></div> + data-supplied="{% if have_oggs %}oga,{% endif %}mp3"></div> <div id="jp_container_1" class="jp-audio"> <div class="jp-type-single"> <div class="jp-gui jp-interface"> diff --git a/wolnelektury/templates/lesmianator/poem.html b/wolnelektury/templates/lesmianator/poem.html index 03d1e9d03..78c5d5fb3 100644 --- a/wolnelektury/templates/lesmianator/poem.html +++ b/wolnelektury/templates/lesmianator/poem.html @@ -21,7 +21,7 @@ </div> <div id="header"> <div id="logo"> - <a href="/"><img src="{{ STATIC_URL }}img/logo.png" alt="WolneLektury.pl - logo" /></a> + <a href="/">Wolne Lektury</a> </div> </div> <div id="book-text">