add auto subscribe topic feature: http://djangobb.org/ticket/175
--- djangobb_forum/forms.py | 7 +- .../0004_auto__add_field_profile_auto_subscribe.py | 180 ++++++++++++++++++++ djangobb_forum/models.py | 1 + .../templates/djangobb_forum/add_post.html | 35 +--- .../djangobb_forum/includes/post_form.html | 38 +++++ .../djangobb_forum/profile/profile_essentials.html | 10 +- djangobb_forum/templates/djangobb_forum/topic.html | 32 +--- djangobb_forum/views.py | 10 +- 8 files changed, 244 insertions(+), 69 deletions(-) create mode 100644 djangobb_forum/migrations/0004_auto__add_field_profile_auto_subscribe.py create mode 100644 djangobb_forum/templates/djangobb_forum/includes/post_form.html
This commit is contained in:
JensDiemer
parent
a6c0eb1ffc
commit
35bdd7816b
8 changed files with 244 additions and 69 deletions
|
|
@ -47,6 +47,7 @@ class AddPostForm(forms.ModelForm):
|
|||
name = forms.CharField(label=_('Subject'), max_length=255,
|
||||
widget=forms.TextInput(attrs={'size':'115'}))
|
||||
attachment = forms.FileField(label=_('Attachment'), required=False)
|
||||
subscribe = forms.BooleanField(label=_('Subscribe'), help_text=_("Subscribe this topic."), required=False)
|
||||
|
||||
class Meta:
|
||||
model = Post
|
||||
|
|
@ -103,6 +104,10 @@ class AddPostForm(forms.ModelForm):
|
|||
else:
|
||||
topic = self.topic
|
||||
|
||||
if self.cleaned_data['subscribe']:
|
||||
# User would like to subscripe to this topic
|
||||
topic.subscribers.add(self.user)
|
||||
|
||||
post = Post(topic=topic, user=self.user, user_ip=self.ip,
|
||||
markup=self.user.forum_profile.markup,
|
||||
body=self.cleaned_data['body'])
|
||||
|
|
@ -157,7 +162,7 @@ class EssentialsProfileForm(forms.ModelForm):
|
|||
|
||||
class Meta:
|
||||
model = Profile
|
||||
fields = ['time_zone', 'language']
|
||||
fields = ['auto_subscribe', 'time_zone', 'language']
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
extra_args = kwargs.pop('extra_args', {})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,180 @@
|
|||
# -*- 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 'Profile.auto_subscribe'
|
||||
db.add_column('djangobb_forum_profile', 'auto_subscribe',
|
||||
self.gf('django.db.models.fields.BooleanField')(default=False),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Deleting field 'Profile.auto_subscribe'
|
||||
db.delete_column('djangobb_forum_profile', 'auto_subscribe')
|
||||
|
||||
|
||||
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', [], {'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'})
|
||||
},
|
||||
'djangobb_forum.attachment': {
|
||||
'Meta': {'object_name': 'Attachment'},
|
||||
'content_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'hash': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '40', 'db_index': 'True', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.TextField', [], {}),
|
||||
'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attachments'", 'to': "orm['djangobb_forum.Post']"}),
|
||||
'size': ('django.db.models.fields.IntegerField', [], {})
|
||||
},
|
||||
'djangobb_forum.ban': {
|
||||
'Meta': {'object_name': 'Ban'},
|
||||
'ban_end': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
|
||||
'ban_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'reason': ('django.db.models.fields.TextField', [], {}),
|
||||
'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'ban_users'", 'unique': 'True', 'to': "orm['auth.User']"})
|
||||
},
|
||||
'djangobb_forum.category': {
|
||||
'Meta': {'ordering': "['position']", 'object_name': 'Category'},
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
|
||||
'position': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'})
|
||||
},
|
||||
'djangobb_forum.forum': {
|
||||
'Meta': {'ordering': "['position']", 'object_name': 'Forum'},
|
||||
'category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'forums'", 'to': "orm['djangobb_forum.Category']"}),
|
||||
'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'last_post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_forum_post'", 'null': 'True', 'to': "orm['djangobb_forum.Post']"}),
|
||||
'moderators': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
|
||||
'position': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
|
||||
'post_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
|
||||
'topic_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
|
||||
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
|
||||
},
|
||||
'djangobb_forum.post': {
|
||||
'Meta': {'ordering': "['created']", 'object_name': 'Post'},
|
||||
'body': ('django.db.models.fields.TextField', [], {}),
|
||||
'body_html': ('django.db.models.fields.TextField', [], {}),
|
||||
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'markup': ('django.db.models.fields.CharField', [], {'default': "'bbcode'", 'max_length': '15'}),
|
||||
'topic': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['djangobb_forum.Topic']"}),
|
||||
'updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
|
||||
'updated_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'posts'", 'to': "orm['auth.User']"}),
|
||||
'user_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'})
|
||||
},
|
||||
'djangobb_forum.posttracking': {
|
||||
'Meta': {'object_name': 'PostTracking'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'last_read': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
|
||||
'topics': ('djangobb_forum.fields.JSONField', [], {'null': 'True'}),
|
||||
'user': ('djangobb_forum.fields.AutoOneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
|
||||
},
|
||||
'djangobb_forum.profile': {
|
||||
'Meta': {'object_name': 'Profile'},
|
||||
'aim': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
|
||||
'auto_subscribe': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'avatar': ('djangobb_forum.fields.ExtendedImageField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
|
||||
'icq': ('django.db.models.fields.CharField', [], {'max_length': '12', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'jabber': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
|
||||
'language': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '5'}),
|
||||
'location': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'markup': ('django.db.models.fields.CharField', [], {'default': "'bbcode'", 'max_length': '15'}),
|
||||
'msn': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
|
||||
'post_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
|
||||
'privacy_permission': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
|
||||
'show_avatar': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'show_signatures': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'show_smilies': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'signature': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}),
|
||||
'signature_html': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}),
|
||||
'site': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
|
||||
'status': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'theme': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '80'}),
|
||||
'time_zone': ('django.db.models.fields.FloatField', [], {'default': '3.0'}),
|
||||
'user': ('djangobb_forum.fields.AutoOneToOneField', [], {'related_name': "'forum_profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
|
||||
'yahoo': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'})
|
||||
},
|
||||
'djangobb_forum.report': {
|
||||
'Meta': {'object_name': 'Report'},
|
||||
'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'post': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djangobb_forum.Post']"}),
|
||||
'reason': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': "'1000'", 'blank': 'True'}),
|
||||
'reported_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reported_by'", 'to': "orm['auth.User']"}),
|
||||
'zapped': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'zapped_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'zapped_by'", 'null': 'True', 'to': "orm['auth.User']"})
|
||||
},
|
||||
'djangobb_forum.reputation': {
|
||||
'Meta': {'unique_together': "(('from_user', 'post'),)", 'object_name': 'Reputation'},
|
||||
'from_user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reputations_from'", 'to': "orm['auth.User']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'post': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'post'", 'to': "orm['djangobb_forum.Post']"}),
|
||||
'reason': ('django.db.models.fields.TextField', [], {'max_length': '1000'}),
|
||||
'sign': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
|
||||
'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'to_user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reputations_to'", 'to': "orm['auth.User']"})
|
||||
},
|
||||
'djangobb_forum.topic': {
|
||||
'Meta': {'ordering': "['-updated']", 'object_name': 'Topic'},
|
||||
'closed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'forum': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'topics'", 'to': "orm['djangobb_forum.Forum']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'last_post': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_topic_post'", 'null': 'True', 'to': "orm['djangobb_forum.Post']"}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'post_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
|
||||
'sticky': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'subscriptions'", 'blank': 'True', 'to': "orm['auth.User']"}),
|
||||
'updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
|
||||
'views': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['djangobb_forum']
|
||||
|
|
@ -310,6 +310,7 @@ class Profile(models.Model):
|
|||
show_signatures = models.BooleanField(_('Show signatures'), blank=True, default=True)
|
||||
show_smilies = models.BooleanField(_('Show smilies'), blank=True, default=True)
|
||||
privacy_permission = models.IntegerField(_('Privacy permission'), choices=PRIVACY_CHOICES, default=1)
|
||||
auto_subscribe = models.BooleanField(_('Auto subscribe'), help_text=_("Auto subscribe all topics you have created or reply."), blank=True, default=False)
|
||||
markup = models.CharField(_('Default markup'), max_length=15, default=forum_settings.DEFAULT_MARKUP, choices=MARKUP_CHOICES)
|
||||
post_count = models.IntegerField(_('Post count'), blank=True, default=0)
|
||||
|
||||
|
|
|
|||
|
|
@ -14,40 +14,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="blockform">
|
||||
<h2><span>{% if forum %}{% trans "New topic" %}{% else %}{% trans "New reply" %}{% endif %}</span></h2>
|
||||
<div class="box">
|
||||
<form id="post" action="{% if forum %}{% url djangobb:add_topic forum.id %}{% else %}{% url djangobb:add_post topic.id %}{% endif %}" method="post" enctype="multipart/form-data">
|
||||
{% csrf_token %}
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{% trans "Write your message and submit" %}</legend>
|
||||
<div class="infldset txtarea">
|
||||
{% if forum %}
|
||||
<label><strong>{% trans "Subject" %}</strong><br />{{ form.name.errors }}{{ form.name }}<br /></label>
|
||||
{% endif %}
|
||||
<label><strong>{% trans "Message" %}</strong><br />{{ form.body.errors }}{{ form.body }}<br /></label>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
{% if forum_settings.ATTACHMENT_SUPPORT %}
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{% trans "Attachment" %}</legend>
|
||||
<div class="infldset">
|
||||
{{ form.attachment.errors }}
|
||||
<div class="rbox">
|
||||
{{ form.attachment }}
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<p><input type="submit" value="{% trans "Submit" %}" /><a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% include "djangobb_forum/includes/post_form.html" %}
|
||||
|
||||
{% if not forum %}
|
||||
<div id="postreview" class="blockpost">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
<div class="blockform" id="reply">
|
||||
<h2><span>{% if forum %}{% trans "New topic" %}{% else %}{% trans "New reply" %}{% endif %}</span></h2>
|
||||
<div class="box">
|
||||
<form id="post" action="{% if forum %}{% url djangobb:add_topic forum.id %}{% else %}{% url djangobb:add_post topic.id %}{% endif %}" method="post" enctype="multipart/form-data">
|
||||
{% csrf_token %}
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{% trans "Write your message and submit" %}</legend>
|
||||
<noscript><h1>Please enable JavaScript!</h1></noscript>
|
||||
<div class="infldset txtarea">
|
||||
{% if forum %}
|
||||
<label><strong>{% trans "Subject" %}</strong><br />{{ form.name.errors }}{{ form.name }}<br /></label>
|
||||
{% endif %}
|
||||
<label><strong>{% trans "Message" %}</strong><br />{{ form.body.errors }}{{ form.body }}</label>
|
||||
<p>
|
||||
Note: A list of all supported source code highlighter for [code <strong>XXX</strong>]...[/code] can be found here: <a href="http://pygments.org/docs/lexers/">pygments.org</a> (Use 'Short name')
|
||||
</p>
|
||||
<label>{{ form.subscribe }}<strong>{% trans "Subscribe this topic" %}</strong>{{ form.subscribe.errors }}<br /></label>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
{% if forum_settings.ATTACHMENT_SUPPORT %}
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{% trans "Attachment" %}</legend>
|
||||
<div class="infldset">
|
||||
{{ form.attachment.errors }}
|
||||
<div class="rbox">
|
||||
{{ form.attachment }}
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
{% endif %}
|
||||
<p><input type="submit" value="{% trans "Submit" %}" /><a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -29,7 +29,6 @@
|
|||
{% endif %}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="inform">
|
||||
|
|
@ -46,6 +45,15 @@
|
|||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{{ form.auto_subscribe.label }}</legend>
|
||||
<div class="infldset">
|
||||
{{ form.auto_subscribe.errors }}
|
||||
{{ form.auto_subscribe }} <label for="id_auto_subscribe">{{ form.auto_subscribe.help_text }}</label>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{% trans "Set your localisation options" %}</legend>
|
||||
|
|
|
|||
|
|
@ -153,37 +153,7 @@
|
|||
</div>
|
||||
</div>
|
||||
{% if not topic.closed and user.is_authenticated %}
|
||||
<div class="blockform" id="reply">
|
||||
<h2><span>{% trans "Reply" %}</span></h2>
|
||||
<div class="box">
|
||||
<form id="post" action="{% url djangobb:add_post topic.id %}" method="post" enctype="multipart/form-data">
|
||||
{% csrf_token %}
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{% trans "Write your message and submit" %}</legend>
|
||||
<noscript><h1>Please enable JavaScript!</h1></noscript>
|
||||
<div class="infldset txtarea">
|
||||
{{ form.body }}
|
||||
</div>
|
||||
<p>Note: A list of all supported source code highlighter for [code <strong>XXX</strong>]...[/code] can be found here: <a href="http://pygments.org/docs/lexers/">pygments.org</a> (Use 'Short name')</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
{% if forum_settings.ATTACHMENT_SUPPORT %}
|
||||
<div class="inform">
|
||||
<fieldset>
|
||||
<legend>{% trans "Attachment" %}</legend>
|
||||
<div class="infldset">
|
||||
<div class="rbox">
|
||||
{{ form.attachment }}
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
{% endif %}
|
||||
<p><input type="submit" value="{% trans "Submit" %}" /></p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% include "djangobb_forum/includes/post_form.html" %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -271,7 +271,10 @@ def show_topic(request, topic_id, full=True):
|
|||
|
||||
initial = {}
|
||||
if request.user.is_authenticated():
|
||||
initial = {'markup': request.user.forum_profile.markup}
|
||||
initial = {
|
||||
'markup': request.user.forum_profile.markup,
|
||||
'subscribe': request.user.forum_profile.auto_subscribe,
|
||||
}
|
||||
form = AddPostForm(topic=topic, initial=initial)
|
||||
|
||||
moderator = request.user.is_superuser or\
|
||||
|
|
@ -322,7 +325,10 @@ def add_post(request, forum_id, topic_id):
|
|||
ip = request.META.get('REMOTE_ADDR', None)
|
||||
form = build_form(AddPostForm, request, topic=topic, forum=forum,
|
||||
user=request.user, ip=ip,
|
||||
initial={'markup': request.user.forum_profile.markup})
|
||||
initial={
|
||||
'markup': request.user.forum_profile.markup,
|
||||
'subscribe': request.user.forum_profile.auto_subscribe,
|
||||
})
|
||||
|
||||
if 'post_id' in request.GET:
|
||||
post_id = request.GET['post_id']
|
||||
|
|
|
|||
Reference in a new issue