use new content-box and flex-page on account/payment views

master
Alice 5 years ago
parent 2fc3a0274c
commit 349b4abbf2

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-22 19:16+0000\n"
"POT-Creation-Date: 2019-10-22 19:42+0000\n"
"PO-Revision-Date: 2016-04-07 01:32+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@ -218,7 +218,7 @@ msgid "Awesome VPN! 3€ per month, with a free 7 days trial!"
msgstr ""
#: lambdainst/views.py:173 templates/account_layout.html:9
#: templates/account_layout.html:11 templates/lambdainst/account.html:17
#: templates/lambdainst/account.html:17
msgid "Account"
msgstr "Compte"
@ -234,7 +234,7 @@ msgstr "Captcha invalide"
msgid "Passwords do not match"
msgstr "Les mots de passe ne correspondent pas"
#: lambdainst/views.py:251 templates/account_layout.html:13
#: lambdainst/views.py:251 templates/account_layout.html:21
#: templates/lambdainst/settings.html:6
msgid "Settings"
msgstr "Options"
@ -247,7 +247,7 @@ msgstr "Code inconnu ou déjà utilisé."
msgid "Gift code only available to free accounts."
msgstr "Code uniquement disponible pour les nouveaux comptes."
#: lambdainst/views.py:292 templates/account_layout.html:15
#: lambdainst/views.py:292 templates/account_layout.html:29
#: templates/lambdainst/logs.html:6
msgid "Logs"
msgstr "Logs"
@ -342,8 +342,8 @@ msgid ""
"Waiting for CoinPayments to confirm the transaction... It can take up to a "
"few minutes..."
msgstr ""
"En attente de la confirmation par CoinPayments... Cette étape peut durer quelques "
"minutes..."
"En attente de la confirmation par CoinPayments... Cette étape peut durer "
"quelques minutes..."
#: payments/backends/paypal.py:14 payments/backends/paypal.py:15
msgid "PayPal"
@ -421,11 +421,15 @@ msgstr ""
"Impossible d'annuler le paiement récurrent. Il a peut-être été déjà annulé "
"ou une erreur est survenue."
#: templates/account_layout.html:12
#: templates/account_layout.html:13
msgid "Overview"
msgstr "Vue d'ensemble"
#: templates/account_layout.html:17
msgid "Config Download"
msgstr "Configuration"
#: templates/account_layout.html:14
#: templates/account_layout.html:25 templates/payments/list.html:6
msgid "Payments"
msgstr "Paiements"
@ -739,7 +743,7 @@ msgstr "Activer"
msgid "Your account is not paid."
msgstr "Votre compte n'est pas payé."
#: templates/lambdainst/account.html:82 templates/payments/list.html:6
#: templates/lambdainst/account.html:82
msgid "Subscription"
msgstr "Abonnement"

@ -4,18 +4,33 @@
{% load staticfiles %}
{% block content %}
<div class="page">
<div class="flex-page">
<div class="left-menu">
<p class="menu-title">{% trans 'Account' %}</p>
<ul>
<li><a href="/account/">{% trans 'Account' %}</a></li>
<li><a href="/account/config">{% trans 'Config Download' %}</a></li>
<li><a href="/account/settings">{% trans 'Settings' %}</a></li>
<li><a href="/payments">{% trans 'Payments' %}</a></li>
<li><a href="/account/logs">{% trans 'Logs' %}</a></li>
<li><a href="/account/">
<i class="fa fa-dashboard fa-fw" aria-hidden="true"></i>&nbsp;
{% trans 'Overview' %}
</a></li>
<li><a href="/account/config">
<i class="fa fa-download fa-fw" aria-hidden="true"></i>&nbsp;
{% trans 'Config Download' %}
</a></li>
<li><a href="/account/settings">
<i class="fa fa-gears fa-fw" aria-hidden="true"></i>&nbsp;
{% trans 'Settings' %}
</a></li>
<li><a href="/payments">
<i class="fa fa-credit-card fa-fw" aria-hidden="true"></i>&nbsp;
{% trans 'Payments' %}
</a></li>
<li><a href="/account/logs">
<i class="fa fa-archive fa-fw" aria-hidden="true"></i>&nbsp;
{% trans 'Logs' %}
</a></li>
</ul>
</div>
<div class="content">
<div class="content-box">
{% block account_content %}{% endblock %}
</div>
</div>

@ -14,7 +14,7 @@
</div>
{% endif %}
<h1>{% trans 'Account' %} : {{user.username}}</h1>
<h2>{% trans 'Account' %} : {{user.username}}</h2>
<div class="account-status">
{% if subscription %}

@ -4,7 +4,7 @@
{% block account_content %}
<div>
<h1>{% trans 'Config' %}</h1>
<h2>{% trans 'Config' %}</h2>
<form action="/account/config_dl" method="get" class="pure-form pure-form-aligned">
<fieldset>
<div class="pure-control-group">

@ -3,7 +3,7 @@
{% load staticfiles %}
{% block account_content %}
<h1>{% trans 'Logs' %}</h1>
<h2>{% trans 'Logs' %}</h2>
<p>{% trans 'Everything we have to keep about you. Automatically deleted after 1 year.' %}</p>
<table class="admin-list">

@ -3,7 +3,7 @@
{% load staticfiles %}
{% block account_content %}
<h1>{% trans 'Settings' %}</h1>
<h2>{% trans 'Settings' %}</h2>
<form action="/account/settings" method="post" class="pure-form pure-form-aligned">
{% csrf_token %}

@ -5,7 +5,7 @@
{% block account_content %}
<div class="payments-cancel-page">
<h1>{% trans 'Cancel Subscription' %}</h1>
<h2>{% trans 'Cancel Subscription' %}</h2>
{% if subscription %}
<form action="/payments/cancel_subscr/{{subscription.id}}" method="post" class="pure-form centered-form" id="cancel-form">

@ -4,7 +4,7 @@
{% block account_content %}
<section id="account">
<h1>{% trans 'Payment' %}</h1>
<h2>{% trans 'Payment' %}</h2>
{{ html | safe }}
</section>

@ -3,7 +3,7 @@
{% load staticfiles %}
{% block account_content %}
<h1>{% trans 'Subscription' %}</h1>
<h2>{% trans 'Payments' %}</h2>
<table class="admin-list">
<thead>

@ -10,9 +10,9 @@
{% block account_content %}
<section id="account">
<h1>{% trans 'Payment' %} #{{payment.id}}:
<h2>{% trans 'Payment' %} #{{payment.id}}:
{{ payment.get_status_display }}
</h1>
</h2>
{% if payment.status_message %}
<p><b>{{payment.status_message}}</b></p>

Loading…
Cancel
Save