Visual changes, removing some items not applicable in the ER editing context.

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 285e58e..85f92ef 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -15,36 +15,28 @@ class DocumentCreateForm(forms.ModelForm):
     """
         Form used for creating new documents.
     """
     """
         Form used for creating new documents.
     """

-    file = forms.FileField(required=False)

     template = forms.ModelChoiceField(Template.objects, required=False)
     template = forms.ModelChoiceField(Template.objects, required=False)

-    text = forms.CharField(required=False, widget=forms.Textarea)

 
     class Meta:
         model = Book
 
     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'}
 
     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()
         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']
         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
 
             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
 
 
         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 b6a12e3..0187fa8 100644 (file)
Binary files a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo and b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index 6790400..5f5148e 100644 (file)
--- 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"
 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 <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"


@@ -20,55 +20,43 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.5.4\n"
 
 "|| 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 #, 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."
 
 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."
 
 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ł"
 #: models/book.py:28 models/chunk.py:23
 msgid "title"
 msgstr "tytuł"


@@ -81,10 +69,6 @@ msgstr "slug"
 msgid "public"
 msgstr "publiczna"
 
 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"
 #: models/book.py:35
 msgid "parent"
 msgstr "rodzic"


@@ -97,6 +81,10 @@ msgstr "numeracja rodzica"
 msgid "book"
 msgstr "książka"
 
 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."
 #: 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"
 
 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"
 #: 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
 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"
 #: 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"
 
 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"
 #: 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 <code>.xml</code> zostaną zignorowane."
 
 "Proszę wskazać archiwum ZIP z plikami XML w kodowaniu UTF-8. Pliki nie "
 "kończące się na <code>.xml</code> zostaną zignorowane."
 

-#: templates/catalogue/document_upload.html:17 templatetags/catalogue.py:35
+#: templates/catalogue/document_upload.html:17

 msgid "Upload"
 msgstr "Załaduj"
 
 msgid "Upload"
 msgstr "Załaduj"
 


@@ -361,70 +332,45 @@ msgstr "nie zalogowany"
 msgid "No activity recorded."
 msgstr "Nie zanotowano aktywności."
 
 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
 #: 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"
 
 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"
 
 msgid "none"
 msgstr "brak"
 

-#: templates/catalogue/book_list/book_list.html:43
+#: templates/catalogue/book_list/book_list.html:38

 msgid "editor"
 msgstr "redaktor"
 
 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
 #, 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 msgid "Other user"
 msgstr "Inny użytkownik"
 


@@ -460,10 +406,6 @@ msgstr "Wszystkie"
 msgid "Add"
 msgstr "Dodaj"
 
 msgid "Add"
 msgstr "Dodaj"
 

-#: templatetags/catalogue.py:37
-msgid "Covers"
-msgstr "Okładki"
-

 #: templatetags/wall.py:49
 msgid "Related edit"
 msgstr "Powiązana zmiana"
 #: templatetags/wall.py:49
 msgid "Related edit"
 msgstr "Powiązana zmiana"


@@ -476,6 +418,51 @@ msgstr "Zmiana"
 msgid "Comment"
 msgstr "Komentarz"
 
 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"
 
 #~ msgid "Infobox"
 #~ msgstr "Informacje"
 

diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py
index 7c2bccc..f07c9a8 100755 (executable)
--- 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)
     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)
     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']
     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
 
 
     # Representing

diff --git a/apps/catalogue/models/chunk.py b/apps/catalogue/models/chunk.py
index 171ba53..70e185b 100755 (executable)
--- 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')]
 
         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
     # ============
 
     # Representing
     # ============
 

diff --git a/apps/catalogue/models/project.py b/apps/catalogue/models/project.py
index eb95102..f9d7483 100755 (executable)
--- 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']
     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
 
     def __unicode__(self):
         return self.name

diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html
index d2af462..6234576 100644 (file)
--- a/apps/catalogue/templates/catalogue/base.html
+++ b/apps/catalogue/templates/catalogue/base.html
@@ -13,7 +13,7 @@
 <div id="tabs-nav">
 
     <a href="{% url 'catalogue_document_list' %}">
 <div id="tabs-nav">
 
     <a href="{% url 'catalogue_document_list' %}">

