some fixes from ui checks

diff --git a/apps/catalogue/templates/catalogue/book_info.html b/apps/catalogue/templates/catalogue/book_info.html
index a90ccdc..251213a 100755 (executable)
--- a/apps/catalogue/templates/catalogue/book_info.html
+++ b/apps/catalogue/templates/catalogue/book_info.html
@@ -17,7 +17,7 @@
 </p>
 
 {% if book.extra_info.source_name %}
 </p>
 
 {% if book.extra_info.source_name %}

-  <p>{% trans "Text prepared based on:" %} {{ book.extra_info.source_name }}</p>
+  <p>{% trans "Resource prepared based on:" %} {{ book.extra_info.source_name }}</p>

 {% endif %}
 
 {% if book.extra_info.description %}
 {% endif %}
 
 {% if book.extra_info.description %}

diff --git a/apps/catalogue/templates/catalogue/tag_list_split.html b/apps/catalogue/templates/catalogue/tag_list_split.html
index b800d70..bc952c1 100644 (file)
--- a/apps/catalogue/templates/catalogue/tag_list_split.html
+++ b/apps/catalogue/templates/catalogue/tag_list_split.html
@@ -1,10 +1,10 @@
 {% load i18n %}
 {% if books %}
 {% load i18n %}
 {% if books %}

-<p class="mono">{% trans "Literatura" %}
+<p class="mono">{% trans "Literature" %}

 {{books|safe}}
 {% endif %}
 
 {% if pictures %}
 {{books|safe}}
 {% endif %}
 
 {% if pictures %}

-<p class="mono">{% trans "Obrazy" %}
+<p class="mono">{% trans "Gallery" %}

 {{pictures|safe}}
 {% endif %}
 {{pictures|safe}}
 {% endif %}

diff --git a/apps/picture/templates/picture/picture_list_thumb.html b/apps/picture/templates/picture/picture_list_thumb.html
index 647afb7..1610f4f 100644 (file)
--- a/apps/picture/templates/picture/picture_list_thumb.html
+++ b/apps/picture/templates/picture/picture_list_thumb.html
@@ -3,6 +3,7 @@
 {% load chunks %}
 {% load picture_tags %}
 {% load thumbnail %}
 {% load chunks %}
 {% load picture_tags %}
 {% load thumbnail %}

+{% load static %}

 
 {% block bodyid %}picture-list{% endblock %}
 
 
 {% block bodyid %}picture-list{% endblock %}
 


@@ -13,7 +14,10 @@
     <h1>{% block book_list_header %}{% trans "Listing of all pictures" %}{% endblock %}</h1>
 
     <div class="left-column"><div class="normal-text">
     <h1>{% block book_list_header %}{% trans "Listing of all pictures" %}{% endblock %}</h1>
 
     <div class="left-column"><div class="normal-text">

-        {% block book_list_info %}{% endblock %}
+        {% block book_list_info %}
+<a href="http://www.nck.pl"><img style="float:right; width:100px;" src="{% static "img/logo_nck_200trans.png" %}" alt="Narodowe Centrum Kultury" ></img></a>
+<p>Galeria zawiera obrazy, rysunki, rzeźby, fotografie pochodzące z kolekcji Muzeum Narodowego w Warszawie. Każde z dzieł oznaczyliśmy motywami występującymi w sztuce i w literaturze. Galerię można więc przeglądać w poszukiwaniu ilustracji do tekstów literackich, a także pod kątem określonych przedmiotów i postaci występujących w sztukach wizualnych. </p>
+{% endblock %}

     </div></div>
 
     <div class='clearboth'></div>
     </div></div>
 
     <div class='clearboth'></div>

diff --git a/apps/picture/templates/picture/picture_viewer.html b/apps/picture/templates/picture/picture_viewer.html
index d190af8..8caaae6 100644 (file)
--- a/apps/picture/templates/picture/picture_viewer.html
+++ b/apps/picture/templates/picture/picture_viewer.html
@@ -27,7 +27,7 @@
                 <li><a class="menu" href="#info">{% trans "Infobox" %}</a></li>
                 <li><a href="{{ picture.get_absolute_url }}">{% trans "Picture's page" %}</a></li>
 <!-- XXX -->
                 <li><a class="menu" href="#info">{% trans "Infobox" %}</a></li>
                 <li><a href="{{ picture.get_absolute_url }}">{% trans "Picture's page" %}</a></li>
 <!-- XXX -->

