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

2018-09-03 10:41:37 +02:00
parent 001eb99091 84b4ab10ec
commit 1fc89e8aeb
55 changed files with 1865 additions and 526 deletions
@@ -9,24 +9,28 @@
    </head>
    <body>
        <header>
-            <nav id="menu"><a href="#">{{ "Menu" | _ }}</a></nav>
-            <nav>
-                <a href="/" class="title">{{ "Plume" | _ }}</a>
-                <hr/>
-                {% block header %}
-                {% endblock header %}
-            </nav>
-            <nav>
-                {% if account %}
-                    <a href="/dashboard">{{ "Dashboard" | _ }}</a>
-                    <a href="/notifications">{{ "Notifications" | _ }}</a>
-                    <a href="/me">{{ "My account" | _ }}</a>
-                    <a href="/logout">{{ "Log Out" | _ }}</a>
-                {% else %}
-                    <a href="/login">{{ "Log In" | _ }}</a>
-                    <a href="/users/new">{{ "Register" | _ }}</a>
-                {% endif %}
+            <nav id="menu">
+                <a href="#" aria-label="{{ "Menu" | _ }}" title="{{ "Menu" | _ }}"></a>
            </nav>
+            <div id="content">
+                <nav>
+                    <a href="/" class="title">{{ "Plume" | _ }}</a>
+                    <hr/>
+                    {% block header %}
+                    {% endblock header %}
+                </nav>
+                <nav>
+                    {% if account %}
+                        <a href="/dashboard">{{ "Dashboard" | _ }}</a>
+                        <a href="/notifications">{{ "Notifications" | _ }}</a>
+                        <a href="/me">{{ "My account" | _ }}</a>
+                        <a href="/logout">{{ "Log Out" | _ }}</a>
+                    {% else %}
+                        <a href="/login">{{ "Log In" | _ }}</a>
+                        <a href="/users/new">{{ "Register" | _ }}</a>
+                    {% endif %}
+                </nav>
+            </div>
        </header>
        <main>
            {% block content %}
@@ -23,7 +23,10 @@
    </p>
 
    <section>
-        <h2>{{ "Latest articles" | _ }}</h2>
+        <h2>
+            {{ "Latest articles" | _ }}
+            <small><a href="/@/{{ blog.fqn }}/atom.xml"><i title="Atom feed" class="fa fa-rss"></i></a></small>
+        </h2>
        {% if posts | length < 1 %}
            <p>{{ "No posts to see here yet." | _ }}</p>
        {% endif %}
