aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31 from Madeorsk/master

Browse Source 
New design
This commit is contained in:
Baptiste Gelez
2018-06-20 12:44:04 +01:00
committed by GitHub
parent b9951f0d70 3185776ff2
commit 41792b3c19
108 changed files with 9740 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/base.html.tera
+6 -4
View File
@@ -1,16 +1,18 @@
<!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>
<hr/>
{% block header %}
{% endblock header %}
</nav>
templates/blogs/new.html.tera
+2 -3
View File
@@ -8,8 +8,7 @@
<h1>{{ "Create a blog" | _ }}</h1>
<form method="post">
<label for="title">{{ "Title" | _ }}</label>
<input name="title">
<input type="submit" value="{{ "Create blog" | _ }}"/>
<input type="text" id="title" name="title" />
<input type="submit" value="{{ "Create blog" | _ }}"/>
</form>
{% endblock content %}
templates/comments/new.html.tera
+2 -2
View File
@@ -8,8 +8,8 @@
<h1>{{ 'Comment "{{ post }}"' | _(post=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="{{ "Submit comment" | _ }}" />
</form>
{% endblock content %}
templates/errors/500.html.tera
+1 -1
View File
@@ -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 %}
templates/instance/configure.html.tera
+2 -2
View File
@@ -8,8 +8,8 @@
<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 %}
templates/macros.html.tera
+7 -4
View File
@@ -6,15 +6,18 @@
{% endif %}
<div class="card">
<h3><a href="{{ article.url }}">{{ article.post.title }}</a></h3>
<main><p>{{ article.post.content | safe | striptags | truncate(length=200) }}</p></main>
<p>
{{ "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}" | _(
<main
<p>{{ article.post.content | safe | striptags | truncate(length=200) }}</p>
</main>
<p class="author">
{{ "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}" | _(
link_1='<a href="/@/',
link_2=article.author.fqn,
link_3='/">',
name=name,
link_4="</a>")
}}
⋅ {{ article.date | date(format="%B %e") }}</p>
⋅ {{ article.date | date(format="%B %e") }}
</p>
</div>
{% endmacro post_card %}
templates/posts/details.html.tera
+40 -35
View File
@@ -9,25 +9,26 @@
{% endblock header %}
{% block content %}
<h1 class="article">{{ post.title }}</h1>
<p class="article-info">
{% if author.display_name %}
{% set name = author.display_name %}
{% else %}
{% set name = author.username %}
{% endif %}
<p>
<b>{{ "Written by {{ link_1 }}{{ url }}{{ link_2 }}{{ name }}{{ link_3 }}" | _(
<span class="author">{{ "Written by {{ link_1 }}{{ url }}{{ link_2 }}{{ name }}{{ link_3 }}" | _(
link_1='<a href="/@/',
url=author.fqn,
link_2='/">',
name=name,
link_3="</a>"
)
}}</b>
}}</a></span>
&mdash;
<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>
@@ -35,45 +36,49 @@
<div class="article-meta">
<p>{{ "This article is under the {{ license }} license." | _(license=post.license) }}</p>
<div class="inline">
<div class="likes">
<p>
{{ "{{ count }} likes" | _n(singular="One like", count=n_likes) }}
</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">{{ "Add yours" | _ }}</a>
{% endif %}
</div>
<div class="reshares">
<p>
{{ "{{ count }} reshares" | _n(singular="One reshare", count=n_reshares) }}
</p>
<a class="button" href="reshare">
{% if has_reshared %}
{{ "I don't want to reshare this anymore" | _ }}
{% else %}
{{ "Reshare" | _ }}
{% endif %}
</a>
{% if has_reshared %}
<a class="button reshared" href="reshare">{{ "I don't want to reshare this anymore" | _ }}</a>
{% else %}
<a class="button" href="reshare">{{ "Reshare" | _ }}</a>
{% endif %}
</div>
<h2>{{ "Comments" | _ }}</h2>
<div class="list">
{% for comment in comments %}
{% if comment.author.display_name %}
{% set comment_author_name = comment.author.display_name %}
{% else %}
{% set comment_author_name = comment.author.username %}
{% endif %}
<div class="card" id="comment-{{ comment.id }}">
<a href="/@/{{ comment.author.fqn }}/"><b>{{ comment_author_name }}</b></a>
<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 %}
{% if comment.author.display_name %}
{% set comment_author_name = comment.author.display_name %}
{% else %}
{% set comment_author_name = comment.author.username %}
{% endif %}
<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 %}
templates/posts/new.html.tera
+5 -8
View File
@@ -6,16 +6,13 @@
{% 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 %}
templates/session/login.html.tera
+3 -3
View File
@@ -11,11 +11,11 @@
{% endif %}
<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 %}
templates/users/dashboard.tera
+1 -1
View File
@@ -13,7 +13,7 @@
{% if blogs | length < 1 %}
<p>{{ "You don't have any blog yet. Create your own, or ask to join one." | _ }}</p>
{% endif %}
<a class="button inline-block" href="/blogs/new">{{ "Start a new blog" | _ }}</a>
<a class="button" href="/blogs/new">{{ "Start a new blog" | _ }}</a>
<div class="list">
{% for blog in blogs %}
<div class="card">
templates/users/header.tera
+1 -1
View File
@@ -1,4 +1,4 @@
<div>
<div class="user">
<h1>
{{ name }}
{% if user.is_admin %}
templates/users/new.html.tera
+5 -5
View File
@@ -8,17 +8,17 @@
<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 %}