new inbox view

app/__init__.py

@@ -117,11 +117,11 @@ def create_app():
         return datetime.utcfromtimestamp(ts or int(time.time())).strftime(format)
 
     @app.template_filter("pluralize")
-    def pluralize(number, singular = "", plural = "s"):
+    def pluralize(subject, num=1, singular = "", plural = "s"):
-        if number == 1:
+        if int(num) == 1:
-            return singular
+            return subject + singular
 
-        return plural
+        return subject + plural
 
     @app.template_filter("permission_string")
     def permission_string(term):

app/templates/common/macros.html

@@ -178,7 +178,7 @@
 {% endif %}
 <div class="accordion {{ "hidden" if hidden else ""}}" style="{{style}}">
   <div class="accordion-header">
-    <button type="button" class="accordion-toggle" {{"disabled" if disabled else ""}}>{{ "►" if hidden else "▼" }}</button>
+    <button type="button" class="accordion-toggle" {{"disabled" if disabled else ""}}>{{ "+" if hidden else "-" }}</button>
     {{ caller('header') }}
   </div>
   <div class="accordion-content {{ "hidden" if hidden else "" }}">

app/templates/mod/user-list.html

@@ -8,7 +8,7 @@
     {% if section == "header" %}
       <span>Unconfirmed guests</span>
     {% elif section == "content" %}
-      <table class="users-table">
+      <table class="colorful-table">
         <thead>
           <th>Username</th>
           <th class="small">Signed up on</th>
@@ -32,7 +32,7 @@
     {% if section == "header" %}
       <span>Other users</span>
     {% elif section == "content" %}
-      <table class="users-table">
+      <table class="colorful-table">
         <thead>
           <th>Username</th>
           <th class="small">Permission</th>

app/templates/users/inbox.html

@@ -1,51 +1,65 @@
-{% from "common/macros.html" import timestamp, full_post %}
+{% from "common/macros.html" import timestamp, full_post, accordion %}
 {% extends "base.html" %}
 {% block title %}inbox{% endblock %}
 {% block content %}
-<div class="inbox-container">
+<div class="darkbg inbox-container">
-  {% if all_subscriptions is none %}
+  {% set has_subscriptions = all_subscriptions is not none %}
-    You have no subscriptions.<br>
+  {% call(section) accordion(disabled=not has_subscriptions) %}
-  {% else %}
+    {% if section == "header" %}
-    Your subscriptions:
+      {% if not has_subscriptions %}
-    <ul>
+        (You have no subscriptions)
-      {% for sub in all_subscriptions %}
+      {% else %}
-        <li>
+        Your subscriptions
-          <a href=" {{ url_for("threads.thread", slug=sub.thread_slug) }} ">{{ sub.thread_title }}</a>
+      {% endif %}
-          <form class="modform" method="post" action="{{ url_for("threads.subscribe", slug = sub.thread_slug) }}">
+    {% elif section == "content" and has_subscriptions %}
-            <input type="hidden" name="subscribe" value="unsubscribe">
+      <table class="colorful-table">
-            <input class="warn" type="submit" value="Unsubscribe">
+        <thead>
-          </form>
+          <th>Thread</th>
-        </li>
+          <th class="small">Unsubscribe</th>
+        </thead>
+        {% for sub in all_subscriptions %}
+          <tr>
+            <td>
+              <a href=" {{ url_for("threads.thread", slug=sub.thread_slug) }} ">{{ sub.thread_title }}</a>
+            </td>
+            <td>
+              <form class="modform" method="post" action="{{ url_for("threads.subscribe", slug = sub.thread_slug) }}">
+                <input type="hidden" name="subscribe" value="unsubscribe">
+                <input class="warn" type="submit" value="Unsubscribe">
+              </form>
+            </td>
+          </tr>
+        {% endfor %}
+      </table>
+    {% endif %}
+  {% endcall %}
+  {% if has_subscriptions %}
+    {% if not new_posts %}
+      You have no unread posts.
+    {% else %}
+      You have {{ total_unreads_count }} total unread {{("post" | pluralize(num=total_unreads_count))}}:
+      {% for thread in new_posts %}
+        {% call(section) accordion() %}
+          {% if section == "header" %}
+            {% set latest_post_id = thread.posts[-1].id %}
+            {% set unread_posts_text = " (" + (thread.unread_count | string) + (" unread post" | pluralize(num=thread.unread_count)) %}
+            <a class="accordion-title" href="{{ url_for("threads.thread", slug=latest_post_slug, after=latest_post_id, _anchor="post-" + (latest_post_id | string)) }}" title="Jump to latest post">{{thread.thread_title + unread_posts_text}}, latest at {{ timestamp(thread.newest_post_time) }})</a>
+            <form class="modform" method="post" action="{{ url_for("threads.subscribe", slug = thread.thread_slug) }}">
+              <input type="hidden" name="subscribe" value="read">
+              <input type="submit" value="Mark thread as Read">
+            </form>
+            <form class="modform" method="post" action="{{ url_for("threads.subscribe", slug = thread.thread_slug) }}">
+              <input type="hidden" name="subscribe" value="unsubscribe">
+              <input class="warn" type="submit" value="Unsubscribe">
+            </form>
+          {% elif section == "content" %}
+            {% for post in thread.posts %}
+              {{ full_post(post, no_reply = true) }}
+            {% endfor %}
+          {% endif %}
+        {% endcall %}
       {% endfor %}
