From: Marcin Koziej <marcin@lolownia.org>
Date: Mon, 9 Dec 2013 15:07:45 +0000 (+0100)
Subject: So many things get better/are improved, but only things that are to be done or broken... 
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/29a13b9e77d5a7ac5d26c95488028f88e6b57c2f?ds=inline

So many things get better/are improved, but only things that are to be done or broken matter. This commit continues this march of complete hopelessness.
---

diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py
index c865d1d87..30b447197 100644
--- a/apps/catalogue/models/book.py
+++ b/apps/catalogue/models/book.py
@@ -74,6 +74,7 @@ class Book(models.Model):
         from sortify import sortify
 
         self.sort_key = sortify(self.title)
+        self.title = unicode(self.title) # ???
 
         ret = super(Book, self).save(force_insert, force_update, **kwargs)
 
diff --git a/apps/catalogue/models/tag.py b/apps/catalogue/models/tag.py
index 7280060a6..f2ce27c45 100644
--- a/apps/catalogue/models/tag.py
+++ b/apps/catalogue/models/tag.py
@@ -40,6 +40,7 @@ class Tag(TagBase):
     book_count = models.IntegerField(_('book count'), blank=True, null=True)
     picture_count = models.IntegerField(_('picture count'), blank=True, null=True)
     gazeta_link = models.CharField(blank=True, max_length=240)
+    culturepl_link = models.CharField(blank=True, max_length=240)
     wiki_link = models.CharField(blank=True, max_length=240)
 
     created_at    = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
@@ -119,7 +120,7 @@ class Tag(TagBase):
         
         if self.category == 'book':
             # never used
-            objects = Book.objects.none()
+            objects = Picture.objects.none()
         elif self.category == 'theme':
             objects = Picture.tagged.with_all((self,))
         elif self.category == 'thing':
@@ -195,10 +196,15 @@ class Tag(TagBase):
                     # Allow creating new tag, if it's in default language.
                     tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name), category=category)
                     if created:
+                        tag_name = unicode(tag_name)
                         tag.name = tag_name
                         setattr(tag, "name_%s" % lang, tag_name)
                         tag.sort_key = sortify(tag_sort_key.lower())
-                        tag.save()
+                        try:
+                            tag.save()
+                        except Exception, e:
+                            import pdb; pdb.set_trace()
+                            raise e
                     meta_tags.append(tag)
                 else:
                     # Ignore unknown tags in non-default languages.
diff --git a/apps/catalogue/tasks.py b/apps/catalogue/tasks.py
index cb6fd6432..663a5bce4 100644
--- a/apps/catalogue/tasks.py
+++ b/apps/catalogue/tasks.py
@@ -16,7 +16,7 @@ def touch_tag(tag):
         'picture_count': tag.get_picture_count(),
         'changed_at': localtime_to_utc(datetime.now()),
     }
-    print update_dict
+
     type(tag).objects.filter(pk=tag.pk).update(**update_dict)
 
 
diff --git a/apps/catalogue/templates/catalogue/tag_list_split.html b/apps/catalogue/templates/catalogue/tag_list_split.html
index bc952c1f1..d79618a17 100644
--- a/apps/catalogue/templates/catalogue/tag_list_split.html
+++ b/apps/catalogue/templates/catalogue/tag_list_split.html
@@ -1,10 +1,18 @@
 {% load i18n %}
 {% if books %}
-<p class="mono">{% trans "Literature" %}
-{{books|safe}}
+<div class="simple-toggler-scope">
+<p class="mono">
+  <a href="#" class="simple-toggler">{% trans "Literature" %}</a>
+</p>
+<div class="simple-hidden-box">{{books|safe}}</div>
+</div>
 {% endif %}
 
 {% if pictures %}
-<p class="mono">{% trans "Gallery" %}
-{{pictures|safe}}
+<div class="simple-toggler-scope">
+<p class="mono">
+  <a href="#" class="simple-toggler">{% trans "Gallery" %}</a>
+</p>
+<div class="simple-hidden-box">{{pictures|safe}}</div>
+</div>
 {% endif %}
diff --git a/apps/catalogue/templates/catalogue/tagged_object_list.html b/apps/catalogue/templates/catalogue/tagged_object_list.html
index b729ca917..96b628d59 100644
--- a/apps/catalogue/templates/catalogue/tagged_object_list.html
+++ b/apps/catalogue/templates/catalogue/tagged_object_list.html
@@ -73,6 +73,11 @@
             {% if last_tag.gazeta_link or last_tag.wiki_link %}
             <h2 class='mono'>{% trans "See also" %}:</h2>
             <ul>
