From c600b1bd8a8a631ce2972b0efc3a1a6014b56f40 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 1 Apr 2014 11:48:53 +0200 Subject: [PATCH 1/1] Visual changes, removing some items not applicable in the ER editing context. --- apps/catalogue/forms.py | 18 +- .../catalogue/locale/pl/LC_MESSAGES/django.mo | Bin 6890 -> 6080 bytes .../catalogue/locale/pl/LC_MESSAGES/django.po | 169 ++++++++---------- apps/catalogue/models/book.py | 6 +- apps/catalogue/models/chunk.py | 4 + apps/catalogue/models/project.py | 4 +- apps/catalogue/templates/catalogue/base.html | 2 +- .../templates/catalogue/book_list/book.html | 15 +- .../catalogue/book_list/book_list.html | 24 +-- .../catalogue/document_create_missing.html | 4 +- apps/catalogue/templatetags/catalogue.py | 3 - apps/catalogue/views.py | 8 +- apps/dvcs/models.py | 4 + redakcja/settings/common.py | 2 +- redakcja/static/css/filelist.css | 2 +- requirements.txt | 1 + 16 files changed, 114 insertions(+), 152 deletions(-) diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index 285e58e5..85f92efc 100644 --- a/apps/catalogue/forms.py +++ b/apps/catalogue/forms.py @@ -15,36 +15,28 @@ class DocumentCreateForm(forms.ModelForm): """ Form used for creating new documents. """ - file = forms.FileField(required=False) template = forms.ModelChoiceField(Template.objects, required=False) - text = forms.CharField(required=False, widget=forms.Textarea) class Meta: model = Book - exclude = ['parent', 'parent_number', 'project'] + exclude = ['parent', 'parent_number', 'project', 'gallery', 'public'] def __init__(self, *args, **kwargs): super(DocumentCreateForm, self).__init__(*args, **kwargs) self.fields['slug'].widget.attrs={'class': 'autoslug'} - self.fields['gallery'].widget.attrs={'class': 'autoslug'} self.fields['title'].widget.attrs={'class': 'autoslug-source'} self.fields['template'].queryset = Template.objects.filter(is_main=True) def clean(self): super(DocumentCreateForm, self).clean() - file = self.cleaned_data['file'] template = self.cleaned_data['template'] + self.cleaned_data['gallery'] = self.cleaned_data['slug'] - if file is not None: - try: - self.cleaned_data['text'] = file.read().decode('utf-8') - except UnicodeDecodeError: - raise forms.ValidationError(_("Text file must be UTF-8 encoded.")) - elif template is not None: + if template is not None: self.cleaned_data['text'] = template.content - if not self.cleaned_data["text"]: - self._errors["file"] = self.error_class([_("You must enter text, upload a file or select a template")]) + if not self.cleaned_data.get("text"): + self._errors["template"] = self.error_class([_("You must select a template")]) return self.cleaned_data diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo index b6a12e32adb8df9ea567ba9cd27893235a73017b..0187fa8630883a1aa563254d93567bffe8ec27b2 100644 GIT binary patch delta 2374 zcmY+_e@vBC9LMo9``6R+sJ_v+-ITNvfo zs?EpJvaL4OSZmnat^RQ>D%n`emebl=8>4Btia)Go&gEL~4;&jjyWi(^&Uwyren0SA z^>A5qEOplFhO3iUsE9M>xSY+6t8lI{*;s`9OcOV%m}ZQ}%{IRi6Ulej^8GlUe8iUb z<1F%TU^ukOe6UaB?1K5r= zcm%8PLsWa$Q14G*7X6z$B+@8I&7KaQjJ{1>Z>Uew`2)Ijo41N5P0(tvue z71iE$)I>UM`E#gx-KZ5ij;i;joAp=XU0ZPw`I#YZ>ga-X*p`o=I=X^-?+5F+eSX8{ zZ=qJ;E^5W*GCOTuDyrQ@sCEjIS$`Fj+JY+7i?z1mYD~J%m<^~U+eRyT-ivDBRpgO5 zh3aSkwK7AfdY@wsUP8uVenr*0jXI>RC>x^}axo99P)ps8s^~`@p8cqfj^GmPLv?T- zwGyAA4%|ODOMcTaZI1UOj4nEvQ4+j+*%%)Br-LL;ng!l{je&PNN!n8?|%; zs6GA&UAT_W)kJ7XRhKcEr-@Qx`n7?K2B$yS+Lj7Jm$uAD==4`<|5uUFAf6(0wM;R& zr1Wc+*}M*!m(VGGl6Zz_AlUB7e|C zKib>rR~(t`#6!dq`yd|+iPc22Eo;M8n_i0RiH(HLLMQPEv6UzzreAz;W{VEUqqbC^ zjrLpD$|?T8@3g6U%u_nQaCcG2d*I-+kzim(#@Q3U!}%t@JLXRqbU9f`H=H@{I#1Xe z3j6m4Olu(Qjf4V+ogR1CNl8BA2?c_I-C?ia8x9;e6!eFk(d66Cw<)FZ!N^`S`HoZK z3AvY+l=G|bR#YsntZ{}sIWtOXW8ZmBxbifbk=|*e8R~jS+jZD~@nvtQ$Gn8azJV-6_$@e&;juo8ve0`_0>T zXM8ue>)5CPj~Pk|jYAKdZj1~ki>WA$gN+#tSHVHB4Kl^t0{NM&?RUYU^zX6uhhaJW z9&3LE4xqmW4ukK&3S+v=AsVF^j>8G?XDHvJhZu7PJR8dKB&db8P~#WCk+1>EaTC;f z7nZBRY)BzSlf@;=4UGQe8$oa4fncJvz({0d!&p{nvzvW@51)tgR zAK?}BO9{hNxE3lUcf)*Ss0Px15>A89z)JWY)B(PNI^c;?;;)ncff3|{4i8xK86bEmryzX0V?!=K}Bi^MmZh_<){j3|MRT9*4pd3XlTO)cHlBta+)#A z;0)|*d0`sg3bj!T36|-BI>1h-2)+h2?;sot--n9838;A|p(0nzWWD~eQ0uxDP*0?> z66&TIs0Ft{J;rV*hmY9tXQAH8PRO2SADjk1ggSt{=%yu*V3;zf{U$*9sezN>)o_u% z{|*{*v>R%JJ}3uApdQV)P>u$WaOHdq)p%HA`zs++Oaf~Ctx)T?Kt*qjMxt$Mp$@VLYQtsl9=IOrEgZMw-$UK#H>i!xm_p7gp>94M>Yua@YQILP z3#^0uOo~eW?uF;z-#kHMHhj|#d<(VkPpC&Vkn1RPqu>%)4=;dsK&9+0sCj*sM`1nv zV~|Ul(VSBArb8WkE>t8I!7hd9dONTg>IQe({#K}kk3xQC2bC7SZtaIHKY@CjUqHS7 zZ*2b$sITB3s5dl##foGZ)cmoP#9t1pFlgZvJ7FP|<4d4Uyd3H^H$mMr0ol{ELp`$l zp>DbZ%Hb}{H=y?4WBdDT{~%Nf4pkC=J(^<}ieP`yY1i0J!cvb;Wl{n8TF$OVzO`+D zm)W+UG^og#N-erL-zrr4|1r~%Q|O!Zuom2i;)%S3rWDf5?Hpf0ec9e54#J-ztlda=ZvBhs%-5O=v3O>&urq>ZP_l z5$e;^TWYknCQE%$`m9y1K}!1!`JYc?CDJFj390CjwV*b1I!d8d)L&-NxEdwVwdgve zvKmcBdfgWx{uFsIQxeso)0|ER|7nKi;zZCIjy zGz}TgjXcM7QeLjG-deO*@8H2Zi-xEbIvdj2RQ%GAAB!{Tjb0*(A0K*QnVU(pIesd? z&WZde>4ou;p%o+A(mAKiZ)x!gLt%V;Xf)otHF7riNzd7o4I`)7bDFMMQZwK2Qi*hn z*HRldmF%eU{HV>#V2h|Dtw?8_YCd@y_D}drzUP6**)i~;K1E(OW>QPD7U{i z)9IwrxxVgGbNYHt4fHST>*?Jx^6R2Auk<~qGvy||PCuPW_pk7R-nO!`qI@!fDDEg< zI&O7mHgGpOIVb9fvUnpkb}!Dhue_=va1ZQtvO%VUeD{0tT&~(%J$iCcJ}W^~$Vw1( r#4E=vo<~N!46z6UH?_YvXHsrw&Q+eU`lqb@J diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po index 6790400c..5f5148e3 100644 --- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Platforma Redakcyjna\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-16 13:22+0200\n" -"PO-Revision-Date: 2013-07-16 13:22+0100\n" +"POT-Creation-Date: 2014-04-01 11:28+0200\n" +"PO-Revision-Date: 2014-04-01 11:29+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: Fundacja Nowoczesna Polska \n" @@ -20,55 +20,43 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.5.4\n" -#: forms.py:39 -msgid "Text file must be UTF-8 encoded." -msgstr "Plik powinien mieć kodowanie UTF-8." - -#: forms.py:42 -msgid "You must either enter text or upload a file" -msgstr "Proszę wpisać tekst albo wybrać plik do załadowania" +#: forms.py:38 +msgid "You must select a template" +msgstr "Musisz wybrać szablon" -#: forms.py:51 +#: forms.py:47 msgid "ZIP file" msgstr "Plik ZIP" -#: forms.py:52 +#: forms.py:48 msgid "Directories are documents in chunks" msgstr "Katalogi zawierają dokumenty w częściach" -#: forms.py:76 +#: forms.py:72 msgid "Assigned to" msgstr "Przypisane do" -#: forms.py:97 forms.py:111 +#: forms.py:93 forms.py:107 msgid "Chunk with this slug already exists" msgstr "Część z tym slugiem już istnieje" -#: forms.py:120 +#: forms.py:116 msgid "Append to" msgstr "Dołącz do" -#: views.py:160 +#: views.py:161 #, python-format msgid "Slug already used for %s" msgstr "Slug taki sam jak dla pliku %s" -#: views.py:162 +#: views.py:163 msgid "Slug already used in repository." msgstr "Dokument o tym slugu już istnieje w repozytorium." -#: views.py:168 +#: views.py:169 msgid "File should be UTF-8 encoded." msgstr "Plik powinien mieć kodowanie UTF-8." -#: views.py:498 models/book.py:56 -msgid "books" -msgstr "książki" - -#: views.py:500 -msgid "scan gallery" -msgstr "galeria skanów" - #: models/book.py:28 models/chunk.py:23 msgid "title" msgstr "tytuł" @@ -81,10 +69,6 @@ msgstr "slug" msgid "public" msgstr "publiczna" -#: models/book.py:31 -msgid "scan gallery name" -msgstr "nazwa galerii skanów" - #: models/book.py:35 msgid "parent" msgstr "rodzic" @@ -97,6 +81,10 @@ msgstr "numeracja rodzica" msgid "book" msgstr "książka" +#: models/book.py:56 +msgid "books" +msgstr "książki" + #: models/book.py:255 msgid "No chunks in the book." msgstr "Książka nie ma części." @@ -145,14 +133,6 @@ msgstr "nazwa" msgid "notes" msgstr "notatki" -#: models/project.py:19 templates/catalogue/book_list/book_list.html:62 -msgid "project" -msgstr "projekt" - -#: models/project.py:20 -msgid "projects" -msgstr "projekty" - #: models/publish_log.py:18 msgid "time" msgstr "czas" @@ -279,7 +259,6 @@ msgid "Add chunk" msgstr "Dodaj część" #: templates/catalogue/chunk_edit.html:5 -#: templates/catalogue/book_list/book.html:8 #: templates/catalogue/book_list/chunk.html:6 msgid "Chunk settings" msgstr "Ustawienia części" @@ -288,14 +267,6 @@ msgstr "Ustawienia części" msgid "Book" msgstr "Książka" -#: templates/catalogue/document_create_missing.html:5 -msgid "Create a new book" -msgstr "Utwórz nową książkę" - -#: templates/catalogue/document_create_missing.html:11 -msgid "Create book" -msgstr "Utwórz książkę" - #: templates/catalogue/document_upload.html:8 msgid "Bulk documents upload" msgstr "Hurtowe dodawanie dokumentów" @@ -308,7 +279,7 @@ msgstr "" "Proszę wskazać archiwum ZIP z plikami XML w kodowaniu UTF-8. Pliki nie " "kończące się na .xml zostaną zignorowane." -#: templates/catalogue/document_upload.html:17 templatetags/catalogue.py:35 +#: templates/catalogue/document_upload.html:17 msgid "Upload" msgstr "Załaduj" @@ -361,70 +332,45 @@ msgstr "nie zalogowany" msgid "No activity recorded." msgstr "Nie zanotowano aktywności." -#: templates/catalogue/book_list/book.html:7 -#: templates/catalogue/book_list/book.html:28 -msgid "Book settings" -msgstr "Ustawienia książki" - -#: templates/catalogue/book_list/book_list.html:22 -msgid "Show hidden books" -msgstr "Pokaż ukryte książki" - #: templates/catalogue/book_list/book_list.html:27 -msgid "Search in book titles" -msgstr "Szukaj w tytułach książek" - -#: templates/catalogue/book_list/book_list.html:32 msgid "stage" msgstr "etap" -#: templates/catalogue/book_list/book_list.html:34 -#: templates/catalogue/book_list/book_list.html:45 -#: templates/catalogue/book_list/book_list.html:64 +#: templates/catalogue/book_list/book_list.html:29 +#: templates/catalogue/book_list/book_list.html:40 +#: templates/catalogue/book_list/book_list.html:51 msgid "none" msgstr "brak" -#: templates/catalogue/book_list/book_list.html:43 +#: templates/catalogue/book_list/book_list.html:38 msgid "editor" msgstr "redaktor" -#: templates/catalogue/book_list/book_list.html:54 -msgid "status" -msgstr "status" - -#: templates/catalogue/book_list/book_list.html:88 +#: templates/catalogue/book_list/book_list.html:76 #, python-format -msgid "%(c)s book" -msgid_plural "%(c)s books" -msgstr[0] "%(c)s książka" -msgstr[1] "%(c)s książki" -msgstr[2] "%(c)s książek" - -#: templates/catalogue/book_list/book_list.html:93 -msgid "No books found." -msgstr "Nie znaleziono książek." +msgid "%(c)s module" +msgid_plural "%(c)s modules" +msgstr[0] "%(c)s moduł" +msgstr[1] "%(c)s moduły" +msgstr[2] "%(c)s modułów" -#: templates/catalogue/book_list/book_list.html:99 +#: templates/catalogue/book_list/book_list.html:87 msgid "Set stage" msgstr "Ustaw etap" -#: templates/catalogue/book_list/book_list.html:100 +#: templates/catalogue/book_list/book_list.html:88 msgid "Set user" msgstr "Przypisz redaktora" -#: templates/catalogue/book_list/book_list.html:102 -msgid "Project" -msgstr "Projekt" - -#: templates/catalogue/book_list/book_list.html:103 +#: templates/catalogue/book_list/book_list.html:91 msgid "Mark publishable" msgstr "Oznacz do publikacji" -#: templates/catalogue/book_list/book_list.html:104 +#: templates/catalogue/book_list/book_list.html:92 msgid "Mark not publishable" msgstr "Odznacz do publikacji" -#: templates/catalogue/book_list/book_list.html:105 +#: templates/catalogue/book_list/book_list.html:93 msgid "Other user" msgstr "Inny użytkownik" @@ -460,10 +406,6 @@ msgstr "Wszystkie" msgid "Add" msgstr "Dodaj" -#: templatetags/catalogue.py:37 -msgid "Covers" -msgstr "Okładki" - #: templatetags/wall.py:49 msgid "Related edit" msgstr "Powiązana zmiana" @@ -476,6 +418,51 @@ msgstr "Zmiana" msgid "Comment" msgstr "Komentarz" +#~ msgid "Text file must be UTF-8 encoded." +#~ msgstr "Plik powinien mieć kodowanie UTF-8." + +#~ msgid "You must either enter text or upload a file" +#~ msgstr "Proszę wpisać tekst albo wybrać plik do załadowania" + +#~ msgid "scan gallery" +#~ msgstr "galeria skanów" + +#~ msgid "scan gallery name" +#~ msgstr "nazwa galerii skanów" + +#~ msgid "project" +#~ msgstr "projekt" + +#~ msgid "projects" +#~ msgstr "projekty" + +#~ msgid "Create a new book" +#~ msgstr "Utwórz nową książkę" + +#~ msgid "Create book" +#~ msgstr "Utwórz książkę" + +#~ msgid "Book settings" +#~ msgstr "Ustawienia książki" + +#~ msgid "Show hidden books" +#~ msgstr "Pokaż ukryte książki" + +#~ msgid "Search in book titles" +#~ msgstr "Szukaj w tytułach książek" + +#~ msgid "status" +#~ msgstr "status" + +#~ msgid "No books found." +#~ msgstr "Nie znaleziono książek." + +#~ msgid "Project" +#~ msgstr "Projekt" + +#~ msgid "Covers" +#~ msgstr "Okładki" + #~ msgid "Infobox" #~ msgstr "Informacje" diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py index 7c2bccc4..f07c9a83 100755 --- a/apps/catalogue/models/book.py +++ b/apps/catalogue/models/book.py @@ -28,7 +28,7 @@ class Book(models.Model): title = models.CharField(_('title'), max_length=255, db_index=True) slug = models.SlugField(_('slug'), max_length=128, unique=True, db_index=True) public = models.BooleanField(_('public'), default=True, db_index=True) - gallery = models.CharField(_('scan gallery name'), max_length=255, blank=True) + gallery = models.CharField(u'materiały', max_length=255, blank=True) project = models.ForeignKey(Project, null=True, blank=True) #wl_slug = models.CharField(_('title'), max_length=255, null=True, db_index=True, editable=False) @@ -52,8 +52,8 @@ class Book(models.Model): class Meta: app_label = 'catalogue' ordering = ['title', 'slug'] - verbose_name = _('book') - verbose_name_plural = _('books') + verbose_name = u'moduł' + verbose_name_plural = u'moduły' # Representing diff --git a/apps/catalogue/models/chunk.py b/apps/catalogue/models/chunk.py index 171ba533..70e185bb 100755 --- a/apps/catalogue/models/chunk.py +++ b/apps/catalogue/models/chunk.py @@ -41,6 +41,10 @@ class Chunk(dvcs_models.Document): verbose_name_plural = _('chunks') permissions = [('can_pubmark', 'Can mark for publishing')] + class TagMeta: + verbose_name = u'etap pracy' + verbose_name_plural = u'etapy pracy' + # Representing # ============ diff --git a/apps/catalogue/models/project.py b/apps/catalogue/models/project.py index eb951021..f9d7483f 100755 --- a/apps/catalogue/models/project.py +++ b/apps/catalogue/models/project.py @@ -16,8 +16,8 @@ class Project(models.Model): class Meta: app_label = 'catalogue' ordering = ['name'] - verbose_name = _('project') - verbose_name_plural = _('projects') + verbose_name = u'poziom edukacyjny' + verbose_name_plural = u'poziomy edukacyjne' def __unicode__(self): return self.name diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html index d2af462b..62345762 100644 --- a/apps/catalogue/templates/catalogue/base.html +++ b/apps/catalogue/templates/catalogue/base.html @@ -13,7 +13,7 @@
- +
diff --git a/apps/catalogue/templates/catalogue/book_list/book.html b/apps/catalogue/templates/catalogue/book_list/book.html index 5866e6ac..3ad8a65a 100755 --- a/apps/catalogue/templates/catalogue/book_list/book.html +++ b/apps/catalogue/templates/catalogue/book_list/book.html @@ -4,8 +4,6 @@ {% with book.0 as chunk %} - [B] - [c] {{ book.title }} @@ -14,26 +12,17 @@ {% else %}– {% endif %} {% if chunk.user %}{{ chunk.user.first_name }} {{ chunk.user.last_name }}{% endif %} - - {% if chunk.published %}P{% endif %} - {% if book.new_publishable %}p{% endif %} - {% if chunk.changed %}+{% endif %} - {{ book.project.name }} + Materiały {% endwith %} {% else %} - [B] - {{ book.title }} - - {% if book.published %}P{% endif %} - {% if book.new_publishable %}p{% endif %} - {{ book.project.name }} + {% endif %} diff --git a/apps/catalogue/templates/catalogue/book_list/book_list.html b/apps/catalogue/templates/catalogue/book_list/book_list.html index 90ae183f..ded59227 100755 --- a/apps/catalogue/templates/catalogue/book_list/book_list.html +++ b/apps/catalogue/templates/catalogue/book_list/book_list.html @@ -17,14 +17,9 @@ - - @@ -50,16 +45,8 @@ {% endif %} - - + {% with cnt=books|length %} @@ -85,12 +73,12 @@ {% endfor %} + {% blocktrans count c=cnt %}{{c}} module{% plural %}{{c}} modules{% endblocktrans %} {% endwith %}
- -
-
{% paginate %} - {% blocktrans count c=cnt %}{{c}} book{% plural %}{{c}} books{% endblocktrans %}
{% if not books %} -

{% trans "No books found." %}

+

Nie znaleziono modułów.

{% endif %} {% endblock content %} diff --git a/apps/catalogue/templatetags/catalogue.py b/apps/catalogue/templatetags/catalogue.py index 8d5ff65b..7f372f7d 100644 --- a/apps/catalogue/templatetags/catalogue.py +++ b/apps/catalogue/templatetags/catalogue.py @@ -32,9 +32,6 @@ def main_tabs(context): if user.has_perm('catalogue.add_book'): tabs.append(Tab('create', _('Add'), reverse("catalogue_create_missing"))) - tabs.append(Tab('upload', _('Upload'), reverse("catalogue_upload"))) - - tabs.append(Tab('cover', _('Covers'), reverse("cover_image_list"))) return {"tabs": tabs, "active_tab": active} diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 9bd69f8b..77a925e4 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from datetime import datetime, date, timedelta import logging import os @@ -114,12 +115,11 @@ def create_missing(request, slug=None): gallery=form.cleaned_data['gallery'], ) - return http.HttpResponseRedirect(reverse("catalogue_book", args=[book.slug])) + return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug])) else: form = forms.DocumentCreateForm(initial={ "slug": slug, "title": slug.replace('-', ' ').title(), - "gallery": slug, }) return render(request, "catalogue/document_create_missing.html", { @@ -501,9 +501,9 @@ class GalleryView(GalleryMixin, UploadView): def breadcrumbs(self): return [ - (_('books'), reverse('catalogue_document_list')), + (u'moduły', reverse('catalogue_document_list')), (self.object.title, self.object.get_absolute_url()), - (_('scan gallery'),), + (u'materiały'), ] diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py index cf8d75dc..eba2c386 100644 --- a/apps/dvcs/models.py +++ b/apps/dvcs/models.py @@ -176,6 +176,10 @@ def create_tag_model(model): class Meta(Tag.Meta): app_label = model._meta.app_label + if hasattr(model, 'TagMeta'): + for attr, value in model.TagMeta.__dict__.items(): + setattr(Meta, attr, value) + attrs = { '__module__': model.__module__, 'Meta': Meta, diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index c9a4616f..2fe69a13 100644 --- a/redakcja/settings/common.py +++ b/redakcja/settings/common.py @@ -86,7 +86,7 @@ MIDDLEWARE_CLASSES = ( AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', - 'django_cas.backends.CASBackend', + 'fnpdjango.auth_backends.AttrCASBackend', ) ROOT_URLCONF = 'redakcja.urls' diff --git a/redakcja/static/css/filelist.css b/redakcja/static/css/filelist.css index e9b58ca7..9f32d2c8 100644 --- a/redakcja/static/css/filelist.css +++ b/redakcja/static/css/filelist.css @@ -36,7 +36,7 @@ td { } #tabs-nav-left { - margin-left: 60px; + margin-left: 80px; } #tabs-nav-left a { diff --git a/requirements.txt b/requirements.txt index e741a1b2..d81e4d41 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,7 @@ django-pagination django-gravatar django-celery django-kombu +fnpdjango # migrations south>=0.6 -- 2.20.1