-        <img id="logo" src="{{ STATIC_URL }}img/wl-orange.png" />
+        <img src="http://edukacjamedialna.edu.pl/static/img/logo.png" id="logo" width="70px">

     </a>
 
     <div id="tabs-nav-left">
     </a>
 
     <div id="tabs-nav-left">

diff --git a/apps/catalogue/templates/catalogue/book_list/book.html b/apps/catalogue/templates/catalogue/book_list/book.html
index 5866e6a..3ad8a65 100755 (executable)
--- 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 %}
     <tr>
         <td><input type="checkbox" name="select_book" value="{{book.id}}" data-chunk-id="{{chunk.id}}"/></td>
     {% with book.0 as chunk %}
     <tr>
         <td><input type="checkbox" name="select_book" value="{{book.id}}" data-chunk-id="{{chunk.id}}"/></td>

-        <td><a href="{% url 'catalogue_book' book.slug %}" title='{% trans "Book settings" %}'>[B]</a></td>
-        <td><a href="{% url 'catalogue_chunk_edit' book.slug chunk.slug %}" title='{% trans "Chunk settings" %}'>[c]</a></td>

         <td><a target="_blank"
                     href="{% url 'wiki_editor' book.slug %}">
                     {{ book.title }}</a></td>
         <td><a target="_blank"
                     href="{% url 'wiki_editor' book.slug %}">
                     {{ book.title }}</a></td>


@@ -14,26 +12,17 @@
         {% else %}–
         {% endif %}</td>
         <td class='user-column'>{% if chunk.user %}<a href="{% url 'catalogue_user' chunk.user.username %}">{{ chunk.user.first_name }} {{ chunk.user.last_name }}</a>{% endif %}</td>
         {% else %}–
         {% endif %}</td>
         <td class='user-column'>{% if chunk.user %}<a href="{% url 'catalogue_user' chunk.user.username %}">{{ chunk.user.first_name }} {{ chunk.user.last_name }}</a>{% endif %}</td>

-        <td>
-            {% if chunk.published %}P{% endif %}
-            {% if book.new_publishable %}p{% endif %}
-            {% if chunk.changed %}+{% endif %}
-        </td>

         <td>{{ book.project.name }}</td>
         <td>{{ book.project.name }}</td>

+        <td><a href="{% url 'catalogue_book_gallery' book.slug %}">Materiały</a></td>

     </tr>
     {% endwith %}
 {% else %}
     <tr>
         <td><input type="checkbox" name="select_book" value="{{book.id}}"/></td>
     </tr>
     {% endwith %}
 {% else %}
     <tr>
         <td><input type="checkbox" name="select_book" value="{{book.id}}"/></td>

-        <td class='book-settings-link'><a href="{% url 'catalogue_book' book.slug %}" title='{% trans "Book settings" %}'>[B]</a></td>
-        <td></td>

         <td>{{ book.title }}</td>
         <td></td>
         <td class='user-column'></td>
         <td>{{ book.title }}</td>
         <td></td>
         <td class='user-column'></td>

-        <td>
-            {% if book.published %}P{% endif %}
-            {% if book.new_publishable %}p{% endif %}
-        </td>

         <td>{{ book.project.name }}</td>
         <td>{{ book.project.name }}</td>

+        <td></td>

     </tr>
 {% endif %}
     </tr>
 {% endif %}

diff --git a/apps/catalogue/templates/catalogue/book_list/book_list.html b/apps/catalogue/templates/catalogue/book_list/book_list.html
index 90ae183..ded5922 100755 (executable)
--- a/apps/catalogue/templates/catalogue/book_list/book_list.html
+++ b/apps/catalogue/templates/catalogue/book_list/book_list.html
@@ -17,14 +17,9 @@
 <table id="file-list"{% if viewed_user %} class="book-list-user"{% endif %}>
     <thead><tr>
        <th></th>
 <table id="file-list"{% if viewed_user %} class="book-list-user"{% endif %}>
     <thead><tr>
        <th></th>