+        {% if last_tag.culturepl_link %}
+        <li><a href="{{ last_tag.gazeta_link }}">
+        	{% trans "in Culture.pl" %}
+        </a></li>
+        {% endif %}
         {% if last_tag.gazeta_link %}
         <li><a href="{{ last_tag.gazeta_link }}">
         	{% trans "in Lektury.Gazeta.pl" %}
diff --git a/apps/picture/templates/picture/picture_list_thumb.html b/apps/picture/templates/picture/picture_list_thumb.html
index 1610f4fac..472a2ceb7 100644
--- a/apps/picture/templates/picture/picture_list_thumb.html
+++ b/apps/picture/templates/picture/picture_list_thumb.html
@@ -15,10 +15,15 @@
 
     <div class="left-column"><div class="normal-text">
         {% 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="right-column" id="logo-space">
+      {% block book_list_logos %}
+      <a href="http://www.nck.pl">
+	<img style="float:right; width:200px" src="{% static "img/logo_nck_200horiz_trans.png" %}" alt="Narodowe Centrum Kultury" ></img></a>
+      {% endblock %}
+    </div>
 
     <div class='clearboth'></div>
 <div id="books-list">
diff --git a/apps/picture/templates/picture/picture_short.html b/apps/picture/templates/picture/picture_short.html
index e7bbdd881..080bd1618 100644
--- a/apps/picture/templates/picture/picture_short.html
+++ b/apps/picture/templates/picture/picture_short.html
@@ -28,24 +28,24 @@
         <div class="tags">
             {% spaceless %}
 
-            <span class="mono">{% trans "Epoch" %}:&nbsp;</span>
+            <span class="mono"> {% trans "Epoch" %}:&nbsp;</span>
             <span class="book-box-tag">
                 {% for tag in tags.epoch %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>{% if not forloop.last %},{% endif %}
+                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>{% if not forloop.last %},&nbsp;{% endif %}
                 {% endfor %}
             </span>
 
-            <span class="mono">{% trans "Kind" %}:&nbsp;</span>
+            <span class="mono"> {% trans "Kind" %}:&nbsp;</span>
             <span class="book-box-tag">
                 {% for tag in tags.kind %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>{% if not forloop.last %},{% endif %}
+                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>{% if not forloop.last %},&nbsp;{% endif %}
                 {% endfor %}
             </span>
 
-            <span class="mono">{% trans "Genre" %}:&nbsp;</span>
+            <span class="mono"> {% trans "Genre" %}:&nbsp;</span>
             <span class="book-box-tag">
                 {% for tag in tags.genre %}
-                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>{% if not forloop.last %},{% endif %}
+                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>{% if not forloop.last %},&nbsp;{% endif %}
                 {% endfor %}
             </span>
 
diff --git a/apps/wolnelektury_core/static/css/master.picture.css b/apps/wolnelektury_core/static/css/master.picture.css
index e8aa3e633..ab4c49ca7 100644
--- a/apps/wolnelektury_core/static/css/master.picture.css
+++ b/apps/wolnelektury_core/static/css/master.picture.css
@@ -128,4 +128,9 @@ li.button.square {
 #sponsors img {
     width: 100%;
     z-index: 10;
+}
+
+#spinner {
+    height: 1em;
+    z-index:10;
 }
\ No newline at end of file
diff --git a/apps/wolnelektury_core/static/js/base.js b/apps/wolnelektury_core/static/js/base.js
index 9676d5b4c..4d979af0c 100755
--- a/apps/wolnelektury_core/static/js/base.js
+++ b/apps/wolnelektury_core/static/js/base.js
@@ -85,13 +85,15 @@
 					} 
 				});
 			});
+		    /* this kinda breaks the whole page. */
 			$('body').click(function(e) {
 				if ($current == null) return;
 				var p = $(e.target);
 				while (p.length) {
 					if (p == $current)
 						return;
-					if (p.hasClass('hidden-box-trigger'))
+					if (p.hasClass('hidden-box-trigger') 
+					    || p.hasClass('simple-toggler'))
 						return;
 					p = p.parent();
 				}
@@ -122,6 +124,19 @@ $('#themes-list-toggle').click(function(event) {
 	$(function(){
 	    $("#search").search();});
 
+      $('body').on('click', '.simple-toggler' , function(ev) {
+	ev.preventDefault();
+	var scope = $(this).closest('.simple-toggler-scope');
+	scope.find('.simple-hidden-box').each(function(){ 
+	  var $this = $(this);
+	  if ($this.is(':hidden')) {
+	    $this.show();
+	  } else { 
+	    $this.hide();
+	  }
+	  });
+      });
+
     });
 })(jQuery);