punkweb-bb 0.4.3__py3-none-any.whl → 0.5.0__py3-none-any.whl

punkweb_bb/templates/punkweb_bb/bbcode.html

@@ -3,16 +3,18 @@
 
 {% block content %}
 
-<div class="pw-card fluid padding">
-  <h1>BBCode Reference</h1>
-  <div style="display: flex; flex-direction: column; gap: 1rem;">
-    {% for code in codes %}
-    <div>
-      <h4>{{ code.0 }}</h4>
-      <pre>{{ code.1 }}</pre>
-      {{ code.1|render }}
+<div class="pw-card fluid">
+  <div class="pw-card-header">BBCode Reference</div>
+  <div class="pw-card-content">
+    <div class="flex flex-column gap-4">
+      {% for code in codes %}
+      <div>
+        <h4>{{ code.0 }}</h4>
+        <pre>{{ code.1 }}</pre>
+        {{ code.1|render }}
+      </div>
+      {% endfor %}
     </div>
-    {% endfor %}
   </div>
 </div>
 

punkweb_bb/templates/punkweb_bb/category_create.html

@@ -3,11 +3,6 @@
 
 {% block title_prefix %}Create Category | {% endblock %}
 
-{% block extra_head %}
-{{form.media.css}}
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/category-form.css' %}" />
-{% endblock %}
-
 {% block content %}
 
 <nav>
@@ -21,21 +16,13 @@
   </ul>
 </nav>
 
-<div class="pw-card fluid">
+<div class="pw-card">
   <div class="pw-card-header">Create Category</div>
   <div class="pw-card-content">
-    <form class="categoryForm" action="{% url 'punkweb_bb:category_create' %}" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:category_create' %}" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      <div class="categoryForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
-      </div>
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <div class="categoryForm__actions">
+      {{ form }}
+      <div class="pw-form-actions end">
         <a class="pw-button default" href="{% url 'punkweb_bb:index' %}" type="submit">Cancel</a>
         <button class="pw-button raised primary" type="submit">Create</button>
       </div>
@@ -44,7 +31,3 @@
 </div>
 
 {% endblock %}
-
-{% block extra_script %}
-{{form.media.js}}
-{% endblock %}

punkweb_bb/templates/punkweb_bb/category_update.html

@@ -3,11 +3,6 @@
 
 {% block title_prefix %}Edit Category | {% endblock %}
 
-{% block extra_head %}
-{{form.media.css}}
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/category-form.css' %}" />
-{% endblock %}
-
 {% block content %}
 
 <nav>
@@ -27,18 +22,10 @@
 <div class="pw-card fluid">
   <div class="pw-card-header">Edit Category</div>
   <div class="pw-card-content">
-    <form class="categoryForm" action="{% url 'punkweb_bb:category_update' category.slug %}" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:category_update' category.slug %}" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      <div class="categoryForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
-      </div>
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <div class="categoryForm__actions">
+      {{ form }}
+      <div class="pw-form-actions end">
         <a class="pw-button default" href="{{category.get_absolute_url}}">Cancel</a>
         <button class="pw-button raised primary" type="submit">Save</button>
       </div>
@@ -47,7 +34,3 @@
 </div>
 
 {% endblock %}
-
-{% block extra_script %}
-{{form.media.js}}
-{% endblock %}

punkweb_bb/templates/punkweb_bb/components/pagination_controls.html

@@ -0,0 +1,45 @@
+{% if paginator.has_other_pages %}
+<nav>
+  <ul class="pw-pagination">
+    {% if paginator.has_previous %}
+    <li class="pw-pagination-item">
+      <a class="pw-pagination-link" href="?page={{paginator.previous_page_number}}">
+        Prev
+      </a>
+    </li>
+    {% else %}
+    <li class="pw-pagination-item disabled">
+      <a class="pw-pagination-link" href="#">
+        Prev
+      </a>
+    </li>
+    {% endif %}
+    {% for i in paginator.paginator.page_range %}
+    {% if paginator.number == i %}
+    <li class="pw-pagination-item active">
+      <a class="pw-pagination-link" href="#">
+        {{i}}
+      </a>
+    </li>
+    {% else %}
+    <li class="pw-pagination-item">
+      <a class="pw-pagination-link" href="?page={{i}}">
+        {{i}}
+      </a>
+    </li>
+    {% endif %}
+    {% endfor %}
+    {% if paginator.has_next %}
+    <li class="pw-pagination-item">
+      <a class="pw-pagination-link" href="?page={{paginator.next_page_number}}">
+        Next
+      </a>
+    </li>
+    {% else %}
+    <li class="pw-pagination-item disabled">
+      <a class="pw-pagination-link" href="#">Next</a>
+    </li>
+    {% endif %}
+  </ul>
+</nav>
+{% endif %}

