Event resturcturing
- new short_description field instead of title - autosave text - autocompletion on login
This commit is contained in:
0
simpleforum/__init__.py
Normal file
0
simpleforum/__init__.py
Normal file
4
simpleforum/admin.py
Normal file
4
simpleforum/admin.py
Normal file
@@ -0,0 +1,4 @@
|
||||
from django.contrib import admin
|
||||
from models import Message
|
||||
|
||||
admin.site.register(Message)
|
||||
74
simpleforum/migrations/0001_initial.py
Normal file
74
simpleforum/migrations/0001_initial.py
Normal file
@@ -0,0 +1,74 @@
|
||||
# -*- 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 model 'Message'
|
||||
db.create_table(u'simpleforum_message', (
|
||||
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
|
||||
('titel', self.gf('django.db.models.fields.CharField')(max_length=100)),
|
||||
('text', self.gf('django.db.models.fields.TextField')()),
|
||||
('creation_time', self.gf('django.db.models.fields.DateTimeField')()),
|
||||
('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
|
||||
))
|
||||
db.send_create_signal(u'simpleforum', ['Message'])
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Deleting model 'Message'
|
||||
db.delete_table(u'simpleforum_message')
|
||||
|
||||
|
||||
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', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
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', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'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'simpleforum.message': {
|
||||
'Meta': {'object_name': 'Message'},
|
||||
'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
|
||||
'creation_time': ('django.db.models.fields.DateTimeField', [], {}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'text': ('django.db.models.fields.TextField', [], {}),
|
||||
'titel': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['simpleforum']
|
||||
0
simpleforum/migrations/__init__.py
Normal file
0
simpleforum/migrations/__init__.py
Normal file
21
simpleforum/models.py
Normal file
21
simpleforum/models.py
Normal file
@@ -0,0 +1,21 @@
|
||||
from django.db import models
|
||||
|
||||
from django.db import models
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.contrib.auth.models import User
|
||||
|
||||
|
||||
|
||||
class Message ( models.Model ):
|
||||
|
||||
titel = models.CharField( max_length = 100, verbose_name = _("titel") )
|
||||
text = models.TextField( blank=False, verbose_name = _("text") )
|
||||
|
||||
creation_time = models.DateTimeField( verbose_name=_("creation_time") )
|
||||
|
||||
author = models.ForeignKey( User, verbose_name=_("Author") )
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
141
simpleforum/templates/simpleforum/simpleforum.html
Normal file
141
simpleforum/templates/simpleforum/simpleforum.html
Normal file
@@ -0,0 +1,141 @@
|
||||
{% extends "website/base.html" %}
|
||||
|
||||
{% load sekizai_tags staticfiles %}
|
||||
|
||||
|
||||
<!-- No Feature slider -->
|
||||
{% block feature_slider %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
<!-- Static Navbar at top -->
|
||||
{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
|
||||
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
||||
{% addtoblock "css" strip %}<link rel="stylesheet" href="{{STATIC_URL}}/css/datepicker.css" type="text/css" media="screen" /> {% endaddtoblock %}
|
||||
|
||||
|
||||
{% addtoblock "css" strip %} <link rel="stylesheet" href="{{STATIC_URL}}/css/blogpost.css" type="text/css" media="screen" /> {% endaddtoblock %}
|
||||
|
||||
|
||||
{% addtoblock "js" %}
|
||||
<script src="{{STATIC_URL}}/js/bootstrap-datepicker.js"></script>
|
||||
<script src="{{STATIC_URL}}/js/bootstrap-datepicker.de.js"></script>
|
||||
<script>
|
||||
|
||||
$(document).ready(function(){
|
||||
|
||||
var datepicker = $('#calendar').datepicker({
|
||||
minViewMode: 1,
|
||||
endDate: "{% now "SHORT_DATE_FORMAT" %}",
|
||||
format: "dd.mm.yyyy",
|
||||
language: "de",
|
||||
})
|
||||
|
||||
datepicker.on( "changeDate", function(e){
|
||||
var month = e.date.getMonth() +1
|
||||
window.location ="?month="+month + "&year="+ e.date.getFullYear() ;
|
||||
} );
|
||||
|
||||
$('#new_message_form').submit( function() {
|
||||
if ( $('#message_title').val() == "" ) {
|
||||
alert( "Nachricht hat keinen Titel!");
|
||||
return false;
|
||||
}
|
||||
if ( $('#message_text').val() == "" ) {
|
||||
alert( "Nachricht hat keinen Text!");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
} );
|
||||
</script>
|
||||
{% endaddtoblock %}
|
||||
|
||||
|
||||
<div id="blog_post">
|
||||
<div class="container">
|
||||
{% if archiveMode %}
|
||||
<h2>Forum Archiv {{month}}/{{year}}</h2>
|
||||
{% else %}
|
||||
<h2>Forum</h2>
|
||||
{% endif %}
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
|
||||
<div class="span8">
|
||||
<div class="comments">
|
||||
{% for message in messages %}
|
||||
<div class="comment">
|
||||
<div class="row">
|
||||
|
||||
<div class="span1">
|
||||
<img src="{{MEDIA_URL}}/user_images/{{message.author}}_circle.png" class="img-circle author_pic">
|
||||
</div>
|
||||
<div class="span7">
|
||||
<div class="name">
|
||||
{{ message.titel }}
|
||||
</div>
|
||||
<div class="date"> {{ message.author.first_name}} am {{message.creation_time}} </div>
|
||||
<div class="response">{{message.text|linebreaks }}</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
|
||||
<div class="new_comment" id="new_comment">
|
||||
<h4>Neue Nachricht</h4>
|
||||
<form id="new_message_form" method="post" action="" >
|
||||
{% csrf_token %}
|
||||
<div class="row">
|
||||
<div class="span8">
|
||||
<input placeholder="Titel / Betreff" id='message_title' name="titel" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span8">
|
||||
<textarea placeholder="Nachricht" rows="7" id='message_text' name="text"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span8">
|
||||
<input value="Abschicken" class="btn send" type="submit">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<!-- SideBar -->
|
||||
<div class="span3 sidebar offset1">
|
||||
<div class="box" >
|
||||
<h4>Archiv</h4>
|
||||
<div id="calendar" {% if archiveMode %} data-date="01.{{month}}.{{year}}" {% endif %}></div>
|
||||
</div>
|
||||
|
||||
<div class="box2">
|
||||
<a href="#new_comment" >Nachricht schreiben</a><br/>
|
||||
{% if archiveMode %}
|
||||
<a href="." >Aktuelle Nachrichten</a>
|
||||
{% endif%}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
42
simpleforum/views.py
Normal file
42
simpleforum/views.py
Normal file
@@ -0,0 +1,42 @@
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.shortcuts import render,redirect
|
||||
|
||||
from datetime import datetime
|
||||
from models import Message
|
||||
|
||||
|
||||
@login_required
|
||||
def message_view( request ):
|
||||
|
||||
if request.method == 'POST':
|
||||
if 'titel' in request.POST and 'text' in request.POST:
|
||||
titel = request.POST.get('titel')
|
||||
text = request.POST.get('text')
|
||||
|
||||
if len(titel) > 0 and len(text) > 0:
|
||||
print "create"
|
||||
Message.objects.create( titel = titel, text = text, author = request.user, creation_time = datetime.now() )
|
||||
else:
|
||||
print "Titel " + titel + " - text " + text
|
||||
|
||||
return redirect( message_view )
|
||||
|
||||
|
||||
context = dict()
|
||||
|
||||
if request.method == 'GET':
|
||||
if 'month' in request.GET and 'year' in request.GET:
|
||||
year = int( request.GET['year'] )
|
||||
month = int( request.GET['month'] )
|
||||
until_date = datetime( year, month+1, 01 )
|
||||
from_date = datetime( year, month , 01 )
|
||||
context['archiveMode'] = True
|
||||
context['year'] = year
|
||||
context['month'] = month
|
||||
context['messages'] = Message.objects.filter( creation_time__lt=until_date ).filter( creation_time__gte=from_date).order_by('-creation_time')
|
||||
else:
|
||||
context['messages'] = Message.objects.order_by('-creation_time')[:20]
|
||||
context['archiveMode'] = False
|
||||
|
||||
return render ( request, 'simpleforum/simpleforum.html', context )
|
||||
|
||||
Reference in New Issue
Block a user