Changed themes.

boards/static/css/md/base_page.css

@@ -1,91 +1,152 b''
 html {
     background: #555;
     color: #ffffff;
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .title {
     font-weight: bold;
     color: #ffcc00;
 }
 
-.post-form {
-    text-align: left;
-    display: table;
-    border-radius: 5px;
-    padding: 5px;
-    margin: 5px;
-    background: #334;
-}
-
-.form-row {
-    display: table-row;
-}
-
-.form-input {
-    display: table-cell;
-}
-
-.link {
+.link, a {
     color: #afdcec;
 }
 
 .link:hover {
     color: #fff380;
 }
 
 .post_id {
     color: #ffffff;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .tag {
     color: #b4cfec;
 }
 
 .tag:hover {
     color: #d0edb4;
 }
 
 .post_id {
     color: #fff380;
 }
 
 .post {
     background: #333;
     margin: 5px;
     padding: 10px;
     border-radius: 5px;
 }
 
-.form-title {
-    font-weight: bolder;
-}
-
 .metadata {
     padding: 2px;
     margin-top: 10px;
     border: solid 1px #666;
     font-size: 0.9em;
     color: #ddd
 }
 
 #navigation_panel {
     background: #444;
     margin: 5px;
     padding: 10px;
     border-radius: 5px;
     color: #eee;
 }
 
+#navigation_panel .link {
+    border-right: 1px solid #fff;
+    font-weight: bold;
+    margin-right: 1ex;
+    padding-right: 1ex;
+}
 #navigation_panel .link:last-child {
+    border-left: 1px solid #fff;
+    border-right: none;
     float: right;
+    margin-left: 1ex;
+    margin-right: 0;
+    padding-left: 1ex;
+    padding-right: 0;
+}
+
+#navigation_panel::after {
+    clear: both;
+    content: ".";
+    display: block;
+    height: 0;
+    line-height: 0;
+    visibility: hidden;
+}
+
+p {
+    margin-top: .5em;
+    margin-bottom: .5em;
+}
+
+.post-form-w {
+    display: table;
+    background: #333344;
+    border-radius: 5px;
+    color: #fff;
+    padding: 10px;
+    margin: 5px
+}
+
+.form-row {
+    display: table-row;
+}
+
+.form-label, .form-input {
+    display: table-cell;
+}
+
+.form-label {
+    padding: .25em 1ex .25em 0;
+}
+
+.form-input {
+    padding: .25em 0;
+}
+
+.post-form input, .post-form textarea {
+    background: #333;
+    color: #fff;
+    border: solid 1px;
+    padding: 0;
+    width: 100%;
+}
+
+.form-submit {
+    border-bottom: 2px solid #ddd;
+    margin-bottom: .5em;
+    padding-bottom: .5em;
+}
+
+.form-title {
+    font-weight: bold;
+}
+
+input[type="submit"] {
+    background: #222;
+    border: solid 1px #fff;
+    color: #fff;
+}
+
+blockquote {
+    border-left: solid 2px;
+    padding-left: 5px;
+    color: #B1FB17;
+    margin: 0;
 }
  No newline at end of file

boards/static/css/sw/base_page.css

@@ -1,129 +1,163 b''
 * {
     font-size: inherit;
     margin: 0;
     padding: 0;
 }
 html {
     background: #fff;
     color: #000;
     font: medium sans-serif;
 }
 a {
     color: inherit;
     text-decoration: underline;
 }
 
 #admin_panel {
     background: #182F6F;
     color: #fff;
     padding: .5ex 1ex .5ex 1ex;
 }
 
 #navigation_panel {
     background: #182F6F;
     color: #B4CFEC;
     margin-bottom: 1em;
     padding: .5ex 1ex 1ex 1ex;
 }
 #navigation_panel::after {
     clear: both;
     content: ".";
     display: block;
     height: 0;
     line-height: 0;
     visibility: hidden;
 }
 
 #navigation_panel a:link, #navigation_panel a:visited, #navigation_panel a:hover {
     text-decoration: none;
 }
 
 #navigation_panel .link {
     border-right: 1px solid #fff;
     color: #fff;
     font-weight: bold;
     margin-right: 1ex;
     padding-right: 1ex;
 }
 #navigation_panel .link:last-child {
     border-left: 1px solid #fff;
     border-right: none;
     float: right;
     margin-left: 1ex;
     margin-right: 0;
     padding-left: 1ex;
     padding-right: 0;
 }
 
 #navigation_panel .tag {
     color: #fff;
 }
 
 .title {
     color: #182F6F;
     font-weight: bold;
 }
 