-                <li><a class="menu" href="#download">{% trans "Download" %}</a></li>
+                <li><a href="{{ picture.image_file.url }}">{% trans "Download" %}</a></li>

             </ul>
         </div>
         <div id="info" class="moveright">
             </ul>
         </div>
         <div id="info" class="moveright">

diff --git a/apps/picture/views.py b/apps/picture/views.py
index c39969a..94f4e20 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -28,6 +28,8 @@ def picture_list_thumb(request, filter=None, get_filter=None, template_name='pic
         book_list = book_list.filter(filter)
     if get_filter:
         book_list = book_list.filter(get_filter())
         book_list = book_list.filter(filter)
     if get_filter:
         book_list = book_list.filter(get_filter())

+    book_list = list(book_list)
+    book_list.sort(lambda a,b: cmp(a.extra_info['authors'][0], b.extra_info['authors'][0]))

     return render_to_response(template_name, locals(),
                               context_instance=RequestContext(request))
 
     return render_to_response(template_name, locals(),
                               context_instance=RequestContext(request))
 

diff --git a/apps/wolnelektury_core/static/css/master.picture.css b/apps/wolnelektury_core/static/css/master.picture.css
index 7bbb292..e8aa3e6 100644 (file)
--- a/apps/wolnelektury_core/static/css/master.picture.css
+++ b/apps/wolnelektury_core/static/css/master.picture.css
@@ -122,10 +122,10 @@ li.button.square {
     width: 9rem;
 }
 #sponsors div {
     width: 9rem;
 }
 #sponsors div {

-    z-index: -10;
+    z-index: 10;

 }
 
 #sponsors img {
     width: 100%;
 }
 
 #sponsors img {
     width: 100%;

-    z-index: -10;
+    z-index: 10;

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/apps/wolnelektury_core/static/js/picture.js b/apps/wolnelektury_core/static/js/picture.js
index 0840aa5..052392a 100644 (file)
--- a/apps/wolnelektury_core/static/js/picture.js
+++ b/apps/wolnelektury_core/static/js/picture.js
@@ -39,6 +39,7 @@
            self.spinner = $("#spinner").progressSpin();
 
            $(original).load(function() {
            self.spinner = $("#spinner").progressSpin();
 
            $(original).load(function() {

+               console.log("loaded original");

                self._original_loaded = true;
                self.spinner.stop();
                var cb = self.original_loaded;
                self._original_loaded = true;
                self.spinner.stop();
                var cb = self.original_loaded;


@@ -80,8 +81,8 @@
            return self;
        },
 
            return self;
        },
 

-       natural_size: function() { 
-           var img = this.element.find('img').get(0);
+       natural_size: function() {
+           var img = this.element.find('img.original').get(0);

            return [ img.naturalWidth, img.naturalHeight ] 
        },
 
            return [ img.naturalWidth, img.naturalHeight ] 
        },
 


@@ -124,7 +125,7 @@
            var new_width  = ratio * this.initial_size[0];
            var new_height = ratio * this.initial_size[1];
            var target = {
            var new_width  = ratio * this.initial_size[0];
            var new_height = ratio * this.initial_size[1];
            var target = {

-//             'width': new_width,
+               'width': new_width,

                'left': Math.max(0, 
                                 this.initial_position.left 
                                 - (new_width - this.initial_size[0])/2),
                'left': Math.max(0, 
                                 this.initial_position.left 
                                 - (new_width - this.initial_size[0])/2),


@@ -136,7 +137,7 @@
            this._zoom = level;
 
            this.element.css(target);
            this._zoom = level;
 
            this.element.css(target);

-           this.element.find(".original").width(new_width);
+          

 
 //         this.element.animate(target, 1200); // default duration=400
        },
 
 //         this.element.animate(target, 1200); // default duration=400
        },

diff --git a/lib/librarian b/lib/librarian
index 5b1dcc7..32177c1 160000 (submodule)
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 5b1dcc7d247996752fa566c7150a45037b068565
+Subproject commit 32177c13e6f1f07741f559601064538a65ce00fd