punkweb-bb 0.4.1__tar.gz → 0.4.3__tar.gz

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb_bb
-Version: 0.4.1
+Version: 0.4.3
 Summary: Django application that provides a simple and modern forum board software for your Django website.
 Home-page: https://github.com/Punkweb/PunkwebBB
 Author: Punkweb

punkweb_bb-0.4.3/punkweb_bb/bbcode.py

@@ -0,0 +1,226 @@
+import bbcode
+
+
+def add_font_tag(parser):
+    def _render_font(name, value, options, parent, context):
+        if "font" in options:
+            font = options["font"].strip()
+            return f'<span style="font-family:{font};">{value}</span>'
+        return value
+
+    parser.add_formatter("font", _render_font)
+
+
+def add_size_tag(parser):
+    def _render_size(name, value, options, parent, context):
+        if "size" in options:
+            size = options["size"].strip()
+            return f'<font size="{size}">{value}</font>'
+        return value
+
+    parser.add_formatter("size", _render_size)
+
+
+def add_color_tag(parser):
+    def _render_color(name, value, options, parent, context):
+        if "color" in options:
+            color = options["color"].strip()
+            return f'<span style="color: {color}">{value}</span>'
+        return value
+
+    parser.add_formatter("color", _render_color)
+
+
+def add_shadow_tag(parser):
+    def _render_shadow(name, value, options, parent, context):
+        if "shadow" in options:
+            shadow = options["shadow"].strip()
+            return f'<span id="bbcode-shadow" style="text-shadow: 0px 0px 1em {shadow}">{value}</span>'
+        return value
+
+    parser.add_formatter("shadow", _render_shadow)
+
+
+def add_url_tag(parser):
+    def _render_url(name, value, options, parent, context):
+        if "url" in options:
+            url = options["url"]
+            return f'<a href="{url}">{value}</a>'
+        return f'<a href="{value}">{value}</a>'
+
+    parser.add_formatter(
+        "url", _render_url, replace_links=False, replace_cosmetic=False
+    )
+
+
+def add_quote_tag(parser):
+    def _render_quote(name, value, options, parent, context):
+        if "quote" in options:
+            return f'<blockquote><cite>{options["quote"]} said: </cite>{value}</blockquote>'
+        return f"<blockquote>{value}</blockquote>"
+
+    parser.add_formatter(
+        "quote", _render_quote, strip=True, swallow_trailing_newline=True
+    )
+
+
+def add_code_tag(parser):
+    def _render_code(name, value, options, parent, context):
+        if "code" in options:
+            language = options["code"].strip()
+            return f'<pre><code class="language-{language}">{value}</code></pre>'
+        return f"<pre><code>{value}</code></pre>"
+
+    parser.add_formatter(
+        "code",
+        _render_code,
+        render_embedded=False,
+        transform_newlines=False,
+        replace_links=False,
+        replace_cosmetic=False,
+        strip=True,
+        swallow_trailing_newline=True,
+    )
+
+
+def add_img_tag(parser):
+    def _render_img(name, value, options, parent, context):
+        if "width" in options:
+            width = options["width"]
+        if "height" in options:
+            height = options["height"]
+
+        if "width" in options and "height" in options:
+            return (
+                f'<img src="{value}" alt="{value}" width="{width}" height="{height}" />'
+            )
+        elif "width" in options:
+            return f'<img src="{value}" alt="{value}" width="{width}" />'
+        elif "height" in options:
+            return f'<img src="{value}" alt="{value}" height="{height}" />'
+
+        return f'<img src="{value}" alt="{value}" />'
+
+    parser.add_formatter(
+        "img",
+        _render_img,
+        render_embedded=False,
+        replace_links=False,
+        replace_cosmetic=False,
+    )
+
+
+def add_spoiler_tag(parser):
+    def _render_spoiler(name, value, options, parent, context):
+        if "spoiler" in options:
+            summary = options["spoiler"]
+            return f"<details><summary>{summary}</summary>{value}</details>"
+
+    parser.add_formatter(
+        "spoiler", _render_spoiler, strip=True, swallow_trailing_newline=True
+    )
+
+
+def init_text_tags(parser):
+    parser.add_simple_formatter("b", "<strong>%(value)s</strong>")
+    parser.add_simple_formatter("i", "<em>%(value)s</em>")
+    parser.add_simple_formatter("u", "<u>%(value)s</u>")
+    parser.add_simple_formatter("s", "<s>%(value)s</s>")
+    parser.add_simple_formatter("sub", "<sub>%(value)s</sub>")
+    parser.add_simple_formatter("sup", "<sup>%(value)s</sup>")
+    parser.add_simple_formatter("escape", "%(value)s", render_embedded=False)
+
+    add_color_tag(parser)
+    add_shadow_tag(parser)
+    add_font_tag(parser)
+    add_url_tag(parser)
+
+
+def init_alignment_tags(parser):
+    parser.add_simple_formatter(
+        "center", '<div style="text-align: center">%(value)s</div>'
+    )
+    parser.add_simple_formatter("left", '<div style="text-align: left">%(value)s</div>')
+    parser.add_simple_formatter(
+        "right", '<div style="text-align: right">%(value)s</div>'
+    )
+
+
+def init_list_tags(parser):
+    parser.add_simple_formatter(
+        "ol",
+        "<ol>%(value)s</ol>",
+        transform_newlines=False,
+        strip=True,
+        swallow_trailing_newline=True,
+    )
+    parser.add_simple_formatter(
+        "ul",
+        "<ul>%(value)s</ul>",
+        transform_newlines=False,
+        strip=True,
+        swallow_trailing_newline=True,
+    )
+    parser.add_simple_formatter(
+        "li",
+        "<li>%(value)s</li>",
+        newline_closes=True,
+        transform_newlines=False,
+        same_tag_closes=True,
+        strip=True,
+    )
+
+
+def init_default_tags(parser):
+    init_text_tags(parser)
+    init_alignment_tags(parser)
+    init_list_tags(parser)
+
+    parser.add_simple_formatter("hr", "<hr />", standalone=True)
+    add_size_tag(parser)
+    add_img_tag(parser)
+    add_quote_tag(parser)
+    add_code_tag(parser)
+    add_spoiler_tag(parser)
+
+
+_parser = None
+_mix_parser = None
+_shoutbox_parser = None
+
+
+def get_parser():
+    global _parser
+    if _parser is None:
+        _parser = bbcode.Parser(
+            install_defaults=False,
+            replace_links=False,
+            replace_cosmetic=False,
+        )
+        init_default_tags(_parser)
+    return _parser
+
+
+def get_shoutbox_parser():
+    global _shoutbox_parser
+    if _shoutbox_parser is None:
+        _shoutbox_parser = bbcode.Parser(
+            install_defaults=False, replace_links=False, replace_cosmetic=False
+        )
+        init_text_tags(_shoutbox_parser)
+    return _shoutbox_parser
+
+
+def get_mix_parser():
+    global _mix_parser
+    if _mix_parser is None:
+        _mix_parser = bbcode.Parser(
+            install_defaults=False,
+            newline="\n",
+            replace_links=False,
+            replace_cosmetic=False,
+            escape_html=False,
+        )
+        init_default_tags(_mix_parser)
+
+    return _mix_parser

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/migrations/0001_initial.py

