forked from alfredo/popcorn_maker
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Incorporated latest version of Butter with the templates
- Loading branch information
Showing
13 changed files
with
289 additions
and
119 deletions.
There are no files selected for viewing
Submodule butter
updated
40 files
148 changes: 148 additions & 0 deletions
148
popcorn_gallery/popcorn/migrations/0017_auto__add_field_template_metadata.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| # -*- coding: utf-8 -*- | ||
| import datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| # Adding field 'Template.metadata' | ||
| db.add_column('popcorn_template', 'metadata', | ||
| self.gf('django.db.models.fields.TextField')(default=''), | ||
| keep_default=False) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Deleting field 'Template.metadata' | ||
| db.delete_column('popcorn_template', 'metadata') | ||
|
|
||
|
|
||
| models = { | ||
| 'auth.group': { | ||
| 'Meta': {'object_name': 'Group'}, | ||
| '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
| }, | ||
| 'auth.permission': { | ||
| 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
| 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
| }, | ||
| 'auth.user': { | ||
| 'Meta': {'object_name': 'User'}, | ||
| 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
| 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), | ||
| 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
| 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
| '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
| 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
| }, | ||
| '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'}), | ||
| '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'}) | ||
| }, | ||
| 'popcorn.project': { | ||
| 'Meta': {'ordering': "('is_featured', '-modified')", 'object_name': 'Project'}, | ||
| 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), | ||
| 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['popcorn.ProjectCategory']", 'symmetrical': 'False', 'blank': 'True'}), | ||
| 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), | ||
| 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'html': ('django.db.models.fields.TextField', [], {}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'is_forkable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'is_removed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'is_shared': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'metadata': ('django.db.models.fields.TextField', [], {}), | ||
| 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['popcorn.Project']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), | ||
| 'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}), | ||
| 'template': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['popcorn.Template']", 'null': 'True', 'blank': 'True'}), | ||
| 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), | ||
| 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'blank': 'True'}), | ||
| 'views_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 'votes_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}) | ||
| }, | ||
| 'popcorn.projectcategory': { | ||
| 'Meta': {'object_name': 'ProjectCategory'}, | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'slug': ('django_extensions.db.fields.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '50', 'separator': "u'-'", 'blank': 'True', 'populate_from': "'name'", 'overwrite': 'False'}) | ||
| }, | ||
| 'popcorn.projectcategorymembership': { | ||
| 'Meta': {'unique_together': "(('user', 'project_category'),)", 'object_name': 'ProjectCategoryMembership'}, | ||
| 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), | ||
| 'project_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['popcorn.ProjectCategory']"}), | ||
| 'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}), | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['users.Profile']"}) | ||
| }, | ||
| 'popcorn.template': { | ||
| 'Meta': {'ordering': "('-is_featured', 'name')", 'object_name': 'Template'}, | ||
| 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['popcorn.TemplateCategory']", 'symmetrical': 'False', 'blank': 'True'}), | ||
| 'config': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), | ||
| 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'metadata': ('django.db.models.fields.TextField', [], {}), | ||
| 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), | ||
| 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
| 'template': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), | ||
| 'views_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 'votes_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}) | ||
| }, | ||
| 'popcorn.templatecategory': { | ||
| 'Meta': {'object_name': 'TemplateCategory'}, | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'slug': ('django_extensions.db.fields.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '50', 'separator': "u'-'", 'blank': 'True', 'populate_from': "'name'", 'overwrite': 'False'}) | ||
| }, | ||
| 'taggit.tag': { | ||
| 'Meta': {'object_name': 'Tag'}, | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'}) | ||
| }, | ||
| 'taggit.taggeditem': { | ||
| 'Meta': {'object_name': 'TaggedItem'}, | ||
| 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), | ||
| 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_items'", 'to': "orm['taggit.Tag']"}) | ||
| }, | ||
| 'users.profile': { | ||
| 'Meta': {'object_name': 'Profile'}, | ||
| 'bio': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['popcorn.ProjectCategory']", 'through': "orm['popcorn.ProjectCategoryMembership']", 'symmetrical': 'False'}), | ||
| 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}), | ||
| 'website': ('django.db.models.fields.URLField', [], {'max_length': '255', 'blank': 'True'}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['popcorn'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 2 additions & 49 deletions
51
popcorn_gallery/templates/butter/default-butter/config.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,5 @@ | ||
| { | ||
| "savedDataUrl": "data", | ||
| "name": "default-butter", | ||
| "snapshotHTMLOnReady": true, | ||
| "editor": { | ||
| "default": "{{ STATIC_URL }}editors/default-editor.html", | ||
| "googlemap": "{{ STATIC_URL }}editors/googlemap-editor.html" | ||
| }, | ||
| "ui": { | ||
| "trackEventHighlight": "click", | ||
| "title": "Butter <sup style=\"text-decoration: underline;\">0.3</sup>" | ||
| }, | ||
| "plugin": { | ||
| "plugins": [ | ||
| { | ||
| "type": "footnote", | ||
| "path": "{{ STATIC_URL }}external/popcorn-js/plugins/footnote/popcorn.footnote.js" | ||
| }, | ||
| { | ||
| "type": "attribution", | ||
| "path": "{{ STATIC_URL }}external/popcorn-js/plugins/attribution/popcorn.attribution.js" | ||
| }, | ||
| { | ||
| "type": "image", | ||
| "path": "{{ STATIC_URL }}external/popcorn-js/plugins/image/popcorn.image.js" | ||
| }, | ||
| { | ||
| "name": "googlemap", | ||
| "type": "googlemap", | ||
| "path": "{{ STATIC_URL }}external/popcorn-js/plugins/googlemap/popcorn.googlemap.js" | ||
| } | ||
| ], | ||
| "defaults": [ | ||
| "footnote", | ||
| "image" | ||
| ] | ||
| }, | ||
| "icons": { | ||
| "default": "popcorn-icon.png", | ||
| "image": "image-icon.png" | ||
| }, | ||
| "dirs": { | ||
| "popcorn-js": "{{ STATIC_URL }}external/popcorn-js/", | ||
| "css": "{{ STATIC_URL }}css/", | ||
| "dialogs": "{{ STATIC_URL }}dialogs/", | ||
| "resources": "{{ STATIC_URL }}resources/" | ||
| }, | ||
| "mediaDefaults": { | ||
| "frameAnimation": true | ||
| } | ||
| "baseDir": "{{ STATIC_URL }}", | ||
| "name": "default-butter" | ||
| } | ||
|
|
Oops, something went wrong.