From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 10 May 2013 08:48:01 +0000 (+0200)
Subject: View for list of catalogs
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/80b56e4c5f668a8011bdf859504d45b7b7f6d914?ds=inline

View for list of catalogs
---

diff --git a/apps/libraries/locale/pl/LC_MESSAGES/django.mo b/apps/libraries/locale/pl/LC_MESSAGES/django.mo
index a29a7b08d..4aa3d522e 100644
Binary files a/apps/libraries/locale/pl/LC_MESSAGES/django.mo and b/apps/libraries/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/apps/libraries/locale/pl/LC_MESSAGES/django.po b/apps/libraries/locale/pl/LC_MESSAGES/django.po
index 3c3e2bc3c..0b0a8a441 100644
--- a/apps/libraries/locale/pl/LC_MESSAGES/django.po
+++ b/apps/libraries/locale/pl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 16:09+0200\n"
+"POT-Creation-Date: 2013-05-10 10:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: models.py:8 models.py:22
+#: models.py:8 models.py:26
 msgid "name"
 msgstr "nazwa"
 
@@ -35,22 +35,28 @@ msgstr "katalog"
 msgid "catalogs"
 msgstr "katalogi"
 
-#: models.py:24
+#: models.py:28
 msgid "url"
 msgstr "url"
 
-#: models.py:25
+#: models.py:29
 msgid "description"
 msgstr "opis"
 
-#: models.py:28
+#: models.py:32
 msgid "library"
 msgstr "biblioteka"
 
-#: models.py:29
+#: models.py:33
 msgid "libraries"
 msgstr "biblioteki"
 
-#: templates/libraries/main_view.html:4 templates/libraries/main_view.html:8
+#: templates/libraries/library_view.html:4
+#: templates/libraries/library_view.html:8
 msgid "Libraries directory"
 msgstr "Katalog bibliotek"
+
+#: templates/libraries/main_view.html:4 templates/libraries/main_view.html:8
+msgid "Library directories"
+msgstr "Katalogi bibliotek"
+
diff --git a/apps/libraries/models.py b/apps/libraries/models.py
index db6c6a5c5..1ed43ad77 100644
--- a/apps/libraries/models.py
+++ b/apps/libraries/models.py
@@ -15,7 +15,11 @@ class Catalog(models.Model):
     def __unicode__(self):
         return self.name
         
-    
+    @models.permalink
+    def get_absolute_url(self):
+        return ('library_view', [self.slug])
+        
+        
 class Library(models.Model):
     """Represent a single library in the libraries dictionary"""
 
diff --git a/apps/libraries/templates/libraries/library_view.html b/apps/libraries/templates/libraries/library_view.html
new file mode 100644
index 000000000..b109fa1b3
--- /dev/null
+++ b/apps/libraries/templates/libraries/library_view.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block titleextra %}{% trans 'Libraries directory' %}{% endblock %}
+
+
+{% block body %}
+    <h1>{% trans 'Libraries directory' %}: {{ catalog.name }}</h1>
+
+    <div class="libraries-list">
+        {% for library in catalog.libraries.all %}
+        <div class="libraries-list-item">
+            <div class="libraries-list-item-header"><a href="{{library.url}}">{{library.name}}</a></div>
+            <div class="libraries-list-item-description">
+                
+                {% autoescape off %}{{library.description}}{% endautoescape%}
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/apps/libraries/templates/libraries/main_view.html b/apps/libraries/templates/libraries/main_view.html
index b109fa1b3..f732a2a1a 100644
--- a/apps/libraries/templates/libraries/main_view.html
+++ b/apps/libraries/templates/libraries/main_view.html
@@ -1,22 +1,15 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block titleextra %}{% trans 'Libraries directory' %}{% endblock %}
-
-
-{% block body %}
-    <h1>{% trans 'Libraries directory' %}: {{ catalog.name }}</h1>
-
-    <div class="libraries-list">
-        {% for library in catalog.libraries.all %}
-        <div class="libraries-list-item">
-            <div class="libraries-list-item-header"><a href="{{library.url}}">{{library.name}}</a></div>
-            <div class="libraries-list-item-description">
-                
-                {% autoescape off %}{{library.description}}{% endautoescape%}
-            </div>
-        </div>
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block titleextra %}{% trans 'Library directories' %}{% endblock %}
+
+
+{% block body %}
+    <h1>{% trans 'Library directories' %}</h1>
+    <ul>
+        {% for catalog in catalogs %}
+            <li><a href="{{catalog.get_absolute_url}}">{{catalog}}</a></li>
         {% endfor %}
-    </div>
-
+    </ul>
+
 {% endblock %}
\ No newline at end of file
diff --git a/apps/libraries/urls.py b/apps/libraries/urls.py
index b4af54be7..92621144b 100644
--- a/apps/libraries/urls.py
+++ b/apps/libraries/urls.py
@@ -1,6 +1,9 @@
 from django.conf.urls.defaults import patterns, url
+from django.http import HttpResponseRedirect
 
 
 urlpatterns = patterns('libraries.views',
-    url(r'^(?P<slug>[a-zA-Z0-9_-]+)$', 'main_view', name='libraries_main_view'),
+    url(r'^$', 'main_view', name='libraries_main_view'),
+    url(r'^/$', lambda x: HttpResponseRedirect(x.path[:-1])),
+    url(r'^/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='library_view'),
 )
\ No newline at end of file
diff --git a/apps/libraries/views.py b/apps/libraries/views.py
index 45e60ddbf..baf7baaf4 100644
--- a/apps/libraries/views.py
+++ b/apps/libraries/views.py
@@ -4,7 +4,12 @@ from django.template import RequestContext, Template, TemplateSyntaxError
 from libraries.models import Catalog
 
 
-def main_view(request, slug):
+def main_view(request):
+    context = RequestContext(request)
+    context['catalogs'] = Catalog.objects.all()
+    return render_to_response('libraries/main_view.html', context_instance = context)
+
+def library_view(request, slug):
     context = RequestContext(request)
     context['catalog'] = get_object_or_404(Catalog.objects.filter(slug = slug).select_related())
-    return render_to_response('libraries/main_view.html', context_instance = context)
\ No newline at end of file
+    return render_to_response('libraries/library_view.html', context_instance = context)
\ No newline at end of file
diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 980173371..e99b0816a 100644
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -35,7 +35,7 @@ urlpatterns += patterns('',
     url(r'^ludzie/', include('social.urls')),
     url(r'^uzytkownik/', include('allauth.urls')),
     url(r'^czekaj/', include('waiter.urls')),
-    url(r'^biblioteki/', include('libraries.urls')),
+    url(r'^biblioteki', include('libraries.urls')),
 
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),