@@ -0,0 +1,40 @@
+{% extends "base" %}
+{% import "macros" as macros %}
+
+{% block title %}
+About {{ instance.name }}
+{% endblock title %}
+
+{% block content %}
+    <h1>{{ "About {{ instance_name }}" | _(instance_name=instance.name) }}</h1>
+    <section>
+        {{ instance.short_description_html | safe }}        
+    </section>
+    <div class="banner">
+        <section class="stats">
+            <div>
+                <p>{{ "Home to" | _ }}</p>
+                <em>{{ n_users }}</em>
+                <p>{{ "people" | _ }}</p>
+            </div>
+            <div>
+                <p>{{ "Who wrote" | _ }}</p>
+                <em>{{ n_articles }}</em>
+                <p>{{ "articles" | _ }}</p>
+            </div>
+            <div>
+                <p>{{ "And connected to" | _ }}</p>
+                <em>{{ n_instances }}</em>
+                <p>{{ "other instances" | _ }}</p>
+            </div>
+            <div>
+                <p>{{ "Administred by" | _ }}</p>
+                <p><a href="/@/{{ admin.fqn }}">{{ admin.name }}</a><small>(@{{ admin.fqn }})</small></p>
+            </div>
+        </section>
+        <p>{{ "Runs Plume {{ version }}" | _(version=version) }}
+    </div>
+    <section>
+        {{ instance.long_description_html | safe }}        
+    </section>
+{% endblock content %}
@@ -0,0 +1,24 @@
+{% extends "base" %}
+{% import "macros" as macros %}
+
+{% block title %}
+Your medias
+{% endblock title %}
+
+{% block content %}
+    <h1>{{ "Media details" }}</h1>
+    <section>
+        <a href="/medias">Go back to the gallery</a>
+    </section>
+
+    <section>
+        <figure class="media">
+            {{ media.html | safe }}
+            <figcaption>{{ media.alt_text }}</figcaption>
+        </figure>
+        <div>
+            <a href="/medias/{{ media.id }}/avatar" class="button inline-block">Use as avatar</a>
+            <a href="/medias/{{ media.id }}/delete" class="button inline-block">Delete</a>
+        </div>
+    </section>
+{% endblock content %}
@@ -0,0 +1,31 @@
+{% extends "base" %}
+{% import "macros" as macros %}
+
+{% block title %}
+Your medias
+{% endblock title %}
+
+{% block content %}
+    <h1>{{ "Your medias" }}</h1>
+    <div>
+        <a href="/medias/new" class="inline-block button">Upload</a>
+    </div>
+
+    <section>
+        {% if medias | length < 1 %}
+            <p>{{ "You don't have any media yet." | _ }}</p>
+        {% endif %}
+        <div class="list">
+            {% for media in medias %}
+                <div class="card flex">
+                    {{ media.html_preview | safe }}
+                    <main class="grow">
+                        <p><a href="/medias/{{ media.id }}">{{ media.alt_text }}</a></p>
+                    </main>
+                    <a href="/medias/{{ media.id }}/delete">Delete</a>
+                </div>
+            {% endfor %}
+        </div>
+        {# macros::paginate(page=page, total=n_pages) #}
+    </section>
+{% endblock content %}
@@ -0,0 +1,17 @@
+{% extends "base" %}
+{% import "macros" as macros %}
+
+{% block title %}
+{{ "Media upload" | _ }}
+{% endblock title %}
+
+{% block content %}
+<h1>{{ "Media upload" | _ }}</h1>
+<form method="post" enctype="multipart/form-data">
+    {{ macros::input(name="alt", label="Description", errors=errors, form=form, props='required minlength="1"', details='Useful for visually impaired people and licensing') }}
+    {{ macros::input(name="cw", label="Content warning", errors=errors, form=form, details='Let it empty if there is none') }}
+    {{ macros::input(name="file", type='file', label="File", errors=errors, form=form, props='required') }}
+
+    <input type="submit" value="{{ "Send" | _ }}"/>
+</form>
+{% endblock content %}
@@ -22,6 +22,10 @@
        }}</a></span>
        &mdash;
        <span class="date">{{ date | date(format="%B %e, %Y") }}</span>
+        {% if is_author %}
+            &mdash;
+            <a href="{{ article.url}}delete">{{ "Delete this article" | _ }}</a>
+        {% endif %}
    </p>
    <article>
        {{ article.post.content | safe }}
@@ -17,11 +17,12 @@
    {% endif %}

    <label for="content">{{ "Content" | _ }}<small>{{ "Markdown is supported" | _ }}</small></label>
-    <textarea id="content" name="content" value="{{ form.content | default(value="") }}"></textarea>
+    <textarea id="content" name="content" value="{{ form.content | default(value="") }}" rows="20"></textarea>

    {% set license_infos = "Default license will be {{ instance.default_license }}" | _(instance=instance) %}
    {{ macros::input(name="license", label="License", errors=errors, form=form, optional=true, details=license_infos) }}

    <input type="submit" value="{{ "Publish" | _ }}" />
 </form>
+<script src="/static/js/autoExpand.js"></script>
 {% endblock content %}
@@ -18,8 +18,11 @@
        {{ user.summary | safe }}
    </div>

-    {% if recents | length != 0 %}
-        <h2>{{ "Latest articles" | _ }}</h2>
+    {% if recents | length != 0 %}    
+        <h2>
+            {{ "Latest articles" | _ }}
+            <small><a href="/@/{{ user.fqn }}/atom.xml"><i title="Atom feed" class="fa fa-rss"></i></a></small>
+        </h2>
        <div class="cards">
            {% for article in recents %}
                {{ macros::post_card(article=article) }}