punkweb_bb/templates/punkweb_bb/components/profile_image.html

@@ -0,0 +1,11 @@
+{% load static %}
+<div class="pw-avatar {{size|default:"xs"}}">
+  {% if user.profile.image %}
+  <img
+    class="pw-avatar-image"
+    src="{{user.profile.image.url}}"
+    alt="{{user.username}}" />
+  {% else%}
+  <div class="pw-avatar-fallback">{{user.username|slice:":1"}}</div>
+  {% endif %}
+</div>

punkweb_bb/templates/punkweb_bb/forms/inline_form.html

@@ -0,0 +1,6 @@
+{% for field in form %}
+<div class="pw-form-group">
+  <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+  {{ field }}
+</div>
+{% endfor %}

punkweb_bb/templates/punkweb_bb/forms/stacked_form.html

@@ -0,0 +1,35 @@
+{% for field in form %}
+{% if field.widget_type == "clearablefile" %}
+<div class="pw-form-group">
+  <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+  {% if field.value %}
+  <div class="pw-avatar xl">
+    <img class="pw-avatar-image" src="{{ field.value.url }}" alt="{{ field.label }}">
+  </div>
+  <label>
+    <input type="checkbox" name="{{ field.name }}-clear" id="{{ field.name }}-clear_id" />
+    Remove
+  </label>
+  {% endif %}
+  <input type="file" name="{{ field.name }}" accept="image/*" id="{{ field.id_for_label }}" />
+  {{ field.errors }}
+</div>
+{% elif field.widget_type == "checkbox" %}
+<div class="pw-form-group check">
+    {{ field }}
+    <label class="pw-checkbox-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+  {{ field.errors }}
+</div>
+{% else %}
+<div class="pw-form-group">
+  {% if field.label %}
+  <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+  {% endif %}
+  {{ field }}
+  {{ field.errors }}
+</div>
+{% endif %}
+{% endfor %}
+{% if form.non_field_errors %}
+{{ form.non_field_errors }}
+{% endif %}

punkweb_bb/templates/punkweb_bb/index.html

@@ -1,6 +1,6 @@
 {% extends 'punkweb_bb/base.html' %}
 
-{% load static render styled_username %}
+{% load static punkweb_bb render styled_username %}
 
 {% block extra_head %}
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/index.css' %}" />
@@ -16,11 +16,12 @@
 <div class="index">
   <div class="index__main">
     <div class="index__categories">
-      {% if punkweb_bb.settings.SHOUTBOX_ENABLED|default:True %}
+      {% punkweb_bb "SHOUTBOX_ENABLED" as shoutbox_enabled %}
+      {% if shoutbox_enabled %}
       {% include 'punkweb_bb/shoutbox/shoutbox.html' %}
       {% endif %}
       {% for category in categories %}
-      <div id="{{category.slug}}.{{category.order}}" class="pw-card fluid margin">
+      <div id="{{category.slug}}.{{category.order}}" class="pw-card fluid mb-4">
         <div class="pw-table-container">
           <table class="pw-table">
             <colgroup>
@@ -54,10 +55,10 @@
                     {% endif %}
                     {% if perms.punkweb_bb.delete_category %}
                     <a
-                      class="pw-icon-button default danger rounded sm"
+                      class="pw-icon-button default red rounded sm"
                       title="Delete category"
                       hx-get="{% url 'punkweb_bb:category_delete' category.slug %}"
-                      hx-target="#modal-portal"
+                      hx-target="#dialog-portal"
                     >
                     <span class="material-symbols-outlined">delete</span>
                     </a>
@@ -84,11 +85,7 @@
                   {% if subcategory.latest_thread %}
                   {% if subcategory.latest_thread.latest_post %}
                   <div class="subcategory__latestThread">
-                    {% if subcategory.latest_thread.latest_post.user.profile.image %}
-                    <img class="pw-avatar xs" src="{{subcategory.latest_thread.latest_post.user.profile.image.url}}" />
-                    {% else%}
-                    <img class="pw-avatar xs" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" />
-                    {% endif %}
+                    {% include 'punkweb_bb/components/profile_image.html' with user=subcategory.latest_thread.latest_post.user %}
                     <div class="subcategory__latestThread__info">
                       <a class="subcategory__latestThread__info__title"
                         href="{{subcategory.latest_thread.get_absolute_url}}" title="{{subcategory.latest_thread.title}}">