-        <th></th>
-        <th>
-            <input class='check-filter' type='checkbox' name='all' title='{% trans "Show hidden books" %}'
-                {% if request.GET.all %}checked='checked'{% endif %} />
-            </th>

         <th class='book-search-column'>
             <form>
         <th class='book-search-column'>
             <form>

-            <input title='{% trans "Search in book titles" %}' name="title"
+            <input title='Szukaj w tytułach modułów' name="title"

                 class='text-filter' value="{{ request.GET.title }}" />
             </form>
         </th>
                 class='text-filter' value="{{ request.GET.title }}" />
             </form>
         </th>


@@ -50,16 +45,8 @@
             </select></th>
         {% endif %}
 
             </select></th>
         {% endif %}
 

-        <th><select name="status" class="filter">
-            <option value=''>- {% trans "status" %} -</option>
-            {% for state, label in states %}
-                <option {% if request.GET.status == state %}selected="selected"
-                        {% endif %}value='{{ state }}'>{{ label }}</option>
-            {% endfor %}
-        </select></th>
-

         <th><select name="project" class="filter">
         <th><select name="project" class="filter">

-            <option value=''>- {% trans "project" %} -</option>
+            <option value=''>- poziom edukacyjny -</option>

                 <option {% if request.GET.project == '-' %}selected="selected"
                         {% endif %}value="-">- {% trans "none" %} -</option>
             {% for project in projects %}
                 <option {% if request.GET.project == '-' %}selected="selected"
                         {% endif %}value="-">- {% trans "none" %} -</option>
             {% for project in projects %}


@@ -68,6 +55,7 @@
             {% endfor %}
         </select></th>
 
             {% endfor %}
         </select></th>
 

+        <th></th>

     </tr></thead>
 
     {% with cnt=books|length %}
     </tr></thead>
 
     {% with cnt=books|length %}


@@ -85,12 +73,12 @@
     {% endfor %}
     <tr><th class='paginator' colspan="5">
         {% paginate %}
     {% endfor %}
     <tr><th class='paginator' colspan="5">
         {% paginate %}

-        {% blocktrans count c=cnt %}{{c}} book{% plural %}{{c}} books{% endblocktrans %}</th></tr>
+        {% blocktrans count c=cnt %}{{c}} module{% plural %}{{c}} modules{% endblocktrans %}</th></tr>

     </tbody>
     {% endwith %}
 </table>
 {% if not books %}
     </tbody>
     {% endwith %}
 </table>
 {% if not books %}

-    <p>{% trans "No books found." %}</p>
+    <p>Nie znaleziono modułów.</p>

 {% endif %}
 
 <form id='chunk_mass_edit' action='{% url "catalogue_chunk_mass_edit" %}' style="display:none;">
 {% endif %}
 
 <form id='chunk_mass_edit' action='{% url "catalogue_chunk_mass_edit" %}' style="display:none;">


@@ -99,7 +87,7 @@
 <label for="mass_edit_stage">{% trans "Set stage" %}</label><input type="hidden" name="stage" id="mass_edit_stage"/>
 <label for="mass_edit_user">{% trans "Set user" %}</label><input type="hidden" name="user" id="mass_edit_stage" />
 <input type="hidden" name="status" />
 <label for="mass_edit_stage">{% trans "Set stage" %}</label><input type="hidden" name="stage" id="mass_edit_stage"/>
 <label for="mass_edit_user">{% trans "Set user" %}</label><input type="hidden" name="user" id="mass_edit_stage" />
 <input type="hidden" name="status" />