-.post-form {
+.post-form-w {
     background: #182F6F;
     border-radius: 1ex;
     color: #fff;
-    display: table;
     margin: 1em 1ex;
     padding: 1ex;
-    text-align: left;
 }
+.post-form {
+    display: table;
+    border-collapse: collapse;
+    width: 100%;
 
-.post-form .form-row {
+}
+.form-row {
     display: table-row;
 }
-
-.post-form .form-input {
+.form-label, .form-input {
     display: table-cell;
+    vertical-align: top;
+}
+.form-label {
+    padding: .25em 1ex .25em 0;
+}
+.form-input {
     padding: .25em 0;
 }
-
-.post-form input[type="submit"] {
+.form-input > * {
+    background: #fff;
+    color: #000;
+    border: none;
+    padding: 0;
+    resize: vertical;
+    width: 100%;
+}
+.form-submit {
+    border-bottom: 1px solid #666;
+    margin-bottom: .5em;
+    padding-bottom: .5em;
+}
+.form-title {
+    font-weight: bold;
+    margin-bottom: .5em;
+}
+.post-form .settings_item {
+    margin: .5em 0;
+}
+.form-submit input {
+    margin-top: .5em;
     padding: .2em 1ex;
 }
-
-.post-form .form-row input, .post-form .form-row textarea {
-    background: #fff;
-    border: none;
-    color: #000;
-    width: 100%;
-}
-
-.post-form hr {
-    margin: 1em 0;
+.form-label {
+    text-align: right;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .post_id {
     color: #a00;
 }
 
 .post {
     background: #FFF;
     border-bottom: 1px solid #182F6F;
     margin: 0 1ex 1em 1ex;
     overflow-x: auto;
     padding-bottom: 1em;
 }
 
-.form-title {
-    font-weight: bolder;
-}
-
 .metadata {
     background: #C0E4E8;
     border: 1px solid #7F9699;
     border-radius: .4ex;
     display: table;
     margin-top: .5em;
     padding: .4em;
+}
+
+.post ul, .post ol {
+    margin: .5em 0 .5em 3ex;
+}
+.post li {
+    margin: .2em 0;
+}
+.post p {
+    margin: .5em 0;
+}
+.post blockquote {
+    border-left: 3px solid #182F6F;
+    margin: .5em 0 .5em 3ex;
+    padding-left: 1ex;
+}
+.post blockquote > blockquote {
+    padding-top: .1em;
 }
  No newline at end of file

neboard/settings.py

@@ -1,176 +1,177 b''
 # Django settings for neboard project.
 import os
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', '[e-mail]'),
     ('admin', '[e-mail]')
 )
 
 MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'database.db',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
 TIME_ZONE = 'Europe/Kiev'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'ru'
 
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
 USE_L10N = True
 
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = ''
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = ''
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = ''
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
 # Additional locations of static files
 # It is really a hack, put real paths, not related
 STATICFILES_DIRS = (
     os.path.dirname(__file__) + '/boards/static',
 
 #    '/d/work/python/django/neboard/neboard/boards/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '@1rc$o(7=tt#kd+4s$u6wchm**z^)4x90)7f6z(i&55@o11*8o'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 #     'django.template.loaders.eggs.Loader',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
 #    'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
 ROOT_URLCONF = 'neboard.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'neboard.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     'templates',
 )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
      'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
+    'django.contrib.markup',
     'boards',
 )
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
 # See http://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'filters': {
         'require_debug_false': {
             '()': 'django.utils.log.RequireDebugFalse'
         }
     },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
             'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
         }
     },
     'loggers': {
         'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
             'propagate': True,
         },
     }
 }
 
 # Custom imageboard settings
 MAX_POSTS_PER_THREAD = 100
 MAX_THREAD_COUNT = 20
 SITE_NAME = 'Neboard'
 
 THEMES = [
     ('md', 'Mystic Dark'),
     ('sw', 'Snow White') ]
 DEFAULT_THEME = 'md'
  No newline at end of file

templates/base.html

