Skip to content

Commit

Permalink
Allow setting subtitle
Browse files Browse the repository at this point in the history
  • Loading branch information
@fpytloun
fpytloun committed Dec 31, 2015
1 parent d25e4e3 commit 56f1379
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 101 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
.DS_Store
.coverage
.ropeproject
/dist
/*.egg-info
148 changes: 50 additions & 98 deletions mezzanine_references/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -1,99 +1,51 @@
# -*- 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 model 'References'
db.create_table(u'mezzanine_references_references', (
(u'page_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['pages.Page'], unique=True, primary_key=True)),
('image_style', self.gf('django.db.models.fields.CharField')(default='default', max_length=12)),
('image_size', self.gf('django.db.models.fields.PositiveIntegerField')(default=200)),
('link_style', self.gf('django.db.models.fields.CharField')(default='button', max_length=12)),
('button_style', self.gf('django.db.models.fields.CharField')(default='default', max_length=12)),
))
db.send_create_signal(u'mezzanine_references', ['References'])

# Adding model 'Reference'
db.create_table(u'mezzanine_references_reference', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('_order', self.gf('django.db.models.fields.IntegerField')(null=True)),
('page', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['mezzanine_references.References'])),
('content', self.gf('django.db.models.fields.TextField')()),
('name', self.gf('django.db.models.fields.CharField')(max_length=32)),
('date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
('link', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
('link_title', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
('link_new_window', self.gf('django.db.models.fields.BooleanField')(default=False)),
))
db.send_create_signal(u'mezzanine_references', ['Reference'])


def backwards(self, orm):
# Deleting model 'References'
db.delete_table(u'mezzanine_references_references')

# Deleting model 'Reference'
db.delete_table(u'mezzanine_references_reference')


models = {
u'mezzanine_references.reference': {
'Meta': {'ordering': "(u'_order',)", 'object_name': 'Reference'},
'_order': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
'content': ('django.db.models.fields.TextField', [], {}),
'date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'link': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'link_new_window': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'link_title': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['mezzanine_references.References']"})
},
u'mezzanine_references.references': {
'Meta': {'ordering': "(u'_order',)", 'object_name': 'References', '_ormbases': [u'pages.Page']},
'button_style': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '12'}),
'image_size': ('django.db.models.fields.PositiveIntegerField', [], {'default': '200'}),
'image_style': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '12'}),
'link_style': ('django.db.models.fields.CharField', [], {'default': "'button'", 'max_length': '12'}),
u'page_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['pages.Page']", 'unique': 'True', 'primary_key': 'True'})
},
u'pages.page': {
'Meta': {'ordering': "(u'titles',)", 'object_name': 'Page'},
'_meta_title': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
'_order': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
'content_model': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'expiry_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'gen_description': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'in_menus': ('mezzanine.pages.fields.MenusField', [], {'default': '(1, 2, 3)', 'max_length': '100', 'null': 'True', 'blank': 'True'}),
'in_sitemap': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
u'keywords_string': ('django.db.models.fields.CharField', [], {'max_length': '500', 'blank': 'True'}),
'login_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'children'", 'null': 'True', 'to': u"orm['pages.Page']"}),
'publish_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'short_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
'site': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sites.Site']"}),
'slug': ('django.db.models.fields.CharField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}),
'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
'titles': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
},
u'sites.site': {
'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"},
'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
}
}

complete_apps = ['mezzanine_references']
from __future__ import unicode_literals

from django.db import migrations, models
import mezzanine.core.fields


class Migration(migrations.Migration):

dependencies = [
('pages', '0003_auto_20150527_1555'),
]

operations = [
migrations.CreateModel(
name='Reference',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
('content', models.TextField(verbose_name='Content')),
('name', models.CharField(max_length=32, verbose_name='Name')),
('date', models.DateField(null=True, verbose_name='Date of realization', blank=True)),
('image', models.ImageField(null=True, upload_to=b'references', blank=True)),
('link', models.CharField(max_length=128, null=True, verbose_name='Link', blank=True)),
('link_title', models.CharField(max_length=32, null=True, verbose_name='Link title', blank=True)),
('link_new_window', models.BooleanField(default=False, verbose_name='Open link on new page')),
],
options={
'ordering': ('_order',),
},
),
migrations.CreateModel(
name='References',
fields=[
('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page')),
('image_style', models.CharField(default=b'default', max_length=12, verbose_name='Image style', choices=[(b'rounded', 'Rounded'), (b'circle', 'Circle'), (b'thumbnail', 'Thumbnail'), (b'default', 'Default')])),
('image_size', models.PositiveIntegerField(default=200, verbose_name='Image width in pixels')),
('link_style', models.CharField(default=b'button', max_length=12, verbose_name='Link style', choices=[(b'button', 'Button'), (b'text', 'Text')])),
('button_style', models.CharField(default=b'default', max_length=12, verbose_name='Button style', choices=[(b'default', b'default'), (b'primary', b'primary'), (b'info', b'info'), (b'warning', b'warning'), (b'danger', b'danger')])),
],
options={
'ordering': ('_order',),
},
bases=('pages.page',),
),
migrations.AddField(
model_name='reference',
name='page',
field=models.ForeignKey(to='mezzanine_references.References'),
),
]
19 changes: 19 additions & 0 deletions mezzanine_references/migrations/0002_reference_subtitle.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('mezzanine_references', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='reference',
name='subtitle',
field=models.CharField(max_length=32, null=True, verbose_name='Subtitle', blank=True),
),
]
1 change: 1 addition & 0 deletions mezzanine_references/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class Reference(Orderable):
page = models.ForeignKey(References)
content = models.TextField(_("Content"))
name = models.CharField(_("Name"), max_length=32)
subtitle = models.CharField(_("Subtitle"), max_length=32, null=True, blank=True)
date = models.DateField(_("Date of realization"), null=True, blank=True)
image = models.ImageField(upload_to="references", null=True, blank=True)

Expand Down
3 changes: 2 additions & 1 deletion mezzanine_references/templates/pages/references.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ <h2>{{ page.title }}</h2>

<div class="reference-header">
<h3 class="reference-name">{{ reference.name }}</h3>
{% if reference.date %}<span class="reference-date text-muted">- {{ reference.date }}</span>{% endif %}
{% if reference.subtitle %}<div class="reference-subtitle text-muted">{{ reference.subtitle }}</div>{% endif %}
{% if reference.date %}<div class="reference-date text-muted">{{ reference.date }}</div>{% endif %}
</div>
<div class="reference-body">
{{ reference.content|safe }}
Expand Down
3 changes: 2 additions & 1 deletion mezzanine_references/templates/references/slideshow.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

<div class="reference-header">
<h3 class="reference-name">{{ reference.name }}</h3>
{% if reference.date %}<span class="reference-date text-muted">- {{ reference.date }}</span>{% endif %}
{% if reference.subtitle %}<div class="reference-subtitle text-muted">{{ reference.subtitle }}</div>{% endif %}
{% if reference.date %}<div class="reference-date text-muted">{{ reference.date }}</div>{% endif %}
</div>
<div class="reference-body">
<p>{{ reference.content|safe }}</p>
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name='mezzanine-references',
version='0.1.2',
version='0.1.3',
packages=['mezzanine_references'],
include_package_data=True,
license='BSD License',
Expand Down

0 comments on commit 56f1379

Please sign in to comment.