@@ -3,7 +3,6 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import precise_bbcode.fields
 import punkweb_bb.models
 import uuid
 
@@ -57,15 +56,9 @@ class Migration(migrations.Migration):
                 ("updated_at", models.DateTimeField(auto_now=True)),
                 ("name", models.CharField(max_length=255)),
                 ("slug", models.SlugField(max_length=1024, unique=True)),
-                (
-                    "_description_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "description",
-                    precise_bbcode.fields.BBCodeTextField(
-                        blank=True, no_rendered_field=True, null=True
-                    ),
+                    models.TextField(blank=True, null=True),
                 ),
                 ("order", models.PositiveIntegerField(default=0)),
                 ("staff_post_only", models.BooleanField(default=False)),
@@ -99,13 +92,9 @@ class Migration(migrations.Migration):
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
                 ("title", models.CharField(max_length=255)),
-                (
-                    "_content_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "content",
-                    precise_bbcode.fields.BBCodeTextField(no_rendered_field=True),
+                    models.TextField(),
                 ),
                 ("is_pinned", models.BooleanField(default=False)),
                 ("is_closed", models.BooleanField(default=False)),
@@ -173,13 +162,9 @@ class Migration(migrations.Migration):
                 ),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
-                (
-                    "_content_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "content",
-                    precise_bbcode.fields.BBCodeTextField(no_rendered_field=True),
+                    models.TextField(),
                 ),
                 (
                     "thread",
@@ -224,15 +209,9 @@ class Migration(migrations.Migration):
                         upload_to=punkweb_bb.models.profile_image_upload_to,
                     ),
                 ),
