-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
prepare 0.1.6; minor theming API improvements; major FeinCMS integrat…
…ion app (widget) improvements; fixes in help_text of radio select
- Loading branch information
1 parent
8919dc2
commit 7d20b6e
Showing
40 changed files
with
557 additions
and
47 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| #Django>=1.5,<1.7 | ||
| Django>=1.5,<1.8 | ||
| FeinCMS>=1.9,<1.10 | ||
| Jinja2 | ||
| MarkupSafe | ||
| South | ||
|
|
||
191 changes: 191 additions & 0 deletions
191
...migrations/0004_auto__add_field_fobiformwidget_form_template_name__add_field_fobiformw.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,191 @@ | ||
| # -*- 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): | ||
| # Adding field 'FobiFormWidget.form_template_name' | ||
| db.add_column(u'page_page_fobiformwidget', 'form_template_name', | ||
| self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'FobiFormWidget.hide_form_title' | ||
| db.add_column(u'page_page_fobiformwidget', 'hide_form_title', | ||
| self.gf('django.db.models.fields.BooleanField')(default=False), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'FobiFormWidget.form_title' | ||
| db.add_column(u'page_page_fobiformwidget', 'form_title', | ||
| self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'FobiFormWidget.form_submit_button_text' | ||
| db.add_column(u'page_page_fobiformwidget', 'form_submit_button_text', | ||
| self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'FobiFormWidget.success_page_template_name' | ||
| db.add_column(u'page_page_fobiformwidget', 'success_page_template_name', | ||
| self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'FobiFormWidget.hide_success_page_title' | ||
| db.add_column(u'page_page_fobiformwidget', 'hide_success_page_title', | ||
| self.gf('django.db.models.fields.BooleanField')(default=False), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'FobiFormWidget.success_page_title' | ||
| db.add_column(u'page_page_fobiformwidget', 'success_page_title', | ||
| self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'FobiFormWidget.success_page_text' | ||
| db.add_column(u'page_page_fobiformwidget', 'success_page_text', | ||
| self.gf('django.db.models.fields.TextField')(null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Deleting field 'FobiFormWidget.form_template_name' | ||
| db.delete_column(u'page_page_fobiformwidget', 'form_template_name') | ||
|
|
||
| # Deleting field 'FobiFormWidget.hide_form_title' | ||
| db.delete_column(u'page_page_fobiformwidget', 'hide_form_title') | ||
|
|
||
| # Deleting field 'FobiFormWidget.form_title' | ||
| db.delete_column(u'page_page_fobiformwidget', 'form_title') | ||
|
|
||
| # Deleting field 'FobiFormWidget.form_submit_button_text' | ||
| db.delete_column(u'page_page_fobiformwidget', 'form_submit_button_text') | ||
|
|
||
| # Deleting field 'FobiFormWidget.success_page_template_name' | ||
| db.delete_column(u'page_page_fobiformwidget', 'success_page_template_name') | ||
|
|
||
| # Deleting field 'FobiFormWidget.hide_success_page_title' | ||
| db.delete_column(u'page_page_fobiformwidget', 'hide_success_page_title') | ||
|
|
||
| # Deleting field 'FobiFormWidget.success_page_title' | ||
| db.delete_column(u'page_page_fobiformwidget', 'success_page_title') | ||
|
|
||
| # Deleting field 'FobiFormWidget.success_page_text' | ||
| db.delete_column(u'page_page_fobiformwidget', 'success_page_text') | ||
|
|
||
|
|
||
| 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': '30'}) | ||
| }, | ||
| 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'}) | ||
| }, | ||
| u'fobi.formentry': { | ||
| 'Meta': {'unique_together': "(('user', 'slug'), ('user', 'name'))", 'object_name': 'FormEntry'}, | ||
| 'action': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'form_wizard_entry': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['fobi.FormWizardEntry']", 'null': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_cloneable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'position': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'slug': ('autoslug.fields.AutoSlugField', [], {'unique': 'True', 'max_length': '50', 'populate_from': "'name'", 'unique_with': '()'}), | ||
| 'success_page_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'success_page_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) | ||
| }, | ||
| u'fobi.formwizardentry': { | ||
| 'Meta': {'unique_together': "(('user', 'slug'), ('user', 'name'))", 'object_name': 'FormWizardEntry'}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_cloneable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'slug': ('autoslug.fields.AutoSlugField', [], {'unique': 'True', 'max_length': '50', 'populate_from': "'name'", 'unique_with': '()'}), | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) | ||
| }, | ||
| u'page.fobiformwidget': { | ||
| 'Meta': {'ordering': "['ordering']", 'object_name': 'FobiFormWidget', 'db_table': "u'page_page_fobiformwidget'"}, | ||
| 'form_entry': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['fobi.FormEntry']"}), | ||
| 'form_submit_button_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'form_template_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'form_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'hide_form_title': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'hide_success_page_title': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'ordering': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'fobiformwidget_set'", 'to': u"orm['page.Page']"}), | ||
| 'region': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'success_page_template_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'success_page_text': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'success_page_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) | ||
| }, | ||
| u'page.page': { | ||
| 'Meta': {'ordering': "['tree_id', 'lft']", 'object_name': 'Page'}, | ||
| '_cached_url': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'db_index': 'True', 'blank': 'True'}), | ||
| 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'in_navigation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '10'}), | ||
| u'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), | ||
| u'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), | ||
| 'override_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': u"orm['page.Page']"}), | ||
| 'redirect_to': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), | ||
| u'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), | ||
| 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150'}), | ||
| 'template_key': ('django.db.models.fields.CharField', [], {'default': "'page_base'", 'max_length': '255'}), | ||
| 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), | ||
| 'translation_of': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'translations'", 'null': 'True', 'to': u"orm['page.Page']"}), | ||
| u'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}) | ||
| }, | ||
| u'page.rawcontent': { | ||
| 'Meta': {'ordering': "['ordering']", 'object_name': 'RawContent', 'db_table': "u'page_page_rawcontent'"}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'ordering': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rawcontent_set'", 'to': u"orm['page.Page']"}), | ||
| 'region': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'text': ('django.db.models.fields.TextField', [], {'blank': 'True'}) | ||
| }, | ||
| u'page.richtextcontent': { | ||
| 'Meta': {'ordering': "['ordering']", 'object_name': 'RichTextContent', 'db_table': "u'page_page_richtextcontent'"}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'ordering': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'richtextcontent_set'", 'to': u"orm['page.Page']"}), | ||
| 'region': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'text': ('feincms.contrib.richtext.RichTextField', [], {'blank': 'True'}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['page'] |
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,2 +1,2 @@ | ||
| #workon fobi | ||
| ./manage.py runserver 0.0.0.0:8004 --settings=settings_bootstrap3_theme_captcha --traceback -v 3 | ||
| ./manage.py runserver 0.0.0.0:8000 --settings=settings_bootstrap3_theme_captcha --traceback -v 3 |
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,2 +1,2 @@ | ||
| #workon fobi | ||
| ./manage.py runserver 0.0.0.0:8006 --traceback -v 3 --settings=settings_bootstrap3_theme_django17_captcha --traceback -v 3 | ||
| ./manage.py runserver 0.0.0.0:8000 --traceback -v 3 --settings=settings_bootstrap3_theme_django17_captcha --traceback -v 3 |
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,2 +1,2 @@ | ||
| #workon fobi | ||
| ./manage.py runserver 0.0.0.0:8006 --traceback -v 3 --settings=settings_bootstrap3_theme_django17 --traceback -v 3 | ||
| ./manage.py runserver 0.0.0.0:8000 --traceback -v 3 --settings=settings_bootstrap3_theme_django17 --traceback -v 3 |
2 changes: 2 additions & 0 deletions
2
examples/simple/runserver-bootstrap3-theme-feincms-integration.sh
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,2 @@ | ||
| #workon fobi | ||
| ./manage.py runserver 0.0.0.0:8000 --settings=settings_bootstrap3_theme_feincms --traceback -v 3 |
This file was deleted.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
examples/simple/runserver-foundation5-theme-feincms-integration.sh
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,3 @@ | ||
| #workon fobi | ||
| #./manage.py collectstatic --noinput --settings=settings_foundation5_theme_feincms --traceback -v 3 | ||
| ./manage.py runserver 0.0.0.0:8001 --settings=settings_foundation5_theme_feincms --traceback -v 3 |
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
File renamed without changes.
Oops, something went wrong.