Merge branch 'master' of ssh://git.thisfro.ch:222/thisfro/plant-exchange
This commit is contained in:
commit
648065df58
5 changed files with 89 additions and 1 deletions
|
@ -1,6 +1,18 @@
|
|||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block body %}
|
||||
{% for message in app.flashes('error') %}
|
||||
<div class="alert alert-danger" role="alert">
|
||||
{{ message }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{% for message in app.flashes('success') %}
|
||||
<div class="alert alert-success" role="success">
|
||||
{{ message }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{% if offer.byUser == user %}
|
||||
<div class="alert alert-info" role="alert">This is your offer!</div>
|
||||
{% endif %}
|
||||
|
@ -58,6 +70,6 @@
|
|||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
<button class="btn btn-primary">Offer trade</button>
|
||||
<a class="btn btn-primary" href="{{ path('trade', {'id': offer.id}) }}">Offer trade</a>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
5
templates/offer/trade/trade_email.html.twig
Normal file
5
templates/offer/trade/trade_email.html.twig
Normal file
|
@ -0,0 +1,5 @@
|
|||
<h1>{{ user.username}} wants to trade!</h1>
|
||||
|
||||
<p>You can checkout their offer and reply to this email if you want to trade.</p>
|
||||
|
||||
<a href={{ path('user_public', id: { 'id': offer.byuser.id }) }}</a>
|
5
templates/user/trade/offer_email.html.twig
Normal file
5
templates/user/trade/offer_email.html.twig
Normal file
|
@ -0,0 +1,5 @@
|
|||
<h1>{{ user.username }} wants to trade!</h1>
|
||||
|
||||
<p>Checkout {{ user.username}}'s offers:</p>
|
||||
<a href="{{ userOffersLink }}">Link</a>
|
||||
<p>Reply to this email to start trading.</p>
|
Reference in a new issue