fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 2335f0f)
jplayer fixes
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 1 Feb 2012 09:23:51 +0000 (10:23 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 1 Feb 2012 09:25:19 +0000 (10:25 +0100)
wolnelektury/static/jplayer/jplayer.blue.monday.css patch | blob | history
wolnelektury/static/js/player.js patch | blob | history
wolnelektury/templates/404.html patch | blob | history
wolnelektury/templates/catalogue/book_text.html patch | blob | history
wolnelektury/templates/catalogue/player.html patch | blob | history
wolnelektury/templates/lesmianator/poem.html patch | blob | history

diff --git a/wolnelektury/static/jplayer/jplayer.blue.monday.css b/wolnelektury/static/jplayer/jplayer.blue.monday.css
index 0d90a22..3cef6fa 100644 (file)
--- a/wolnelektury/static/jplayer/jplayer.blue.monday.css
+++ b/wolnelektury/static/jplayer/jplayer.blue.monday.css
@@ -25,7 +25,7 @@ div.jp-video {
 \r
        font-family:Verdana, Arial, sans-serif;\r
        line-height:1.6;\r
-       color: #666;\r
+       color: #565656;\r
        border:1px solid #009be3;\r
        background-color:#eee;\r
        position:relative;\r
@@ -77,6 +77,10 @@ div.jp-interface {
        width:100%;\r
 }\r
 \r
+div.jp-interface a {\r
+       color: #0c767d;\r
+}\r
+\r
 div.jp-audio div.jp-type-single div.jp-interface {\r
        height:80px;\r
 }\r
@@ -431,14 +435,14 @@ div.jp-type-playlist div.jp-playlist span.jp-free-media {
        margin-right:10px;\r
 }\r
 div.jp-type-playlist div.jp-playlist span.jp-free-media a{\r
-       color:#666;\r
+       color:#565656;\r
 }\r
 div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{\r
        color:#0d88c1;\r
 }\r
 span.jp-artist {\r
        font-size:.8em;\r
-       color:#666;\r
+       color:#565656;\r
 }\r
 \r
 /* @end */\r
diff --git a/wolnelektury/static/js/player.js b/wolnelektury/static/js/player.js
index fea8450..69dceed 100755 (executable)
--- 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 8083d28..f3846aa 100644 (file)
--- a/wolnelektury/templates/404.html
+++ b/wolnelektury/templates/404.html
@@ -10,7 +10,7 @@
 <h1>{% trans "Page not found" %}</h1>
 
 
-<p>
+<p class="normal-text">
 {% trans "We are sorry, but this page does not exist. Please check if you entered correct address or go to "%} <a href="/">{% trans "main page" %}</a>.
 </p>
 
diff --git a/wolnelektury/templates/catalogue/book_text.html b/wolnelektury/templates/catalogue/book_text.html
index b1b5d7f..6754ac6 100644 (file)
--- a/wolnelektury/templates/catalogue/book_text.html
+++ b/wolnelektury/templates/catalogue/book_text.html
@@ -58,7 +58,7 @@
                     {% for fragment in fragments %}
                         <a href="#m{{ fragment.anchor }}">{{ forloop.counter }}</a>
                     {% endfor %}
-                <li>
+                </li>
                 {% endfor %}
             </ol>
         </div>
diff --git a/wolnelektury/templates/catalogue/player.html b/wolnelektury/templates/catalogue/player.html
index 414bf0e..d38b53f 100755 (executable)
--- a/wolnelektury/templates/catalogue/player.html
+++ b/wolnelektury/templates/catalogue/player.html
@@ -1,10 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
     {% load i18n compressed %}
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="Content-Style-Type" content="text/css" />
         <meta name="description" 
             content="{{ book.title }} - darmowy audiobook na wolnej licencji" />
         <title>{% 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 03d1e9d..78c5d5f 100644 (file)
--- 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">