From 0cae17bec6d31806615fae59a5b3945016285fbe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20St=C4=99pniowski?= Date: Sun, 7 Sep 2008 22:27:14 +0200 Subject: [PATCH 1/1] Moved catalogue, chunks, compress, newtagging and pagination applications to apps directory. --- {catalogue => apps/catalogue}/__init__.py | 0 {catalogue => apps/catalogue}/admin.py | 0 {catalogue => apps/catalogue}/fields.py | 0 {catalogue => apps/catalogue}/forms.py | 0 {catalogue => apps/catalogue}/management/__init__.py | 0 .../catalogue}/management/commands/__init__.py | 0 .../catalogue}/management/commands/importbooks.py | 0 {catalogue => apps/catalogue}/models.py | 10 +++++----- {catalogue => apps/catalogue}/templatetags/__init__.py | 0 .../catalogue}/templatetags/catalogue_tags.py | 2 +- {catalogue => apps/catalogue}/urls.py | 0 {catalogue => apps/catalogue}/utils.py | 0 {catalogue => apps/catalogue}/views.py | 0 {chunks => apps/chunks}/__init__.py | 0 {chunks => apps/chunks}/admin.py | 0 {chunks => apps/chunks}/models.py | 0 {chunks => apps/chunks}/templatetags/__init__.py | 0 {chunks => apps/chunks}/templatetags/chunks.py | 0 {compress => apps/compress}/__init__.py | 0 {compress => apps/compress}/conf/__init__.py | 0 {compress => apps/compress}/conf/settings.py | 0 {compress => apps/compress}/filter_base.py | 0 {compress => apps/compress}/filters/__init__.py | 0 .../compress}/filters/csstidy/__init__.py | 0 .../compress}/filters/csstidy_python/__init__.py | 0 .../compress}/filters/csstidy_python/csstidy.py | 0 .../compress}/filters/csstidy_python/data.py | 0 .../compress}/filters/csstidy_python/optimizer.py | 0 .../compress}/filters/csstidy_python/output.py | 0 .../compress}/filters/csstidy_python/tools.py | 0 {compress => apps/compress}/filters/jsmin/__init__.py | 0 {compress => apps/compress}/filters/jsmin/jsmin.py | 0 {compress => apps/compress}/filters/yui/__init__.py | 0 {compress => apps/compress}/management/__init__.py | 0 .../compress}/management/commands/__init__.py | 0 .../compress}/management/commands/synccompress.py | 0 {compress => apps/compress}/models.py | 0 {compress => apps/compress}/signals.py | 0 .../compress}/templates/compress/css.html | 0 .../compress}/templates/compress/css_ie.html | 0 {compress => apps/compress}/templates/compress/js.html | 0 .../compress}/templates/compress/js_ie.html | 0 {compress => apps/compress}/templatetags/__init__.py | 0 {compress => apps/compress}/templatetags/compressed.py | 0 {compress => apps/compress}/utils.py | 0 {newtagging => apps/newtagging}/__init__.py | 0 {newtagging => apps/newtagging}/admin.py | 0 {newtagging => apps/newtagging}/managers.py | 0 {newtagging => apps/newtagging}/models.py | 0 {newtagging => apps/newtagging}/views.py | 0 {pagination => apps/pagination}/__init__.py | 0 {pagination => apps/pagination}/middleware.py | 0 {pagination => apps/pagination}/models.py | 0 .../pagination}/templates/pagination/pagination.html | 0 .../pagination}/templatetags/__init__.py | 0 .../pagination}/templatetags/pagination_tags.py | 0 {pagination => apps/pagination}/tests.py | 0 57 files changed, 6 insertions(+), 6 deletions(-) rename {catalogue => apps/catalogue}/__init__.py (100%) rename {catalogue => apps/catalogue}/admin.py (100%) rename {catalogue => apps/catalogue}/fields.py (100%) rename {catalogue => apps/catalogue}/forms.py (100%) rename {catalogue => apps/catalogue}/management/__init__.py (100%) rename {catalogue => apps/catalogue}/management/commands/__init__.py (100%) rename {catalogue => apps/catalogue}/management/commands/importbooks.py (100%) rename {catalogue => apps/catalogue}/models.py (96%) rename {catalogue => apps/catalogue}/templatetags/__init__.py (100%) rename {catalogue => apps/catalogue}/templatetags/catalogue_tags.py (99%) rename {catalogue => apps/catalogue}/urls.py (100%) rename {catalogue => apps/catalogue}/utils.py (100%) rename {catalogue => apps/catalogue}/views.py (100%) rename {chunks => apps/chunks}/__init__.py (100%) rename {chunks => apps/chunks}/admin.py (100%) rename {chunks => apps/chunks}/models.py (100%) rename {chunks => apps/chunks}/templatetags/__init__.py (100%) rename {chunks => apps/chunks}/templatetags/chunks.py (100%) rename {compress => apps/compress}/__init__.py (100%) rename {compress => apps/compress}/conf/__init__.py (100%) rename {compress => apps/compress}/conf/settings.py (100%) rename {compress => apps/compress}/filter_base.py (100%) rename {compress => apps/compress}/filters/__init__.py (100%) rename {compress => apps/compress}/filters/csstidy/__init__.py (100%) rename {compress => apps/compress}/filters/csstidy_python/__init__.py (100%) rename {compress => apps/compress}/filters/csstidy_python/csstidy.py (100%) rename {compress => apps/compress}/filters/csstidy_python/data.py (100%) rename {compress => apps/compress}/filters/csstidy_python/optimizer.py (100%) rename {compress => apps/compress}/filters/csstidy_python/output.py (100%) rename {compress => apps/compress}/filters/csstidy_python/tools.py (100%) rename {compress => apps/compress}/filters/jsmin/__init__.py (100%) rename {compress => apps/compress}/filters/jsmin/jsmin.py (100%) rename {compress => apps/compress}/filters/yui/__init__.py (100%) rename {compress => apps/compress}/management/__init__.py (100%) rename {compress => apps/compress}/management/commands/__init__.py (100%) rename {compress => apps/compress}/management/commands/synccompress.py (100%) rename {compress => apps/compress}/models.py (100%) rename {compress => apps/compress}/signals.py (100%) rename {compress => apps/compress}/templates/compress/css.html (100%) rename {compress => apps/compress}/templates/compress/css_ie.html (100%) rename {compress => apps/compress}/templates/compress/js.html (100%) rename {compress => apps/compress}/templates/compress/js_ie.html (100%) rename {compress => apps/compress}/templatetags/__init__.py (100%) rename {compress => apps/compress}/templatetags/compressed.py (100%) rename {compress => apps/compress}/utils.py (100%) rename {newtagging => apps/newtagging}/__init__.py (100%) rename {newtagging => apps/newtagging}/admin.py (100%) rename {newtagging => apps/newtagging}/managers.py (100%) rename {newtagging => apps/newtagging}/models.py (100%) rename {newtagging => apps/newtagging}/views.py (100%) rename {pagination => apps/pagination}/__init__.py (100%) rename {pagination => apps/pagination}/middleware.py (100%) rename {pagination => apps/pagination}/models.py (100%) rename {pagination => apps/pagination}/templates/pagination/pagination.html (100%) rename {pagination => apps/pagination}/templatetags/__init__.py (100%) rename {pagination => apps/pagination}/templatetags/pagination_tags.py (100%) rename {pagination => apps/pagination}/tests.py (100%) diff --git a/catalogue/__init__.py b/apps/catalogue/__init__.py similarity index 100% rename from catalogue/__init__.py rename to apps/catalogue/__init__.py diff --git a/catalogue/admin.py b/apps/catalogue/admin.py similarity index 100% rename from catalogue/admin.py rename to apps/catalogue/admin.py diff --git a/catalogue/fields.py b/apps/catalogue/fields.py similarity index 100% rename from catalogue/fields.py rename to apps/catalogue/fields.py diff --git a/catalogue/forms.py b/apps/catalogue/forms.py similarity index 100% rename from catalogue/forms.py rename to apps/catalogue/forms.py diff --git a/catalogue/management/__init__.py b/apps/catalogue/management/__init__.py similarity index 100% rename from catalogue/management/__init__.py rename to apps/catalogue/management/__init__.py diff --git a/catalogue/management/commands/__init__.py b/apps/catalogue/management/commands/__init__.py similarity index 100% rename from catalogue/management/commands/__init__.py rename to apps/catalogue/management/commands/__init__.py diff --git a/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py similarity index 100% rename from catalogue/management/commands/importbooks.py rename to apps/catalogue/management/commands/importbooks.py diff --git a/catalogue/models.py b/apps/catalogue/models.py similarity index 96% rename from catalogue/models.py rename to apps/catalogue/models.py index f3f6bc2d5..9786150e6 100644 --- a/catalogue/models.py +++ b/apps/catalogue/models.py @@ -102,8 +102,8 @@ class Book(models.Model): if self.odt_file: formats.append(u'Plik ODT' % self.odt_file.url) - self._short_html = render_to_string('catalogue/book_short.html', - {'book': self, 'tags': tags, 'formats': formats}) + self._short_html = unicode(render_to_string('catalogue/book_short.html', + {'book': self, 'tags': tags, 'formats': formats})) self.save() return mark_safe(self._short_html) @@ -172,7 +172,7 @@ class Book(models.Model): text = fragment.to_string() short_text = '' if (len(MarkupString(text)) > 240): - short_text = MarkupString(text)[:160] + short_text = unicode(MarkupString(text)[:160]) new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book) theme_names = [s.strip() for s in fragment.themes.split(',')] @@ -221,8 +221,8 @@ class Fragment(models.Model): book_authors = [u'%s' % (tag.get_absolute_url(), tag.name) for tag in self.book.tags if tag.category == 'author'] - self._short_html = render_to_string('catalogue/fragment_short.html', - {'fragment': self, 'book': self.book, 'book_authors': book_authors}) + self._short_html = unicode(render_to_string('catalogue/fragment_short.html', + {'fragment': self, 'book': self.book, 'book_authors': book_authors})) self.save() return mark_safe(self._short_html) diff --git a/catalogue/templatetags/__init__.py b/apps/catalogue/templatetags/__init__.py similarity index 100% rename from catalogue/templatetags/__init__.py rename to apps/catalogue/templatetags/__init__.py diff --git a/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py similarity index 99% rename from catalogue/templatetags/catalogue_tags.py rename to apps/catalogue/templatetags/catalogue_tags.py index 12460a0c8..8cce80de5 100644 --- a/catalogue/templatetags/catalogue_tags.py +++ b/apps/catalogue/templatetags/catalogue_tags.py @@ -110,7 +110,7 @@ def authentication_form(): @register.inclusion_tag('catalogue/breadcrumbs.html') def breadcrumbs(tags, search_form=True): - from wolnelektury.catalogue.forms import SearchForm + from catalogue.forms import SearchForm context = {'tag_list': tags} if search_form: context['search_form'] = SearchForm(tags=tags) diff --git a/catalogue/urls.py b/apps/catalogue/urls.py similarity index 100% rename from catalogue/urls.py rename to apps/catalogue/urls.py diff --git a/catalogue/utils.py b/apps/catalogue/utils.py similarity index 100% rename from catalogue/utils.py rename to apps/catalogue/utils.py diff --git a/catalogue/views.py b/apps/catalogue/views.py similarity index 100% rename from catalogue/views.py rename to apps/catalogue/views.py diff --git a/chunks/__init__.py b/apps/chunks/__init__.py similarity index 100% rename from chunks/__init__.py rename to apps/chunks/__init__.py diff --git a/chunks/admin.py b/apps/chunks/admin.py similarity index 100% rename from chunks/admin.py rename to apps/chunks/admin.py diff --git a/chunks/models.py b/apps/chunks/models.py similarity index 100% rename from chunks/models.py rename to apps/chunks/models.py diff --git a/chunks/templatetags/__init__.py b/apps/chunks/templatetags/__init__.py similarity index 100% rename from chunks/templatetags/__init__.py rename to apps/chunks/templatetags/__init__.py diff --git a/chunks/templatetags/chunks.py b/apps/chunks/templatetags/chunks.py similarity index 100% rename from chunks/templatetags/chunks.py rename to apps/chunks/templatetags/chunks.py diff --git a/compress/__init__.py b/apps/compress/__init__.py similarity index 100% rename from compress/__init__.py rename to apps/compress/__init__.py diff --git a/compress/conf/__init__.py b/apps/compress/conf/__init__.py similarity index 100% rename from compress/conf/__init__.py rename to apps/compress/conf/__init__.py diff --git a/compress/conf/settings.py b/apps/compress/conf/settings.py similarity index 100% rename from compress/conf/settings.py rename to apps/compress/conf/settings.py diff --git a/compress/filter_base.py b/apps/compress/filter_base.py similarity index 100% rename from compress/filter_base.py rename to apps/compress/filter_base.py diff --git a/compress/filters/__init__.py b/apps/compress/filters/__init__.py similarity index 100% rename from compress/filters/__init__.py rename to apps/compress/filters/__init__.py diff --git a/compress/filters/csstidy/__init__.py b/apps/compress/filters/csstidy/__init__.py similarity index 100% rename from compress/filters/csstidy/__init__.py rename to apps/compress/filters/csstidy/__init__.py diff --git a/compress/filters/csstidy_python/__init__.py b/apps/compress/filters/csstidy_python/__init__.py similarity index 100% rename from compress/filters/csstidy_python/__init__.py rename to apps/compress/filters/csstidy_python/__init__.py diff --git a/compress/filters/csstidy_python/csstidy.py b/apps/compress/filters/csstidy_python/csstidy.py similarity index 100% rename from compress/filters/csstidy_python/csstidy.py rename to apps/compress/filters/csstidy_python/csstidy.py diff --git a/compress/filters/csstidy_python/data.py b/apps/compress/filters/csstidy_python/data.py similarity index 100% rename from compress/filters/csstidy_python/data.py rename to apps/compress/filters/csstidy_python/data.py diff --git a/compress/filters/csstidy_python/optimizer.py b/apps/compress/filters/csstidy_python/optimizer.py similarity index 100% rename from compress/filters/csstidy_python/optimizer.py rename to apps/compress/filters/csstidy_python/optimizer.py diff --git a/compress/filters/csstidy_python/output.py b/apps/compress/filters/csstidy_python/output.py similarity index 100% rename from compress/filters/csstidy_python/output.py rename to apps/compress/filters/csstidy_python/output.py diff --git a/compress/filters/csstidy_python/tools.py b/apps/compress/filters/csstidy_python/tools.py similarity index 100% rename from compress/filters/csstidy_python/tools.py rename to apps/compress/filters/csstidy_python/tools.py diff --git a/compress/filters/jsmin/__init__.py b/apps/compress/filters/jsmin/__init__.py similarity index 100% rename from compress/filters/jsmin/__init__.py rename to apps/compress/filters/jsmin/__init__.py diff --git a/compress/filters/jsmin/jsmin.py b/apps/compress/filters/jsmin/jsmin.py similarity index 100% rename from compress/filters/jsmin/jsmin.py rename to apps/compress/filters/jsmin/jsmin.py diff --git a/compress/filters/yui/__init__.py b/apps/compress/filters/yui/__init__.py similarity index 100% rename from compress/filters/yui/__init__.py rename to apps/compress/filters/yui/__init__.py diff --git a/compress/management/__init__.py b/apps/compress/management/__init__.py similarity index 100% rename from compress/management/__init__.py rename to apps/compress/management/__init__.py diff --git a/compress/management/commands/__init__.py b/apps/compress/management/commands/__init__.py similarity index 100% rename from compress/management/commands/__init__.py rename to apps/compress/management/commands/__init__.py diff --git a/compress/management/commands/synccompress.py b/apps/compress/management/commands/synccompress.py similarity index 100% rename from compress/management/commands/synccompress.py rename to apps/compress/management/commands/synccompress.py diff --git a/compress/models.py b/apps/compress/models.py similarity index 100% rename from compress/models.py rename to apps/compress/models.py diff --git a/compress/signals.py b/apps/compress/signals.py similarity index 100% rename from compress/signals.py rename to apps/compress/signals.py diff --git a/compress/templates/compress/css.html b/apps/compress/templates/compress/css.html similarity index 100% rename from compress/templates/compress/css.html rename to apps/compress/templates/compress/css.html diff --git a/compress/templates/compress/css_ie.html b/apps/compress/templates/compress/css_ie.html similarity index 100% rename from compress/templates/compress/css_ie.html rename to apps/compress/templates/compress/css_ie.html diff --git a/compress/templates/compress/js.html b/apps/compress/templates/compress/js.html similarity index 100% rename from compress/templates/compress/js.html rename to apps/compress/templates/compress/js.html diff --git a/compress/templates/compress/js_ie.html b/apps/compress/templates/compress/js_ie.html similarity index 100% rename from compress/templates/compress/js_ie.html rename to apps/compress/templates/compress/js_ie.html diff --git a/compress/templatetags/__init__.py b/apps/compress/templatetags/__init__.py similarity index 100% rename from compress/templatetags/__init__.py rename to apps/compress/templatetags/__init__.py diff --git a/compress/templatetags/compressed.py b/apps/compress/templatetags/compressed.py similarity index 100% rename from compress/templatetags/compressed.py rename to apps/compress/templatetags/compressed.py diff --git a/compress/utils.py b/apps/compress/utils.py similarity index 100% rename from compress/utils.py rename to apps/compress/utils.py diff --git a/newtagging/__init__.py b/apps/newtagging/__init__.py similarity index 100% rename from newtagging/__init__.py rename to apps/newtagging/__init__.py diff --git a/newtagging/admin.py b/apps/newtagging/admin.py similarity index 100% rename from newtagging/admin.py rename to apps/newtagging/admin.py diff --git a/newtagging/managers.py b/apps/newtagging/managers.py similarity index 100% rename from newtagging/managers.py rename to apps/newtagging/managers.py diff --git a/newtagging/models.py b/apps/newtagging/models.py similarity index 100% rename from newtagging/models.py rename to apps/newtagging/models.py diff --git a/newtagging/views.py b/apps/newtagging/views.py similarity index 100% rename from newtagging/views.py rename to apps/newtagging/views.py diff --git a/pagination/__init__.py b/apps/pagination/__init__.py similarity index 100% rename from pagination/__init__.py rename to apps/pagination/__init__.py diff --git a/pagination/middleware.py b/apps/pagination/middleware.py similarity index 100% rename from pagination/middleware.py rename to apps/pagination/middleware.py diff --git a/pagination/models.py b/apps/pagination/models.py similarity index 100% rename from pagination/models.py rename to apps/pagination/models.py diff --git a/pagination/templates/pagination/pagination.html b/apps/pagination/templates/pagination/pagination.html similarity index 100% rename from pagination/templates/pagination/pagination.html rename to apps/pagination/templates/pagination/pagination.html diff --git a/pagination/templatetags/__init__.py b/apps/pagination/templatetags/__init__.py similarity index 100% rename from pagination/templatetags/__init__.py rename to apps/pagination/templatetags/__init__.py diff --git a/pagination/templatetags/pagination_tags.py b/apps/pagination/templatetags/pagination_tags.py similarity index 100% rename from pagination/templatetags/pagination_tags.py rename to apps/pagination/templatetags/pagination_tags.py diff --git a/pagination/tests.py b/apps/pagination/tests.py similarity index 100% rename from pagination/tests.py rename to apps/pagination/tests.py -- 2.20.1