@@ -108,11 +105,7 @@
                   </div>
                   {% else %}
                   <div class="subcategory__latestThread">
-                    {% if subcategory.latest_thread.user.profile.image %}
-                    <img class="pw-avatar xs" src="{{subcategory.latest_thread.user.profile.image.url}}" />
-                    {% else%}
-                    <img class="pw-avatar xs" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" />
-                    {% endif %}
+                    {% include 'punkweb_bb/components/profile_image.html' with user=subcategory.latest_thread.user %}
                     <div class="subcategory__latestThread__info">
                       <a class="subcategory__latestThread__info__title"
                         href="{{subcategory.latest_thread.get_absolute_url}}" title="{{subcategory.latest_thread.title}}">
@@ -153,75 +146,77 @@
       {% endif %}
     </div>
     <div class="index__sidebar">
-      <div class="pw-card fluid">
+      <div class="pw-card fluid mb-4">
         <div class="pw-card-header">Recent threads</div>
-        <div class="index__recentThreads__content">
-          {% for thread in recent_threads %}
-          <div class="index__recentThreads__thread">
-            {% if thread.user.profile.image %}
-            <img class="pw-avatar xs" src="{{thread.user.profile.image.url}}" />
-            {% else%}
-            <img class="pw-avatar xs" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" />
-            {% endif %}
-            <div class="index__recentThreads__thread__info">
-              <a class="index__recentThreads__thread__info__title" href="{{thread.get_absolute_url}}"
-                title="{{thread.title}}">
-                {{thread.title}}
-              </a>
-              <div>
-                <time datetime="{{thread.created_at|date:'c'}}">
-                  {{thread.created_at|date:'M j, Y'}} at
-                  {{thread.created_at|date:'g:i A'}}
-                </time>
-                •
-                <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
-                  {{thread.user|styled_username}}
+        <div class="pw-card-content">
+          <div class="index__recentThreads">
+            {% for thread in recent_threads %}
+            <div class="index__recentThreads__thread">
+              {% include 'punkweb_bb/components/profile_image.html' with user=thread.user %}
+              <div class="index__recentThreads__thread__info">
+                <a class="index__recentThreads__thread__title" href="{{thread.get_absolute_url}}"
+                  title="{{thread.title}}">
+                  {{thread.title}}
                 </a>
+                <div>
+                  <time datetime="{{thread.created_at|date:'c'}}">
+                    {{thread.created_at|date:'M j, Y'}} at
+                    {{thread.created_at|date:'g:i A'}}
+                  </time>
+                  •
+                  <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
+                    {{thread.user|styled_username}}
+                  </a>
+                </div>
               </div>
             </div>
+            {% endfor %}
           </div>
-          {% endfor %}
         </div>
       </div>
-      <div class="pw-card fluid margin">
+      <div class="pw-card fluid">
         <div class="pw-card-header">Statistics</div>
-        <div class="index__statistics__content">
-          <div class="index__statistics__list">
-            <div class="index__statistics__row">
-              <div class="index__statistics__label">Total threads:</div>
-              <div class="index__statistics__value">
-                {{thread_count}}
+        <div class="pw-card-content">
+          <div class="index__statistics">
+            <div class="index__statistics__list">
+              <div class="index__statistics__row">
+                <div class="index__statistics__label">Total threads:</div>
+                <div class="index__statistics__value">
+                  {{thread_count}}
+                </div>
               </div>
-            </div>
-            <div class="index__statistics__row">
-              <div class="index__statistics__label">Total posts:</div>
-              <div class="index__statistics__value">{{post_count}}</div>
-            </div>
-            <div class="index__statistics__row">
-              <div class="index__statistics__label">Total members:</div>
-              <div class="index__statistics__value">{{users|length}}</div>
-            </div>
-            {% if newest_user %}
-            <div class="index__statistics__row">
-              <div class="index__statistics__label">Newest member:</div>
-              <div class="index__statistics__value">
-                <a href="{% url 'punkweb_bb:profile' newest_user.id %}">
-                  {{newest_user|styled_username}}
-                </a>
+              <div class="index__statistics__row">
+                <div class="index__statistics__label">Total posts:</div>
+                <div class="index__statistics__value">{{post_count}}</div>
+              </div>
+              <div class="index__statistics__row">
+                <div class="index__statistics__label">Total members:</div>
+                <div class="index__statistics__value">{{users|length}}</div>
+              </div>
+              {% if newest_user %}
+              <div class="index__statistics__row">
+                <div class="index__statistics__label">Newest member:</div>
+                <div class="index__statistics__value">
+                  <a href="{% url 'punkweb_bb:profile' newest_user.id %}">
+                    {{newest_user|styled_username}}
+                  </a>
+                </div>
+              </div>
+              {% endif %}
+              <div class="index__statistics__row">
+                <div class="index__statistics__label">Users online:</div>
+                <div class="index__statistics__value">{{total_online}} ({{members_online|length}} members, {{staff_online|length}} staff, {{guests_online}} guests)</div>
               </div>