@@ -1,32 +1,33 b''
 {% load staticfiles %}
 {% load i18n %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css"
-          href="{{ STATIC_URL }}/css/{{ theme }}/base_page.css" media="all"/>
+          href="{{ STATIC_URL }}css/{{ theme }}/base_page.css" media="all"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
     {% block head %}{% endblock %}
 </head>
 <body>
 <div id="admin_panel">
 
     {% if request.session.admin == True %}
         Admin panel TODO: Need to implement <BR />
     {% endif %}
 
 </div>
 
 <div id="navigation_panel">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
         <a class="tag" href=" {% url 'tag' tag_name=tag.name %}">
             {{ tag.name }}</a>({{ tag.get_post_count }})
     {% endfor %}
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 </body>
 </html>
  No newline at end of file

templates/posting_general.html

@@ -1,76 +1,82 b''
 {% extends "base.html" %}
 
 {% load i18n %}
+{% load markup %}
 
 {% block head %}
     <title>Neboard</title>
 {% endblock %}
 
 {% block content %}
 
 	{% if threads %}
 		{% for thread in threads %}
             <div class="post">
             {% if thread.image %}
                 <div class="block">
                     <a href="{{ thread.image.url }}"><img
                             src="{{ thread.image.url_200x150 }}" />
                     </a>
                 </div>
             {% endif %}
             <div class="block">
                 <span class="title">{{ thread.title }}</span>
                 <span class="post_id">(#{{ thread.id }})</span>
                 [{{ thread.pub_time }}]
                 [<a class="link" href="{% url 'thread' thread.id %}"
-                    >{% trans "View" %}</a>]<br />
-                {{ thread.get_parsed_text|linebreaksbr|truncatechars:300 }}<br
-                    />
+                    >{% trans "View" %}</a>]
+                {{ thread.get_parsed_text|markdown|truncatechars:300 }}
             </div>
                 <div class="metadata">
                     {{ thread.get_reply_count }} {% trans 'replies' %},
                     {{ thread.get_images_count }} {% trans 'images' %},
                     {{ thread.get_gets_count }} {% trans 'gets' %}.
                     {% if thread.tags.all %}
                         <span class="tags">{% trans 'Tags' %}:
                             {% for tag in thread.tags.all %}
                                 <a class="tag" href="
                                 {% url 'tag' tag_name=tag.name %}">
                                     {{ tag.name }}</a>
                             {% endfor %}
                         </span>
                     {% endif %}
                 </div>
             </div>
         {% endfor %}
 	{% else %}
 		No threads found.
         <hr />
 	{% endif %}
 
-    <div class="post-form">
-        <span class="form-title">{% trans "Create new thread" %}</span>
-        <form enctype="multipart/form-data" method="post">{% csrf_token %}
-            <div class="form-row">
-                <div class="form-input">{% trans 'Title' %}</div>
-                <div class="form-input">{{ form.title }}</div>
-            </div>
-            <div class="form-row">
-                <div class="form-input">{% trans 'Text' %}</div>
-                <div class="form-input">{{ form.text }}</div>
+    <form enctype="multipart/form-data" method="post">{% csrf_token %}
+    <div class="post-form-w">
+        <div class="form-title">{% trans "Create new thread" %}</div>
+        <div class="post-form">
+        <div class="form-row">
+            <div class="form-label">{% trans 'Title' %}</div>
+            <div class="form-input">{{ form.title }}</div>
+        </div>
+        <div class="form-row">
+            <div class="form-label">{% trans 'Text' %}</div>
+            <div class="form-input">{{ form.text }}</div>
+        </div>
+        <div class="form-row">
+            <div class="form-label">{% trans 'Image' %}</div>
+            <div class="form-input">{{ form.image }}</div>
+        </div>
+        <div class="form-row">
+            <div class="form-label">{% trans 'Tags' %}</div>
+            <div class="form-input">{{ form.tags }}</div>
+        </div>
+        </div>
+        <div class="form-submit"><input type="submit"
+            value="{% trans "Post" %}"/></div>
+        <div>Tags must be delimited by spaces. Text or image is required
             </div>
-            <div class="form-row">
-                <div class="form-input">{% trans 'Image' %}</div>
-                <div class="form-input">{{ form.image }}</div>
-            </div>
-            <div class="form-row">
-                <div class="form-input">{% trans 'Tags' %}</div>
-                <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>Use <a
+                href="http://daringfireball.net/projects/markdown/basics">
+            markdown</a> syntax for posting.</div>
     </div>
+    </form>
 
 {% endblock %}
  No newline at end of file

templates/settings.html

@@ -1,29 +1,34 b''
 {% extends "base.html" %}
 
 {% load i18n %}
 
 {% block head %}
     <title>Neboard settings</title>
 {% endblock %}
 
 {% block content %}
 
+    <div class="post-form-w">
     <div class="post-form">
         <span class="form-title">{% trans "Theme" %}</span>
         <form method="post">{% csrf_token %}
             {% for choice in form.fields.theme.choices %}
-                <input type="radio" name="theme"
-                       id="{{ choice.0 }}"
-                       value="{{ choice.0 }}"
-                       {% ifequal form.initial.theme choice.0 %}
-                        checked
-                       {% endifequal %}
-                        />
-                <label for="{{ choice.0 }}">{{ choice.1 }}
-                </label><br />
+                <div class="settings_item">
+                    <label for="{{ choice.0 }}">
+                    <input type="radio" name="theme"
+                           id="{{ choice.0 }}"
+                           value="{{ choice.0 }}"
+                           {% ifequal form.initial.theme choice.0 %}
+                            checked
+                           {% endifequal %}
+                            />
+                        {{ choice.1 }}
+                    </label>
+                </div>
             {% endfor %}
         <input type="submit" value="{% trans "Save" %}" />
         </form>
     </div>
+    </div>
 
 {% endblock %}
  No newline at end of file

templates/thread.html

@@ -1,65 +1,74 b''
 {% extends "base.html" %}
 
 {% load i18n %}
+{% load markup %}
 
 {% block head %}
     <title>Neboard</title>
 {% endblock %}
 
 {% block content %}
 
 	{% if posts %}
 		{% for post in posts %}
             <a name="{{ post.id }}"></a>
             <div class="post">
             {% if post.image %}
                 <div class="block">
                     <a href="{{ post.image.url }}"><img
                         src="{{ post.image.url_200x150 }}" />
                     </a>
                 </div>
             {% endif %}
             <div class="block">
                 <span class="title">{{ post.title }}</span>
                 <a class="post_id" href="#{{ post.id }}">
                     (#{{ post.id }})</a>
-                [{{ post.pub_time }}]<br />
-                {{ post.get_parsed_text|linebreaksbr }}<br />
+                [{{ post.pub_time }}]
+                {{ post.get_parsed_text|markdown:"safe" }}
             </div>
             {% if post.tags.all %}
                 <div class="metadata">
                     <span class="tags">{% trans 'Tags' %}:
                         {% for tag in post.tags.all %}
                             <a class="tag" href="{% url 'tag' tag.name %}">
                                 {{ tag.name }}</a>
                         {% endfor %}
                     </span>
                 </div>
             {% endif %}
             </div>
 		{% endfor %}
 	{% else %}
 		No threads found.
         <hr />
 	{% endif %}
 
-    <div class="post-form">
-        <span class="form-title">{% trans "Reply to the thread" %}</span>
-        <form enctype="multipart/form-data" method="post">{% csrf_token %}
-            <div class="form-row">
-                <div class="form-input">{% trans 'Title' %}</div>
-                <div class="form-input">{{ form.title }}</div>
+    <form enctype="multipart/form-data" method="post">{% csrf_token %}
+        <div class="post-form-w">
+            <div class="form-title">{% trans "Create new thread" %}</div>
+            <div class="post-form">
+                <div class="form-row">
+                    <div class="form-label">{% trans 'Title' %}</div>
+                    <div class="form-input">{{ form.title }}</div>
+                </div>
+                <div class="form-row">
+                    <div class="form-label">{% trans 'Text' %}</div>
+                    <div class="form-input">{{ form.text }}</div>
+                </div>
+                <div class="form-row">
+                    <div class="form-label">{% trans 'Image' %}</div>
+                    <div class="form-input">{{ form.image }}</div>
+                </div>
             </div>
-            <div class="form-row">
-                <div class="form-input">{% trans 'Text' %}</div>
-                <div class="form-input">{{ form.text }}</div>
-            </div>
-            <div class="form-row">
-                <div class="form-input">{% trans 'Image' %}</div>
-                <div class="form-input">{{ form.image }}</div>
-            </div>
-            <input type="submit" value="{% trans 'Post' %}" />
-        </form>
-    </div>
+            <div class="form-submit"><input type="submit"
+                                            value="{% trans "Post" %}"/></div>
+            <div>Use <a
+                    href="http://daringfireball.net/projects/markdown/basics">
+                markdown</a> syntax for posting.</div>
+            <div>Example: *<i>italic</i>*, **<b>bold</b>**</div>
+            <div>Insert quotes with "&gt;"</div>
+        </div>
+    </form>
 
 {% endblock %}
  No newline at end of file