From 01ecccf9e5e5d0909c33f70cc8be416caed77d5f Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Fri, 4 Apr 2014 19:05:33 +0200 Subject: [PATCH 1/5] Ups 2 --- ...d_series_slug__chg_field_publisher_name.py | 172 ++++++++++++++++++ shelfzilla/apps/manga/models.py | 4 +- .../templates/manga/series/detail.html | 2 +- 3 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 shelfzilla/apps/manga/migrations/0016_auto__chg_field_series_slug__chg_field_publisher_name.py diff --git a/shelfzilla/apps/manga/migrations/0016_auto__chg_field_series_slug__chg_field_publisher_name.py b/shelfzilla/apps/manga/migrations/0016_auto__chg_field_series_slug__chg_field_publisher_name.py new file mode 100644 index 0000000..a84f411 --- /dev/null +++ b/shelfzilla/apps/manga/migrations/0016_auto__chg_field_series_slug__chg_field_publisher_name.py @@ -0,0 +1,172 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'Series.slug' + db.alter_column(u'manga_series', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=256, null=True)) + + # Changing field 'Publisher.name' + db.alter_column(u'manga_publisher', 'name', self.gf('django.db.models.fields.CharField')(max_length=50)) + + def backwards(self, orm): + + # Changing field 'Series.slug' + db.alter_column(u'manga_series', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=50, null=True)) + + # Changing field 'Publisher.name' + db.alter_column(u'manga_publisher', 'name', self.gf('django.db.models.fields.CharField')(max_length=40)) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '75'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'filer.file': { + 'Meta': {'object_name': 'File'}, + '_file_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'folder': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'all_files'", 'null': 'True', 'to': "orm['filer.Folder']"}), + 'has_all_mandatory_data': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'original_filename': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_files'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'polymorphic_filer.file_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}), + 'sha1': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '40', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'filer.folder': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('parent', 'name'),)", 'object_name': 'Folder'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'filer_owned_folders'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['filer.Folder']"}), + 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'filer.image': { + 'Meta': {'object_name': 'Image', '_ormbases': ['filer.File']}, + '_height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + '_width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'date_taken': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'default_alt_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'default_caption': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + u'file_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['filer.File']", 'unique': 'True', 'primary_key': 'True'}), + 'must_always_publish_author_credit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'must_always_publish_copyright': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'subject_location': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '64', 'null': 'True', 'blank': 'True'}) + }, + u'manga.person': { + 'Meta': {'ordering': "['name']", 'object_name': 'Person'}, + 'for_review': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'for_review_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) + }, + u'manga.publisher': { + 'Meta': {'ordering': "['name']", 'object_name': 'Publisher'}, + 'for_review': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'for_review_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) + }, + u'manga.series': { + 'Meta': {'ordering': "['name']", 'object_name': 'Series'}, + 'art': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'artist_of'", 'null': 'True', 'to': u"orm['manga.Person']"}), + 'cover': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['filer.Image']", 'null': 'True', 'blank': 'True'}), + 'finished': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['filer.Folder']", 'null': 'True', 'blank': 'True'}), + 'for_review': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'for_review_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'original_publisher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'original_series'", 'null': 'True', 'to': u"orm['manga.Publisher']"}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}), + 'story': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'scriptwriter_of'", 'null': 'True', 'to': u"orm['manga.Person']"}), + 'summary': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + u'manga.userhavevolume': { + 'Meta': {'object_name': 'UserHaveVolume'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'have_volumes'", 'to': u"orm['auth.User']"}), + 'volume': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owned_by'", 'to': u"orm['manga.Volume']"}) + }, + u'manga.userwishlistvolume': { + 'Meta': {'object_name': 'UserWishlistVolume'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishlisted_volumes'", 'to': u"orm['auth.User']"}), + 'volume': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishlisted_by'", 'to': u"orm['manga.Volume']"}) + }, + u'manga.volume': { + 'Meta': {'ordering': "['series__name', 'number']", 'object_name': 'Volume'}, + 'cover': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['filer.Image']", 'null': 'True', 'blank': 'True'}), + 'for_review': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'for_review_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'isbn_10': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'isbn_13': ('django.db.models.fields.CharField', [], {'max_length': '13', 'null': 'True', 'blank': 'True'}), + 'number': ('django.db.models.fields.IntegerField', [], {}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'publisher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'volumes'", 'to': u"orm['manga.Publisher']"}), + 'release_date': ('django.db.models.fields.DateField', [], {'null': 'True'}), + 'retail_price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '5', 'decimal_places': '2'}), + 'series': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'volumes'", 'to': u"orm['manga.Series']"}) + } + } + + complete_apps = ['manga'] \ No newline at end of file diff --git a/shelfzilla/apps/manga/models.py b/shelfzilla/apps/manga/models.py index 22fd5b6..775388a 100644 --- a/shelfzilla/apps/manga/models.py +++ b/shelfzilla/apps/manga/models.py @@ -9,7 +9,7 @@ from shelfzilla.models import Model class Publisher(Model): - name = models.CharField(_('Name'), max_length=40) + name = models.CharField(_('Name'), max_length=50) slug = models.SlugField(_('Slug'), blank=True, null=True) url = models.URLField(_('URL'), blank=True, null=True) @@ -41,7 +41,7 @@ class Publisher(Model): class Series(Model): name = models.CharField(_('Name'), max_length=256) - slug = models.SlugField(_('Slug'), blank=True, null=True) + slug = models.SlugField(_('Slug'), blank=True, null=True, max_length=256) cover = FilerImageField(blank=True, null=True) summary = models.TextField(_('Summary'), blank=True, null=True) finished = models.BooleanField(_('Finished'), default=False) diff --git a/shelfzilla/themes/bootflat/templates/manga/series/detail.html b/shelfzilla/themes/bootflat/templates/manga/series/detail.html index 6a1f736..b28052e 100644 --- a/shelfzilla/themes/bootflat/templates/manga/series/detail.html +++ b/shelfzilla/themes/bootflat/templates/manga/series/detail.html @@ -62,7 +62,7 @@
{% include "manga/series/includes/volume.html" with volume=volume user=user %}
- {% if forloop.counter|divisibleby:5 %} + {% if forloop.counter|divisibleby:6 %}
{% endif %} From 46dd25ffff40f2e33b04aba9f2c67fcc5e5594e0 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Fri, 4 Apr 2014 22:56:53 +0200 Subject: [PATCH 2/5] Added a images loaded callback for nprogress loading bar --- bower.json | 3 ++- gruntfile.coffee | 3 +++ shelfzilla/themes/bootflat/static/coffee/main.coffee | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 8366725..764f5be 100644 --- a/bower.json +++ b/bower.json @@ -19,6 +19,7 @@ "vegas": "~1.3.4", "jquery-pjax": "~1.8.1", "nprogress": "~0.1.3", - "toastr": "~2.0.1" + "toastr": "~2.0.1", + "imagesloaded": "~3.1.4" } } diff --git a/gruntfile.coffee b/gruntfile.coffee index 478f638..cc81907 100644 --- a/gruntfile.coffee +++ b/gruntfile.coffee @@ -54,6 +54,9 @@ module.exports = (grunt) -> "static_components/js/jquery-pjax.js", "static_components/js/nprogress.js", "static_components/js/toastr.js", + "static_components/js/eventemitter.js", + "static_components/js/eventie.js", + "static_components/js/imagesloaded.js", "shelfzilla/themes/bootflat/static/js/main.full.js", ] dest: "shelfzilla/themes/bootflat/static/js/site.js" diff --git a/shelfzilla/themes/bootflat/static/coffee/main.coffee b/shelfzilla/themes/bootflat/static/coffee/main.coffee index 52a585a..f5175dc 100644 --- a/shelfzilla/themes/bootflat/static/coffee/main.coffee +++ b/shelfzilla/themes/bootflat/static/coffee/main.coffee @@ -55,7 +55,9 @@ $('[data-toggle="tooltip"]').tooltip(); # Nprogress $(document).on 'pjax:start', -> NProgress.start() -$(document).on 'pjax:end', -> - NProgress.done() +$(document).on 'pjax:end', (event) -> + $(event.target).imagesLoaded -> + NProgress.done() + if window._updateMessages window.updateMessages() From 16bae3924b75b5aa8217752105ed6d44c80591ac Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Fri, 4 Apr 2014 22:57:06 +0200 Subject: [PATCH 3/5] Fixed on publisher detail --- .../templates/manga/publishers/detail.html | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/shelfzilla/themes/bootflat/templates/manga/publishers/detail.html b/shelfzilla/themes/bootflat/templates/manga/publishers/detail.html index 6b06546..89f1b8b 100644 --- a/shelfzilla/themes/bootflat/templates/manga/publishers/detail.html +++ b/shelfzilla/themes/bootflat/templates/manga/publishers/detail.html @@ -38,15 +38,17 @@ {% for series in item.series %} - - {% if series.slug %} - {{ series.name }} - {% else %} - {{ series.name }} - {% endif %} - - {{ series.volumes.count }} - {{ series.finished|yesno|capfirst }} + + + {% if series.slug %} + {{ series.name }} + {% else %} + {{ series.name }} + {% endif %} + + {{ series.volumes.count }} + {{ series.finished|yesno|capfirst }} + {% endfor %} From 6949b5bc79c71cc5b482e479e9321f8c109eaf0e Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Fri, 4 Apr 2014 22:57:21 +0200 Subject: [PATCH 4/5] Pushing letters URL on Series list --- shelfzilla/themes/bootflat/templates/manga/series/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shelfzilla/themes/bootflat/templates/manga/series/list.html b/shelfzilla/themes/bootflat/templates/manga/series/list.html index 3c04d59..ba1b755 100644 --- a/shelfzilla/themes/bootflat/templates/manga/series/list.html +++ b/shelfzilla/themes/bootflat/templates/manga/series/list.html @@ -10,7 +10,7 @@ From 879d6972b1bcc5f25892c89e47d5a668fae65633 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Fri, 4 Apr 2014 23:04:28 +0200 Subject: [PATCH 5/5] Fixed custom querysets --- shelfzilla/apps/manga/models.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/shelfzilla/apps/manga/models.py b/shelfzilla/apps/manga/models.py index 775388a..700ff37 100644 --- a/shelfzilla/apps/manga/models.py +++ b/shelfzilla/apps/manga/models.py @@ -27,8 +27,7 @@ class Publisher(Model): queryset = self.volumes.order_by('series__id')\ .distinct('series').values_list('series') - if queryset: - result = Series.objects.filter(pk__in=queryset) + result = Series.objects.filter(pk__in=queryset) self._series = result return self._series @@ -68,8 +67,7 @@ class Series(Model): result = [] queryset = self.volumes.order_by('publisher__id')\ .distinct('publisher').values_list('publisher') - if queryset: - result = Publisher.objects.filter(pk__in=queryset) + result = Publisher.objects.filter(pk__in=queryset) self._publishers = result