New design
+ New design! + Added link for author name in comments. + Added author full name in comments. * Fixed label / input relation linking.
This commit is contained in:
Madeorsk
committed by
Matthieu HOCHLANDER
Matthieu HOCHLANDER
parent
045e885821
commit
12d85c6ec5
+5
-4
@@ -1,16 +1,17 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta charset="utf-8" />
|
||||
<title>{% block title %}{% endblock title %} ⋅ Plume</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" href="/static/main.css">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<link rel="stylesheet" href="/static/main.css" />
|
||||
<link rel="stylesheet" href="/static/fontawesome-5.0.10/css/fontawesome-all.min.css" />
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<nav id="menu"><a href="#">Menu</a></nav>
|
||||
<nav>
|
||||
<a href="/">Plume</a>
|
||||
<a href="/" class="title">Plume</a>
|
||||
{% block header %}
|
||||
{% endblock header %}
|
||||
</nav>
|
||||
|
||||
@@ -8,8 +8,8 @@ New blog
|
||||
<h1>Create a blog</h1>
|
||||
<form method="post">
|
||||
<label for="title">Title</label>
|
||||
<input name="title">
|
||||
<input type="text" id="title" name="title" />
|
||||
|
||||
<input type="submit" value="Create blog"/>
|
||||
<input type="submit" value="Create blog" />
|
||||
</form>
|
||||
{% endblock content %}
|
||||
|
||||
@@ -8,8 +8,8 @@ Comment "{{ post.title }}"
|
||||
<h1>Comment "{{ post.title }}"</h1>
|
||||
<form method="post">
|
||||
<label for="content">Content</label>
|
||||
<textarea name="content"></textarea>
|
||||
<input type="submit" value="Submit comment"/>
|
||||
<textarea id="content" name="content"></textarea>
|
||||
<input type="submit" value="Comment" />
|
||||
</form>
|
||||
{% endblock content %}
|
||||
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
|
||||
{% block error %}
|
||||
<h1>Something broke on our side.</h1>
|
||||
<h2>Sorry about that. If you think this is a bug, please report it.</h2>
|
||||
<p>Sorry about that. If you think this is a bug, please report it.</p>
|
||||
{% endblock error %}
|
||||
|
||||
@@ -8,8 +8,8 @@ Configuration
|
||||
<h1>Configure your instance</h1>
|
||||
<form method="post">
|
||||
<label for="name">Name</label>
|
||||
<input name="name">
|
||||
<input type="text" id="name" name="name" />
|
||||
|
||||
<input type="submit" value="Let's go!"/>
|
||||
<input type="submit" value="Let's go!" />
|
||||
</form>
|
||||
{% endblock content %}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{% macro post_card(article) %}
|
||||
<div class="card">
|
||||
<h3><a href="{{ article.url }}">{{ article.post.title }}</a></h3>
|
||||
<main><p>{{ article.post.content | escape | truncate(length=200) }}…</p></main>
|
||||
<p>By <a href="/@/{{ article.author.fqn }}/">{{ article.author.display_name }}</a> ⋅ {{ article.date | date(format="%B %e") }}</p>
|
||||
<main
|
||||
<p>{{ article.post.content | escape | truncate(length=200) }}</p>
|
||||
</main>
|
||||
<p class="author">By <a href="/@/{{ article.author.fqn }}/">{{ article.author.display_name }}</a> ⋅ {{ article.date | date(format="%B %e") }}</p>
|
||||
</div>
|
||||
{% endmacro post_card %}
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
{% endblock header %}
|
||||
|
||||
{% block content %}
|
||||
<p>
|
||||
<b>Written by <a href="/@/{{ author.fqn }}/">{{ author.display_name }}</a></b>
|
||||
<h1 class="article">{{ post.title }}</h1>
|
||||
<p class="article-info">
|
||||
<span class="author">Written by <a href="/@/{{ author.fqn }}/">{{ author.display_name }}</a></span>
|
||||
—
|
||||
<span>{{ date | date(format="%B %e, %Y") }}</span>
|
||||
<span class="date">{{ date | date(format="%B %e, %Y") }}</span>
|
||||
</p>
|
||||
<h1>{{ post.title }}</h1>
|
||||
<article>
|
||||
{{ post.content | safe }}
|
||||
</article>
|
||||
@@ -22,29 +22,32 @@
|
||||
<div class="article-meta">
|
||||
<p>This article is under the {{ post.license }} license.</p>
|
||||
|
||||
<div class="inline">
|
||||
<div class="likes">
|
||||
<p>
|
||||
{{ n_likes }} like{{ n_likes | pluralize }}
|
||||
</p>
|
||||
<a class="button" href="like">
|
||||
{% if has_liked %}
|
||||
I don't like this anymore
|
||||
{% else %}
|
||||
Add yours
|
||||
{% endif %}
|
||||
</a>
|
||||
{% if has_liked %}
|
||||
<a class="button liked" href="like">I don't like this anymore</a>
|
||||
{% else %}
|
||||
<a class="button" href="like">Like</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<h2>Comments</h2>
|
||||
<div class="list">
|
||||
{% for comment in comments %}
|
||||
<div class="card" id="comment-{{ comment.id }}">
|
||||
<b>{{ comment.author.display_name }}</b>
|
||||
<div>{{ comment.content | safe }}</div>
|
||||
<a href="comment?responding_to={{ comment.id }}">Respond</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="comments">
|
||||
<h2>Comments</h2>
|
||||
<a class="button" href="comment?">Comment</a>
|
||||
<div class="list">
|
||||
{% for comment in comments %}
|
||||
<div class="comment" id="comment-{{ comment.id }}">
|
||||
<a class="author" href="{{ comment.author.ap_url }}">
|
||||
<span class="display-name">{{ comment.author.display_name }}</span>
|
||||
<span class="username">@{{ comment.author.username }}</span>
|
||||
</a>
|
||||
<div class="text">{{ comment.content | safe }}</div>
|
||||
<a class="button" href="comment?responding_to={{ comment.id }}">Respond</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<a class="button inline-block" href="comment?">Comment</a>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
|
||||
@@ -6,16 +6,13 @@ New post
|
||||
|
||||
{% block content %}
|
||||
<h1>Create a post</h1>
|
||||
<form method="post">
|
||||
<label for="title">Title</label>
|
||||
<input name="title">
|
||||
|
||||
<label for="content">Content</label>
|
||||
<textarea name="content"></textarea>
|
||||
<form class="new-post" method="post">
|
||||
<input type="text" class="title" name="title" placeholder="Title">
|
||||
<textarea name="content" placeholder="Content..."></textarea>
|
||||
|
||||
<label for="license">License</label>
|
||||
<input name="license">
|
||||
<input type="text" id="licence" name="license" />
|
||||
|
||||
<input type="submit" value="Publish"/>
|
||||
<input type="submit" value="Publish" />
|
||||
</form>
|
||||
{% endblock content %}
|
||||
|
||||
@@ -8,11 +8,11 @@ Login
|
||||
<h1>Login</h1>
|
||||
<form method="post">
|
||||
<label for="email_or_name">Username or email</label>
|
||||
<input name="email_or_name">
|
||||
<input type="text" id="email_or_name" name="email_or_name" />
|
||||
|
||||
<label for="password">Password</label>
|
||||
<input type="password" name="password">
|
||||
<input type="password" id="password" name="password" />
|
||||
|
||||
<input type="submit" value="Login"/>
|
||||
<input type="submit" value="Login" />
|
||||
</form>
|
||||
{% endblock content %}
|
||||
|
||||
@@ -8,17 +8,17 @@ New Account
|
||||
<h1>Create an account</h1>
|
||||
<form method="post">
|
||||
<label for="username">Username</label>
|
||||
<input name="username">
|
||||
<input type="text" id="username" name="username" />
|
||||
|
||||
<label for="email">Email</label>
|
||||
<input name="email">
|
||||
<input type="email" id="email" name="email" />
|
||||
|
||||
<label for="password">Password</label>
|
||||
<input type="password" name="password">
|
||||
<input type="password" id="password" name="password" />
|
||||
|
||||
<label for="password_confirmation">Password confirmation</label>
|
||||
<input type="password" name="password_confirmation">
|
||||
<input type="password" id="password_confirmation" name="password_confirmation" />
|
||||
|
||||
<input type="submit" value="Create account"/>
|
||||
<input type="submit" value="Create account" />
|
||||
</form>
|
||||
{% endblock content %}
|
||||
|
||||
Reference in New Issue
Block a user