-            </div>
-            {% endif %}
-            <div class="index__statistics__row">
-              <div class="index__statistics__label">Users online:</div>
-              <div class="index__statistics__value">{{total_online}} ({{members_online|length}} members, {{staff_online|length}} staff, {{guests_online}} guests)</div>
             </div>
           </div>
         </div>
       </div>
-      {% if punkweb_bb.settings.DISCORD_WIDGET_ENABLED %}
-      {% if punkweb_bb.settings.DISCORD_SERVER_ID %}
+      {% punkweb_bb "DISCORD_WIDGET_ENABLED" as discord_widget_enabled %}
+      {% punkweb_bb "DISCORD_SERVER_ID" as discord_server_id %}
+      {% if discord_widget_enabled %}
+      {% if discord_server_id %}
       <iframe
-        src="https://discord.com/widget?id={{ punkweb_bb.settings.DISCORD_SERVER_ID }}&theme={{ punkweb_bb.settings.DISCORD_WIDGET_THEME|default:'dark' }}"
+        src="https://discord.com/widget?id={{ discord_server_id }}&theme={% punkweb_bb "DISCORD_WIDGET_THEME" %}"
         width="100%"
         height="384"
         allowtransparency="true"
@@ -229,7 +224,7 @@
         sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts">
       </iframe>
       {% else %}
-      <div class="pw-callout danger">
+      <div class="pw-callout red mt-4">
         <h4>Discord Widget Error</h4>
         <p><code>DISCORD_SERVER_ID</code> not configured in settings module.</p>
       </div>

punkweb_bb/templates/punkweb_bb/login.html

@@ -21,21 +21,15 @@
   </ul>
 </nav>
 
-<div class="pw-card center">
+<div class="pw-card centerPage">
   <div class="pw-card-header">Login</div>
   <div class="pw-card-content">
-    <form class="loginForm" action="{% url 'punkweb_bb:login' %}" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:login' %}" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      <div class="loginForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
+      {{ form }}
+      <div class="pw-form-actions">
+        <button class="pw-button fluid raised primary" type="submit">Login</button>
       </div>
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <button class="pw-button fluid raised primary" type="submit">Login</button>
     </form>
   </div>
 </div>

punkweb_bb/templates/punkweb_bb/members.html

@@ -21,19 +21,31 @@
   </ul>
 </nav>
 
-<div class="pw-card fluid">
+<div class="members__header">
+  <h1>Members</h1>
+  <form class="pw-form inline" action="{% url 'punkweb_bb:members' %}" method="get">
+    {{ form }}
+    <div class="pw-form-actions">
+      <button class="pw-button raised" type="submit">Search</button>
+    </div>
+  </form>
+</div>
+
+{% if users|length > 0 %}
+<div class="pw-card fluid mb-4">
   <ul class="members__list">
     {% for user in users %}
     <li class="members__user">
       <div class="members__user__avatar">
-        {% if user.profile.image %}
-        <img class="pw-avatar sm" src="{{user.profile.image.url}}" />
-        {% else %}
-        <img class="pw-avatar sm" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" />
-        {% endif %}
+        {% include 'punkweb_bb/components/profile_image.html' with user=user size="sm" %}
       </div>
       <div class="members__user__info">
-        <div class="members__user__username"><a href="{% url 'punkweb_bb:profile' user.id %}">{{ user|styled_username }}</a></div>
+        <div class="members__user__username">
+          <a href="{% url 'punkweb_bb:profile' user.id %}">{{ user|styled_username }}</a>
+          {% if user.profile.is_online %}
+          <div class="onlineIndicator"></div>      
+          {% endif %}    
+        </div>
         <div class="members__user__stats">
           <div class="members__user__stat">
             Posts:
@@ -51,51 +63,10 @@
     {% endfor %}
   </ul>
 </div>
-
-{% if users.has_other_pages %}
-<nav>
-  <ul class="pw-pagination">
-    {% if users.has_previous %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{% url 'punkweb_bb:members' %}?page={{users.previous_page_number}}">
-        Prev
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item disabled">
-      <a class="pw-pagination-link" href="#">
-        Prev
-      </a>
-    </li>
-    {% endif %}
-    {% for i in users.paginator.page_range %}
-    {% if users.number == i %}
-    <li class="pw-pagination-item active">
-      <a class="pw-pagination-link" href="#">
-        {{i}}
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{% url 'punkweb_bb:members' %}?page={{i}}">
-        {{i}}
-      </a>
-    </li>
-    {% endif %}
-    {% endfor %}
-    {% if users.has_next %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{% url 'punkweb_bb:members' %}?page={{users.next_page_number}}">
-        Next
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item disabled">
-      <a class="pw-pagination-link" href="#">Next</a>
-    </li>
-    {% endif %}
-  </ul>
-</nav>
+{% else %}
+<h3>No results found.</h3>
 {% endif %}
 
+{% include 'punkweb_bb/components/pagination_controls.html' with paginator=users %}
+
 {% endblock %}

punkweb_bb/templates/punkweb_bb/partials/category_delete.html

@@ -1,4 +1,4 @@
-{% extends 'punkweb_bb/base_delete_modal.html' %}
+{% extends 'punkweb_bb/base_delete_dialog.html' %}
 
 {% block title %}Delete Category{% endblock %}
 

punkweb_bb/templates/punkweb_bb/partials/post_delete.html

@@ -1,4 +1,4 @@
-{% extends 'punkweb_bb/base_delete_modal.html' %}
+{% extends 'punkweb_bb/base_delete_dialog.html' %}
 
 {% block title %}Delete Post{% endblock %}
 

punkweb_bb/templates/punkweb_bb/partials/post_update.html

@@ -1,19 +1,12 @@
-{% extends 'punkweb_bb/base_modal.html' %}
+{% extends 'punkweb_bb/base_dialog.html' %}
 
 {% block title %}Edit Post{% endblock %}
 
 {% block content %}
-<form class="postForm" action="{% url 'punkweb_bb:post_update' post.id %}" method="post">
+<form class="pw-form" action="{% url 'punkweb_bb:post_update' post.id %}" method="post">
   {% csrf_token %}
-  {% for field in form %}
-  <div class="postForm__field">
-    {{ field }}
-  </div>
-  {% endfor %}
-  {% if form.non_field_errors %}
-  {{ form.non_field_errors }}
-  {% endif %}
-  <div class="postForm__actions">
+  {{ form }}
+  <div class="pw-form-actions end">
     <button class="pw-button raised primary" type="submit">Save</button>
   </div>
 </form>

punkweb_bb/templates/punkweb_bb/partials/shout_delete.html

@@ -1,4 +1,4 @@
-{% extends 'punkweb_bb/base_delete_modal.html' %}
+{% extends 'punkweb_bb/base_delete_dialog.html' %}
 
 {% block title %}Delete Shout{% endblock %}
 

punkweb_bb/templates/punkweb_bb/partials/subcategory_delete.html

@@ -1,4 +1,4 @@
-{% extends 'punkweb_bb/base_delete_modal.html' %}
+{% extends 'punkweb_bb/base_delete_dialog.html' %}
 
 {% block title %}Delete Subcategory{% endblock %}
 

punkweb_bb/templates/punkweb_bb/partials/thread_delete.html

@@ -1,4 +1,4 @@
-{% extends 'punkweb_bb/base_delete_modal.html' %}
+{% extends 'punkweb_bb/base_delete_dialog.html' %}
 
 {% block title %}Delete Thread{% endblock %}
 

punkweb_bb/templates/punkweb_bb/partials/thread_move.html

@@ -1,21 +1,13 @@
-{% extends 'punkweb_bb/base_modal.html' %}
+{% extends 'punkweb_bb/base_dialog.html' %}
 
 {% block title %}Move Thread{% endblock %}
 
 {% block content %}
-<form class="threadMoveForm" action="{% url 'punkweb_bb:thread_move' thread.id %}" method="post">
+<form class="pw-form" action="{% url 'punkweb_bb:thread_move' thread.id %}" method="post">
   {% csrf_token %}
-  {% for field in form %}
-  <div class="threadMoveForm__field">
-    <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-    {{ field }}
-  </div>
-  {% endfor %}
-  {% if form.non_field_errors %}
-  {{ form.non_field_errors }}
-  {% endif %}
-  <div class="threadMoveForm__actions">
-    <button class="modal__cancel pw-button default">Cancel</button>
+  {{ form }}
+  <div class="pw-form-actions end">
+    <button class="pw-dialog-cancel pw-button default">Cancel</button>
     <button class="pw-button raised primary" type="submit">Move</button>
   </div>
 </form>