-    </ul>
+    {% endif %}
-  {% endif %}
-  {% if not new_posts %}
-    You have no unread posts.
-  {% else %}
-    You have {{ total_unreads_count }} unread post{{(total_unreads_count | int) | pluralize }}:
-    {% for thread in new_posts %}
-      <div class="accordion">
-        <div class="accordion-header">
-          <button type="button" class="accordion-toggle">▼</button>
-          {% set latest_post_id = thread.posts[-1].id %}
-          {% set unread_posts_text = " (" + (thread.unread_count | string) + (" unread post" | pluralize) %}
-          <a class="accordion-title" href="{{ url_for("threads.thread", slug=latest_post_slug, after=latest_post_id, _anchor="post-" + (latest_post_id | string)) }}" title="Jump to latest post">{{thread.thread_title + unread_posts_text}}, latest at {{ timestamp(thread.newest_post_time) }})</a>
-          <form class="modform" method="post" action="{{ url_for("threads.subscribe", slug = thread.thread_slug) }}">
-            <input type="hidden" name="subscribe" value="read">
-            <input type="submit" value="Mark thread as Read">
-          </form>
-          <form class="modform" method="post" action="{{ url_for("threads.subscribe", slug = thread.thread_slug) }}">
-            <input type="hidden" name="subscribe" value="unsubscribe">
-            <input class="warn" type="submit" value="Unsubscribe">
-          </form>
-        </div>
-        <div class="accordion-content">
-          {% for post in thread.posts %}
-            {{ full_post(post, no_reply = true) }}
-          {% endfor %}
-        </div>
-      </div>
-    {% endfor %}
   {% endif %}
 </div>
 {% endblock %}

data/static/js/ui.js

@@ -120,7 +120,7 @@ document.addEventListener("DOMContentLoaded", () => {
       e.stopPropagation();
       accordion.classList.toggle("hidden");
       content.classList.toggle("hidden");
-      toggleButton.textContent = content.classList.contains("hidden") ? "►" : "▼"
+      toggleButton.textContent = content.classList.contains("hidden") ? "+" : "-"
     }
     
     toggleButton.addEventListener("click", toggle);

data/static/style.css

@@ -570,25 +570,25 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus, select:focus
   border-collapse: collapse;
 }
 
-.users-table {
+.colorful-table {
   border-collapse: collapse;
   width: 100%;
   margin: 10px 0;
   overflow: hidden;
 }
 
-.users-table tr th {
+.colorful-table tr th {
   background-color: #beb1ce;
   padding: 5px 0;
 }
 
-.users-table tr td {
+.colorful-table tr td {
   background-color: rgb(177, 206, 204.5);
   padding: 5px 0;
   text-align: center;
 }
 
-.users-table .small {
+.colorful-table .small {
   width: 250px;
 }
 

sass/style.scss

@@ -567,25 +567,25 @@ input[type="text"], input[type="password"], textarea, select {
   border-collapse: collapse;
 }
 
-.users-table {
+.colorful-table {
   border-collapse: collapse;
   width: 100%;
   margin: 10px 0;
   overflow: hidden;
 }
 
-.users-table tr th {
+.colorful-table tr th {
   background-color: $button_color2;
   padding: 5px 0;
 }
 
-.users-table tr td {
+.colorful-table tr td {
   background-color: $button_color;
   padding: 5px 0;
   text-align: center;
 }
 
-.users-table .small {
+.colorful-table .small {
   width: 250px;
 }