u/bodqhrohro/swineboard Commit - r31:e49d51eb

Changed metadata design. Make space split tags.

neko259 -

r31:e49d51eb default

parent child

boards/forms.py

0 +14 -2

@@ -8,7 +8,6 b' class PostForm(forms.Form):'
8	title = forms.CharField(max_length=50, required=False)	8	title = forms.CharField(max_length=50, required=False)
9	text = forms.CharField(widget=forms.Textarea, required=False)	9	text = forms.CharField(widget=forms.Textarea, required=False)
10	image = forms.ImageField(required=False)	10	image = forms.ImageField(required=False)
11	tags = forms.CharField(max_length=100, required=False)
12		11
13	def clean_text(self):	12	def clean_text(self):
14	text = self.cleaned_data['text']	13	text = self.cleaned_data['text']
@@ -38,4 +37,17 b' class PostForm(forms.Form):'
38		37
39		38
40	class ThreadForm(PostForm):	39	class ThreadForm(PostForm):
41	tags = forms.CharField(max_length=100) No newline at end of file	40	tags = forms.CharField(max_length=100)
		41
		42	def clean_tags(self):
		43	tags = self.cleaned_data['tags']
		44	if tags:
		45	if ('+' in tags) or ('/' in tags):
		46	raise forms.ValidationError('Inappropriate characters in tags')
		47
		48	return tags
		49
		50	def clean(self):
		51	cleaned_data = super(ThreadForm, self).clean()
		52
		53	return cleaned_data No newline at end of file

boards/models.py

0 +13 0

             import os
+            import re
             from django.db import models
             from django.utils import timezone
             import time
                 # TODO Connect the tag to its posts to check the number of threads for
                 # the tag.
+                def __unicode__(self):
+                    return self.name
             class Post(models.Model):
                 """A post is a message."""
                     # TODO Make a better algorithm for describing gets
                     return self.id == 1 or self.id % 10 == 0
+                def get_parsed_text(self):
+                    text = self.text
+                    # TODO Implement parsing
+                    # Make //text colored
+                    # Make >>12 links to posts
+                    return text
             class Admin(models.Model):
                 """

boards/static/css/base_page.css

0 +6 -5

             html {
-                background: #444;
+                background: #555;
                 color: #ffffff;
             }
             }
             .metadata {
-                background: #666;
-                padding: 10px;
-                border-radius: 5px;
                 float: left;
-                margin-top: 5px;
+                padding: 2px;
+                margin-top: 10px;
+                border: solid 1px #666;
+                font-size: 0.9em;
+                color: #ddd
             }

boards/views.py

0 +1 -1

                     tag_strings = data['tags']
                     if tag_strings:
-                        tag_strings = tag_strings.split(',')
+                        tag_strings = tag_strings.split(' ')
                         for tag_name in tag_strings:
                             tag_name = tag_name.strip()
                             if len(tag_name) > 0:

templates/base.html

0 +4 -1

+            {% load staticfiles %}
             <!DOCTYPE html>
             <html>
             <head>
-                <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/base_page.css" media="all"/>
+                <link rel="stylesheet" type="text/css"
+                      href="{% static "css/base_page.css" %}" media="all"/>
                 {% block head %}{% endblock %}
             </head>
             <body>

templates/posting_general.html

0 +10 -6

                             <span class="title">{{ thread.title }}</span>
                             <span class="post_id">(#{{ thread.id }})</span>
                             [{{ thread.pub_time }}]
-                            [<a class="link" href="/thread/{{ thread.id }}/">{% trans "View" %}</a>]<br />
+                            [<a class="link" href="{% url 'thread' thread.id %}"
-                            {{ thread.text|truncatechars:300 }}<br />
+                                >{% trans "View" %}</a>]<br />
+                            {{ thread.get_parsed_text|linebreaksbr|truncatechars:300 }}<br
+                                />
                             <div class="metadata">
-                                ({{ thread.get_reply_count }} {% trans 'replies' %},
+                                {{ thread.get_reply_count }} {% trans 'replies' %},
                                 {{ thread.get_images_count }} {% trans 'images' %},
-                                {{ thread.get_gets_count }} {% trans 'gets' %})
+                                {{ thread.get_gets_count }} {% trans 'gets' %}.
-                                <br />
                                 {% if thread.tags.all %}
                                     <span class="tags">{% trans 'Tags' %}:
                                         {% for tag in thread.tags.all %}
-                                            <a class="tag" href="/tag/{{ tag.name }}">
+                                            <a class="tag" href="
+                                            {% url 'tag' tag_name=tag.name %}">
                                                 {{ tag.name }}</a>
                                         {% endfor %}
                                     </span>
                             <div class="form-input">{{ form.tags }}</div>
                         </div>
                         <input type="submit" value="{% trans 'Post' %}" />
+                        <hr />
+                        {% trans "Tags must be delimited by spaces. Text or image is required." %}
                     </form>
                 </div>

templates/thread.html

0 +2 -2

                             <a class="post_id" href="#{{ post.id }}">
                                 (#{{ post.id }})</a>
                             [{{ post.pub_time }}]<br />
-                            {{ post.text }}<br />
+                            {{ post.get_parsed_text|linebreaksbr }}<br />
                             {% if post.tags.all %}
                                 <div class="metadata">
                                     <span class="tags">{% trans 'Tags' %}:
                                         {% for tag in post.tags.all %}
-                                            <a class="tag" href="/tag/{{ tag.name }}">
+                                            <a class="tag" href="{% url 'tag' tag.name %}">
                                                 {{ tag.name }}</a>
                                         {% endfor %}
                                     </span>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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