u/bodqhrohro/swineboard Commit - r18:174f8766

boards/__init__.pyc

0 binary modified 0 0

NO CONTENT: modified file, binary diff hidden

boards/admin.pyc

0 binary modified 0 0

NO CONTENT: modified file, binary diff hidden

boards/forms.py

0 +1 -1

             from django import forms
             class NewThreadForm(forms.Form):
                 title = forms.CharField(max_length = 100)
                 text = forms.CharField(widget = forms.Textarea)
-                image = forms.ImageField()
+                image = forms.ImageField(required=False)
                 tags = forms.CharField(max_length=100)

boards/models.pyc

0 binary modified 0 0

NO CONTENT: modified file, binary diff hidden

boards/static/css/base_page.css

0 +14 -1

             html {
                 background: #555555;
             }
-            #admin_panel {
+            .admin_panel {
                 background: #FF0000;
                 color: #00FF00
             }
+            .input_field {
+            }
+            .input_field_name {
+            }
+            .input_field_error {
+                color: #FF0000;
+            }
             .title {
                 font-weight: bold;
                 color: #ffcc00;
             }
             .text {
                 color: #ffffff;
             }
             .post-form {
                 text-align: left;
                 color: #ffffff;
             }
             .link {
                 color: #33bb33
             }
             .link:hover {
                 color: #00ff00;
             }

boards/urls.pyc

0 binary modified 0 0

NO CONTENT: modified file, binary diff hidden

boards/views.py

0 +14 -4

             from django.template import RequestContext
             from boards import forms
+            from boards.forms import NewThreadForm
             from boards.models import Post, Admin
             from django.shortcuts import render, get_list_or_404
-            from django.http import HttpResponseRedirect, Http404
+            from django.http import HttpResponseRedirect
             def index(request):
                 context = RequestContext(request)
                 if request.method == 'POST':
-                    Post.objects.create_post(request.POST['title'],
-                        request.POST['text'], ip = request.META['REMOTE_ADDR'])
+                    form = NewThreadForm(request.POST)
+                    if form.is_valid():
+                        Post.objects.create_post(form.cleaned_data['title'],
+                            form.cleaned_data['text'], ip = request.META['REMOTE_ADDR'])
+                    else:
+                        context['form'] = form
                 threads = Post.objects.get_threads()
                 context['threads'] = None if len(threads) == 0 else threads
-                context['form'] = forms.NewThreadForm()
+                if 'form' not in context:
+                    context['form'] = forms.NewThreadForm()
                 return render(request, 'posting_general.html',
                     context)
             def new_post(request):
                 """Add a new post (in thread or as a reply)."""
                 title = request.POST['title']
                 text = request.POST['text']
                 image = request.POST['image']
                 # TODO Get tags list, download image (if link is given)
                 post = Post.objects.create_post(title = title, text = text, image = image)
                 # TODO Show the thread with a newly created post
             def tag(request):
                 """Get all tag threads (posts without a parent)."""
                 tag_name = request.GET['tag']
                 threads = get_list_or_404(Post, tag = tag_name)
                 context = RequestContext(request)
                 context['threads'] = None if len(threads) == 0 else threads
                 context['tag'] = tag_name
                 return render(request, 'posting_general.html',
                     context)
             def thread(request, id):
                 """Get all thread posts"""
                 # TODO Show 404 if there is no such thread
                 posts = Post.objects.get_thread(id)
                 context = RequestContext(request)
                 context['posts'] = posts
                 return render(request, 'thread.html', context)
             def login(request):
                 """Log in as admin"""
                 if 'name' in request.POST and 'password' in request.POST:
                     request.session['admin'] = False
                     isAdmin = len(Admin.objects.filter(name = request.POST['name'],
                         password = request.POST['password'])) > 0
                     if isAdmin :
                         request.session['admin'] = True
                         response = HttpResponseRedirect('/boards')
                     else:
                         response = render(request, 'login.html', {'error' : 'Login error'})
                 else:
                     response = render(request, 'login.html', {})
                 return response
             def logout(request):
                 request.session['admin'] = False
                 return HttpResponseRedirect('/boards')

boards/views.pyc

0 binary modified 0 0

NO CONTENT: modified file, binary diff hidden

templates/base.html

0 +1 -1

             <!DOCTYPE html>
             <html>
             <head>
                 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/base_page.css" media="all"/>
                 {% block head %}{% endblock %}
             </head>
             <body>
-            <div id="admin_panel">
+            <div class="admin_panel">
                 {% if request.session.admin == True %}
                     Admin panel TODO: Need to implement <BR />
                 {% endif %}
             </div>
             {% block content %}{% endblock %}
             </body>
             </html>

templates/posting_general.html

0 +26 -2

             {% extends "base.html" %}
             {% block content %}
             	{% if threads %}
             		{% for thread in threads %}
                         <span class="title">{{ thread.title }}</span><br />
                         <span class="text">{{ thread.text }}</span><br />
                         <a class="link" href="/boards/post/{{ thread.id }}/">View
                             thread</a>
                         <hr />
             		{% endfor %}
             	{% else %}
             		No threads found.
                     <hr />
             	{% endif %}
                 <div class="post-form">
                 <form action="/boards/" method="post">{% csrf_token %}
-            		{{ form.as_p }}
+                    <div class="input_field_name">
-            		<input type="submit" value="Post!" />
+                        <span class=input_field_error>{{ form.title.errors }}</span>
+                        <label class=input_field_name for="title">Title</label>
+                        {{ form.title }}
+                    </div>
+                    <div class="input_field_name">
+                        <span class=input_field_error>{{ form.text.errors }}</span>
+                        <label class=input_field_name for="text">Text</label>
+                        {{ form.text }}
+                    </div>
+                    <div class="input_field_name">
+                        <label class=input_field_name for="image">Avatar</label>
+                        {{ form.image }}
+                    </div>
+                    <div class="input_field_name">
+                        <span class=input_field_error>{{ form.tags.errors}}</span>
+                        <label class=input_field_name for="tags">Name</label>
+                        {{ form.tags }}
+                    </div>
+            		<input type="submit" value="Create" />
             	</form>
                 </div>
             	<HR />
             {% endblock %}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages