Merge branch 'master' of https://github.com/Plume-org/Plume into icons

templates/base.html.tera

@@ -30,7 +30,7 @@
                             <span class="mobile-label">{{ "Notifications" | _ }}</span>
                         </a>
                         <a href="/logout">
-                            <i class="icon icon-log-out aria-label="{{ "Log Out" | _ }}"></i>
+                            <i class="icon icon-log-out" aria-label="{{ "Log Out" | _ }}"></i>
                             <span class="mobile-label">{{ "Log Out" | _ }}</span>
                         </a>
                         <a href="/me">

templates/macros.html.tera

@@ -2,7 +2,13 @@
     <div class="card">
         <h3><a href="{{ article.url }}">{{ article.post.title }}</a></h3>
         <main
-            <p>{{ article.post.content | safe | striptags | truncate(length=200) }}</p>
+            <p>
+                {% if article.post.subtitle | length > 0 %}
+                    {{ article.post.subtitle }}
+                {% else %}
+                    {{ article.post.content | safe | striptags | truncate(length=200) }}
+                {% endif %}
+            </p>
         </main>
         <p class="author">
         	{{ "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name | escape }}{{ link_4 }}" | _(

templates/posts/details.html.tera

@@ -11,6 +11,7 @@
 
 {% block content %}
     <h1 class="article">{{ article.post.title }}</h1>
+    <h2 class="article">{{ article.post.subtitle }}</h2>
     <p class="article-info">
         <span class="author">{{ "Written by {{ link_1 }}{{ url }}{{ link_2 }}{{ name | escape }}{{ link_3 }}" | _(
             link_1='<a href="/@/',
@@ -33,6 +34,20 @@
 
     <div class="article-meta">
         <p>{{ "This article is under the {{ license }} license." | _(license=article.post.license) }}</p>
+        <div class="flex">
+            <img src="{{ author.avatar }}" alt="{{ author.name }}" class="avatar medium padded">
+            <div class="grow">
+                <h2><a href="/@/{{ author.fqn }}">{{ author.name }}</a></h2>
+                <p>{{ author.summary | safe }}</h2>
+            </div>
+            <a href="/@/{{ author.fqn }}/follow" class="button">
+                {% if is_following %}
+                    {{ "Unfollow" | _ }}
+                {% else %}
+                    {{ "Follow" | _ }}
+                {% endif %}
+            </a>
+        </div>
 
         {% if account %}
             <div class="actions">
@@ -40,23 +55,34 @@
                     <p aria-label="{{ "{{ count }} likes" | _n(singular="One like", count=n_likes) }}" title="{{ "{{ count }} likes" | _n(singular="One like", count=n_likes) }}">{{ n_likes }}</p>
 
                     {% if has_liked %}
-                        <button type="submit" class="liked">{{ macros::feather(name="heart") }}{{ "I don't like this anymore" | _ }}</button>
+                        <button type="submit" class="action liked">{{ macros::feather(name="heart") }}{{ "I don't like this anymore" | _ }}</button>
                     {% else %}
-                        <button type="submit">{{ macros::feather(name="heart") }}{{ "Add yours" | _ }}</button>
+                        <button type="submit" class="action">{{ macros::feather(name="heart") }}{{ "Add yours" | _ }}</button>
                     {% endif %}
                 </form>
                 <form class="reshares" action="{{ article.url }}reshare" method="POST">
                     <p aria-label="{{ "{{ count }} Boosts" | _n(singular="One Boost", count=n_reshares) }}" title="{{ "{{ count }} Boosts" | _n(singular="One Boost", count=n_reshares) }}">{{ n_reshares }}</p>
 
                     {% if has_reshared %}
-                        <button type="submit" class="reshared"><i class="icon icon-repeat"></i>{{ "I don't want to boost this anymore" | _ }}</button>
+                        <button type="submit" class="action reshared"><i class="icon icon-repeat"></i>{{ "I don't want to boost this anymore" | _ }}</button>
                     {% else %}
-                        <button type="submit"><i class="icon icon-repeat"></i>{{ "Boost" | _ }}</button>
+                        <button type="submit" class="action"><i class="icon icon-repeat"></i>{{ "Boost" | _ }}</button>
                     {% endif %}
                 </form>
             </div>
         {% else %}
             <p class="center">{{ "Login or use your Fediverse account to interact with this article" | _ }}</p>
+            <div class="actions">
+                <div class="likes">
+                    <p aria-label="{{ "{{ count }} likes" | _n(singular="One like", count=n_likes) }}" title="{{ "{{ count }} likes" | _n(singular="One like", count=n_likes) }}">{{ n_likes }}</p>
+                    <a href="/login?m=Login%20to%20like" class="action">{{ macros::feather(name="heart") }}{{ "Add yours" | _ }}</a>
+                </div>
+
+                <div class="reshares">
+                    <p aria-label="{{ "{{ count }} Boosts" | _n(singular="One Boost", count=n_reshares) }}" title="{{ "{{ count }} Boosts" | _n(singular="One Boost", count=n_reshares) }}">{{ n_reshares }}</p>
+                    <a href="/login?m=Login%20to%20boost" class="action"><i class="icon icon-repeat"></i>{{ "Boost" | _ }}</a>
+                </div>
+            </div>
         {% endif %}
 
         <div class="comments">

templates/posts/new.html.tera

@@ -9,6 +9,7 @@
 <h1>{{ "Create a post" | _ }}</h1>
 <form class="new-post" method="post">
     {{ macros::input(name="title", label="Title", errors=errors, form=form, props="required") }}
+    {{ macros::input(name="subtitle", label="Subtitle", errors=errors, form=form, optional=true) }}
 
     {% if errors is defined and errors.content %}
         {% for err in errors.content %}