Merge branch 'master' of git@github.com:fnp/wolnelektury

diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css
index 1ea2366..7bd410a 100644 (file)
--- a/wolnelektury/static/css/master.css
+++ b/wolnelektury/static/css/master.css
@@ -1055,7 +1055,7 @@ div.shown-tags p, div.all-tags p {
 
 #document-list .download-doc {
     display: none;
-    color: #EE2124;
+    color: #00F;
 }
 
 /* ====================== */

diff --git a/wolnelektury/static/css/s5/pretty.css b/wolnelektury/static/css/s5/pretty.css
index 728c341..ab0dbee 100644 (file)
--- a/wolnelektury/static/css/s5/pretty.css
+++ b/wolnelektury/static/css/s5/pretty.css
@@ -48,15 +48,15 @@ h1 abbr {font-variant: small-caps;}
 div#controls {position: absolute; left: 50%; bottom: 0;
   width: 50%;
   text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;}
-html>body div#controls {position: fixed; padding: 0 0 1em 0;
-  top: auto;}
+html>body div#controls {position: absolute; padding: 0 0 1em 0;
+  top: auto; left:0; width:500px;}
 div#controls form {position: absolute; bottom: 0; right: 0; width: 100%;
   margin: 0; padding: 0;}
 #controls #navLinks a {padding: 0; margin: 0 0.5em; 
   background: #005; border: none; color: #779; 
   cursor: pointer;}
 #controls #navList {height: 1em;}
-#controls #navList #jumplist {position: absolute; bottom: 0; right: 0; background: #DDD; color: #227;}
+#controls #navList #jumplist {position: absolute; bottom: 0; left: 10px; background: #DDD; color: #227; width: 300px;}
 
 #currentSlide {text-align: center; font-size: 0.5em; color: #449;}
 

diff --git a/wolnelektury/static/js/catalogue.js b/wolnelektury/static/js/catalogue.js
index d9de589..3eb0074 100644 (file)
--- a/wolnelektury/static/js/catalogue.js
+++ b/wolnelektury/static/js/catalogue.js
@@ -464,7 +464,7 @@ function serverTime() {
             return false;
         });
 
-        $('.sponsor-logos').cycle({timeout: 3000});
+        //$('.sponsor-logos').cycle({timeout: 3000});
 
         $('.widget-code').focus(
             function(){

diff --git a/wolnelektury/static/js/slides.js b/wolnelektury/static/js/slides.js
index 38fe853..cf17db6 100644 (file)
--- a/wolnelektury/static/js/slides.js
+++ b/wolnelektury/static/js/slides.js
@@ -95,10 +95,11 @@ function slideLabel() {
                for (var o = 0; o < menunodes.length; o++) {
                        otext += nodeValue(menunodes[o]);
                }
+               otext = otext.substr(0,15) + '...';
                list.options[list.length] = new Option(n + ' : '  + otext, n);
        }
 }
-
+/*
 function currentSlide() {
        var cs;
        if (document.getElementById) {
@@ -114,7 +115,7 @@ function currentSlide() {
        } else {
                cs.style.visibility = 'visible';
        }
-}
+}*/
 
 function go(step) {
        if (document.getElementById('slideProj').disabled || step == 0) return;
@@ -154,7 +155,7 @@ function go(step) {
        ce.style.visibility = 'hidden';
        ne.style.visibility = 'visible';
        jl.selectedIndex = snum;
-       currentSlide();
+       //currentSlide();
        number = 0;
 }
 
@@ -190,6 +191,7 @@ function toggle() {
                        var slide = slideColl[n];
                        slide.style.visibility = 'visible';
                }
+           document.getElementById("toggle").value = "Lista slajdów";
        } else {
                slides.disabled = false;
                outline.disabled = true;
@@ -200,6 +202,7 @@ function toggle() {
                        slide.style.visibility = 'hidden';
                }
                slideColl[snum].style.visibility = 'visible';
+           document.getElementById("toggle").value = "Ciągły tekst";         
        }
 }
 
@@ -374,26 +377,25 @@ function externalLinks() {
 function createControls() {
        var controlsDiv = document.getElementById("controls");
        if (!controlsDiv) return;
-       var hider = ' onmouseover="showHide(\'s\');" onmouseout="showHide(\'h\');"';
+       /*var hider = ' onmouseover="showHide(\'s\');" onmouseout="showHide(\'h\');"';
        var hideDiv, hideList = '';
        if (controlVis == 'hidden') {
                hideDiv = hider;
        } else {
                hideList = hider;
-       }
-       controlsDiv.innerHTML = '<form action="#" id="controlForm"' + hideDiv + '>' +
-       '<div id="navLinks">' +
-       '<a accesskey="t" id="toggle" href="javascript:toggle();">&#216;<\/a>' +
-       '<a accesskey="z" id="prev" href="javascript:go(-1);">&laquo;<\/a>' +
-       '<a accesskey="x" id="next" href="javascript:go(1);">&raquo;<\/a>' +
-       '<div id="navList"' + hideList + '><select id="jumplist" onchange="go(\'j\');"><\/select><\/div>' +
-       '<\/div><\/form>';
-       if (controlVis == 'hidden') {
+       }*/
+       controlsDiv.innerHTML = '' +
+       '<input type="button" accesskey="t" id="toggle" onclick="toggle();" value="Ciągły tekst"' +
+       '<input type="button" accesskey="z" id="prev" onclick="javascript:go(-1);" value="&laquo;"' +
+       '<input type="button" accesskey="x" id="next" onclick="javascript:go(1);" value="&raquo;"' +
+       '<select id="jumplist" onchange="go(\'j\');"><\/select><\/div>';
+       /*if (controlVis == 'hidden') {
                var hidden = document.getElementById('navLinks');
        } else {
                var hidden = document.getElementById('jumplist');
        }
-       addClass(hidden,'hideme');
+       addClass(hidden,'hideme');*/
+       document.getElementById("toggle").onclick = toggle;
 }
 
 function fontScale() {  // causes layout problems in FireFox that get fixed if browser's Reload is used; same may be true of other Gecko-based browsers
@@ -550,4 +552,4 @@ function startup() {
 }
 
 window.onload = startup;
-window.onresize = function(){setTimeout('fontScale()', 50);}
\ No newline at end of file
+window.onresize = function(){setTimeout('fontScale()', 50);}

diff --git a/wolnelektury/templates/lessons/document_list.html b/wolnelektury/templates/lessons/document_list.html
index d61618e..03d68c6 100644 (file)
--- a/wolnelektury/templates/lessons/document_list.html
+++ b/wolnelektury/templates/lessons/document_list.html
@@ -15,8 +15,11 @@
                     $("<iframe id='presentation-frame' width='600' height='500' border='0' src=''>").appendTo($("#document-detail"));
                   }
                   $("#presentation-frame").attr("src", this.href);
-                  $('#document-list li').css('border', 'none');
-                  $(this).closest('li').css('border', '1px solid green');
+                  $('#document-list li').css('background-color', 'white');
+                  $('#document-list li a').css('background-color', 'white');
+                  $(this).closest('li').css('background-color', '#EEEEEE');
+                  $(this).css('background-color', '#EEEEEE');
+                  $(this).next('a').css('background-color', '#EEEEEE');                                    
                   $('.download-doc').hide();
                   $(this).next('.download-doc').show();
             });