-<label for="mass_edit_project">{% trans "Project" %}</label><input type="hidden" name="project" id="mass_edit_project" />
+<label for="mass_edit_project">Poziom edukacyjny</label><input type="hidden" name="project" id="mass_edit_project" />

 <label for="mass_edit_publish">{% trans "Mark publishable" %}</label>
 <label for="mass_edit_unpublish">{% trans "Mark not publishable" %}</label>
 <label for="mass_edit_other">{% trans "Other user" %}</label>
 <label for="mass_edit_publish">{% trans "Mark publishable" %}</label>
 <label for="mass_edit_unpublish">{% trans "Mark not publishable" %}</label>
 <label for="mass_edit_other">{% trans "Other user" %}</label>

diff --git a/apps/catalogue/templates/catalogue/document_create_missing.html b/apps/catalogue/templates/catalogue/document_create_missing.html
index 47c99f9..4a3baf5 100644 (file)
--- a/apps/catalogue/templates/catalogue/document_create_missing.html
+++ b/apps/catalogue/templates/catalogue/document_create_missing.html
@@ -2,13 +2,13 @@
 {% load i18n %}
 
 {% block content %}
 {% load i18n %}
 
 {% block content %}

-    <h1>{% trans "Create a new book" %}</h1>
+    <h1>Utwórz nowy moduł</h1>

 
     <form enctype="multipart/form-data" method="POST">
     {% csrf_token %}
     <table class='editable'>
         {{ form.as_table}}
 
     <form enctype="multipart/form-data" method="POST">
     {% csrf_token %}
     <table class='editable'>
         {{ form.as_table}}

-        <tr><td></td><td><button type="submit">{% trans "Create book" %}</button></td></tr>
+        <tr><td></td><td><button type="submit">Utwórz moduł</button></td></tr>

     </table>
     </form>
 {% endblock content %}
     </table>
     </form>
 {% endblock content %}

diff --git a/apps/catalogue/templatetags/catalogue.py b/apps/catalogue/templatetags/catalogue.py
index 8d5ff65..7f372f7 100644 (file)
--- 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")))
 
     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}
 
 
     return {"tabs": tabs, "active_tab": active}
 

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 9bd69f8..77a925e 100644 (file)
--- 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
 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'],
             )
 
                 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(),
     else:
         form = forms.DocumentCreateForm(initial={
                 "slug": slug,
                 "title": slug.replace('-', ' ').title(),

-                "gallery": slug,

         })
 
     return render(request, "catalogue/document_create_missing.html", {
         })
 
     return render(request, "catalogue/document_create_missing.html", {


@@ -501,9 +501,9 @@ class GalleryView(GalleryMixin, UploadView):
 
     def breadcrumbs(self):
         return [
 
     def breadcrumbs(self):
         return [

-            (_('books'), reverse('catalogue_document_list')),
+            (u'moduły', reverse('catalogue_document_list')),

             (self.object.title, self.object.get_absolute_url()),
             (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 cf8d75d..eba2c38 100644 (file)
--- 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
 
     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,
     attrs = {
         '__module__': model.__module__,
         'Meta': Meta,

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index c9a4616..2fe69a1 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -86,7 +86,7 @@ MIDDLEWARE_CLASSES = (
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',

-    'django_cas.backends.CASBackend',
+    'fnpdjango.auth_backends.AttrCASBackend',

 )
 
 ROOT_URLCONF = 'redakcja.urls'
 )
 
 ROOT_URLCONF = 'redakcja.urls'

diff --git a/redakcja/static/css/filelist.css b/redakcja/static/css/filelist.css
index e9b58ca..9f32d2c 100644 (file)
--- a/redakcja/static/css/filelist.css
+++ b/redakcja/static/css/filelist.css
@@ -36,7 +36,7 @@ td {
 }
 
 #tabs-nav-left {
 }
 
 #tabs-nav-left {

-    margin-left: 60px;
+    margin-left: 80px;

 }
 
 #tabs-nav-left a {
 }
 
 #tabs-nav-left a {

diff --git a/requirements.txt b/requirements.txt
index e741a1b..d81e4d4 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,7 @@ django-pagination
 django-gravatar
 django-celery
 django-kombu
 django-gravatar
 django-celery
 django-kombu

+fnpdjango

 
 # migrations
 south>=0.6
 
 # migrations
 south>=0.6