-                (
-                    "_signature_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "signature",
-                    precise_bbcode.fields.BBCodeTextField(
-                        blank=True, max_length=1024, no_rendered_field=True, null=True
-                    ),
+                    models.TextField(blank=True, max_length=1024, null=True),
                 ),
                 (
                     "user",

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/migrations/0004_groupstyle.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import precise_bbcode.fields
 import uuid
 
 
@@ -34,13 +33,9 @@ class Migration(migrations.Migration):
                         default=0, help_text="Highest priority is displayed"
                     ),
                 ),
-                (
-                    "_username_style_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "username_style",
-                    precise_bbcode.fields.BBCodeTextField(no_rendered_field=True),
+                    models.TextField(),
                 ),
                 (
                     "group",

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/migrations/0006_remove_boardprofile__signature_rendered_and_more.py

@@ -10,26 +10,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="boardprofile",
-            name="_signature_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="groupstyle",
-            name="_username_style_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="post",
-            name="_content_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="subcategory",
-            name="_description_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="thread",
-            name="_content_rendered",
-        ),
         migrations.AlterField(
             model_name="boardprofile",
             name="signature",

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/static/punkweb_bb/css/profile.css

@@ -26,6 +26,7 @@
 .profile__thread__list {
   list-style: none;
   padding: 0;
+  margin: 0;
 }
 
 .profile__thread {

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/static/punkweb_bb/editor/bbcode-editor-content.css

@@ -1,32 +1,29 @@
 /*! SCEditor | (C) 2011-2013, Sam Clarke | sceditor.com/license */
 html,
-body {
+body,
+p,
+code:before,
+table {
   color: #212529;
   font-family: Arial, Helvetica sans-serif;
   font-size: 16px;
   font-weight: 400;
   line-height: 1.5;
-  overflow: visible;
-}
-
-html {
-  height: 100%;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-body {
   margin: 0;
+  overflow: visible;
   padding: 0;
 }
 
+*,
 *:before,
 *:after {
   box-sizing: border-box;
 }
 
+html {
+  height: 100%;
+}
+
 .ios {
   /* Needed for iOS scrolling bug fix */
   overflow: auto;
@@ -50,10 +47,14 @@ body.placeholder::before {
   font-style: italic;
 }
 
-hr {
-  border: none;
-  border-top: 1px solid #ced4da;
-  margin: 1rem 0;
+table,
+td {
+  border: 1px dotted #000;
+  empty-cells: show;
+}
+
+table td {
+  min-width: 5px;
 }
 
 a {
@@ -84,6 +85,22 @@ blockquote cite {
   font-size: 1rem;
 }
 
+hr {
+  border: none;
+  border-top: 1px solid #ced4da;
+  margin: 1rem 0;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  padding: 0;
+  margin: 0;
+}
+
 /* Prevent empty paragraphs from collapsing */
 div,
 p {

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/templates/punkweb_bb/base_delete_modal.html

@@ -1,11 +1,11 @@
 {% extends 'punkweb_bb/base_modal.html' %}
 
 {% block content %}
-<p>
+<div>
   Are you sure you want to delete this {% block object_type %}{% endblock %}?
   <br />
   <b>This action cannot be undone!</b>
-</p>
+</div>
 <div class="modal__actions">
   <button class="modal__cancel pw-button default">Cancel</button>
   <button class="pw-button raised danger" hx-delete="{% block delete_url %}{% endblock %}">Delete</button>

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/templates/punkweb_bb/profile.html

@@ -65,7 +65,7 @@
   </div>
   {% if user.threads.count == 0 %}
     <div class="pw-card-content">
-      <p>{{ user.username }} has not created any threads.</p>
+      <div>{{ user.username }} has not created any threads.</div>
     </div>
     {% else %}
     <ul class="profile__thread__list">
@@ -75,9 +75,9 @@
             <div class="profile__thread__title">
               <a href="{% url 'punkweb_bb:thread' thread.id %}">{{ thread.title }}</a>
             </div>
-            <p class="profile__thread__preview">
+            <div class="profile__thread__preview">
               {{ thread.content|render|striptags|truncatechars:120 }}
-            </p>
+            </div>
             <div class="profile__thread__date">
               <time datetime="{{thread.created_at|date:'c'}}">
                 {{thread.created_at|date:'M j, Y'}} at

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/templates/punkweb_bb/thread.html

@@ -320,7 +320,7 @@
 <div class="pw-card fluid margin">
   <div class="pw-card-header">Thread closed</div>
   <div class="pw-card-content">
-    <p>This thread is closed and you cannot reply to it.</p>
+    <div>This thread is closed and you cannot reply to it.</div>
   </div>
 </div>
 {% endif %}

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/templatetags/render.py

@@ -5,7 +5,7 @@ from django import template
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
 
-from punkweb_bb.bbcode import get_parser, get_shoutbox_parser
+from punkweb_bb.bbcode import get_mix_parser, get_parser, get_shoutbox_parser
 from punkweb_bb.settings import PARSER
 
 register = template.Library()
@@ -22,6 +22,12 @@ def render(value):
         escaped = html.escape(value, quote=False)
         rendered = md.markdown(escaped, extensions=["markdown.extensions.fenced_code"])
         return mark_safe(rendered)
+    elif PARSER == "mix":
+        parser = get_mix_parser()
+        escaped = html.escape(value, quote=False)
+        rendered = parser.format(escaped)
+        rendered = md.markdown(rendered, extensions=["markdown.extensions.fenced_code"])
+        return mark_safe(rendered)
     return value
 
 
@@ -32,4 +38,8 @@ def render_shout(value):
         parser = get_shoutbox_parser()
         rendered = parser.format(value)
         return mark_safe(rendered)
+    if PARSER == "mix":
+        parser = get_shoutbox_parser()
+        rendered = parser.format(value)
+        return mark_safe(rendered)
     return value

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb/utils.py

@@ -11,6 +11,8 @@ def get_editor_widget():
         return BBCodeEditorWidget()
     elif PARSER == "markdown":
         return MarkdownEditorWidget()
+    elif PARSER == "mix":
+        return MarkdownEditorWidget()
     return Textarea(attrs={"class": "pw-input"})
 
 

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/punkweb_bb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb-bb
-Version: 0.4.1
+Version: 0.4.3
 Summary: Django application that provides a simple and modern forum board software for your Django website.
 Home-page: https://github.com/Punkweb/PunkwebBB
 Author: Punkweb

{punkweb_bb-0.4.1 → punkweb_bb-0.4.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="punkweb_bb",
-    version="0.4.1",
+    version="0.4.3",
     author="Punkweb",
     author_email="punkwebnet@gmail.com",
     packages=["punkweb_bb"],