diff --git a/boards/static/css/md/base_page.css b/boards/static/css/md/base_page.css --- a/boards/static/css/md/base_page.css +++ b/boards/static/css/md/base_page.css @@ -13,24 +13,7 @@ html { 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; } @@ -66,10 +49,6 @@ html { border-radius: 5px; } -.form-title { - font-weight: bolder; -} - .metadata { padding: 2px; margin-top: 10px; @@ -86,6 +65,88 @@ html { 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 diff --git a/boards/static/css/sw/base_page.css b/boards/static/css/sw/base_page.css --- a/boards/static/css/sw/base_page.css +++ b/boards/static/css/sw/base_page.css @@ -64,38 +64,58 @@ a { 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 { @@ -115,10 +135,6 @@ a { padding-bottom: 1em; } -.form-title { - font-weight: bolder; -} - .metadata { background: #C0E4E8; border: 1px solid #7F9699; @@ -126,4 +142,22 @@ a { 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 diff --git a/neboard/settings.py b/neboard/settings.py --- a/neboard/settings.py +++ b/neboard/settings.py @@ -133,6 +133,7 @@ INSTALLED_APPS = ( 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', + 'django.contrib.markup', 'boards', ) diff --git a/templates/base.html b/templates/base.html --- a/templates/base.html +++ b/templates/base.html @@ -5,7 +5,8 @@ + href="{{ STATIC_URL }}css/{{ theme }}/base_page.css" media="all"/> + {% block head %}{% endblock %} diff --git a/templates/posting_general.html b/templates/posting_general.html --- a/templates/posting_general.html +++ b/templates/posting_general.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% load i18n %} +{% load markup %} {% block head %} Neboard @@ -23,9 +24,8 @@ (#{{ thread.id }}) [{{ thread.pub_time }}] [{% trans "View" %}]
- {{ thread.get_parsed_text|linebreaksbr|truncatechars:300 }}
+ >{% trans "View" %}] + {{ thread.get_parsed_text|markdown|truncatechars:300 }}
{{ thread.get_reply_count }} {% trans 'replies' %}, @@ -48,29 +48,35 @@
{% endif %} -
- {% trans "Create new thread" %} -
{% csrf_token %} -
-
{% trans 'Title' %}
-
{{ form.title }}
-
-
-
{% trans 'Text' %}
-
{{ form.text }}
+ {% csrf_token %} +
+
{% trans "Create new thread" %}
+
+
+
{% trans 'Title' %}
+
{{ form.title }}
+
+
+
{% trans 'Text' %}
+
{{ form.text }}
+
+
+
{% trans 'Image' %}
+
{{ form.image }}
+
+
+
{% trans 'Tags' %}
+
{{ form.tags }}
+
+
+
+
Tags must be delimited by spaces. Text or image is required
-
-
{% trans 'Image' %}
-
{{ form.image }}
-
-
-
{% trans 'Tags' %}
-
{{ form.tags }}
-
- -
- {% trans "Tags must be delimited by spaces. Text or image is required." %} - +
Use + markdown syntax for posting.
+ {% endblock %} \ No newline at end of file diff --git a/templates/settings.html b/templates/settings.html --- a/templates/settings.html +++ b/templates/settings.html @@ -8,22 +8,27 @@ {% block content %} +
{% trans "Theme" %}
{% csrf_token %} {% for choice in form.fields.theme.choices %} - -
+
+ +
{% endfor %}
+
{% endblock %} \ No newline at end of file diff --git a/templates/thread.html b/templates/thread.html --- a/templates/thread.html +++ b/templates/thread.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% load i18n %} +{% load markup %} {% block head %} Neboard @@ -23,8 +24,8 @@ {{ post.title }} (#{{ post.id }}) - [{{ post.pub_time }}]
- {{ post.get_parsed_text|linebreaksbr }}
+ [{{ post.pub_time }}] + {{ post.get_parsed_text|markdown:"safe" }}
{% if post.tags.all %}