Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into feature/104/show-map-on-location-page

Browse source
This commit is contained in:
Tom Naessens 2019-05-31 09:29:07 +12:00
commit 6327809bbd
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/templates/location.html
View file

@ -10,7 +10,9 @@
<span class="glyphicon glyphicon-home"></span> {{ location.address }} <br/> <span class="glyphicon glyphicon-home"></span> {{ location.address }} <br/>
<span class="glyphicon glyphicon-phone"></span> {{ location.telephone }} <br/> <span class="glyphicon glyphicon-phone"></span> {{ location.telephone }} <br/>
<span class="glyphicon glyphicon-link"></span> <a href="{{ location.website}}">{{ location.website }}</a> <span class="glyphicon glyphicon-link"></span> <a href="{{ location.website}}">{{ location.website }}</a>
{% if not current_user.is_anonymous() %}
<a href="{{ url_for("order_bp.orders", location_id=location.id) }}" class="btn btn-primary btn-sm">Create order</a> <a href="{{ url_for("order_bp.orders", location_id=location.id) }}" class="btn btn-primary btn-sm">Create order</a>
{% endif %}
</div> </div>
<div class="col-md-push-1 col-md-5 padding-top"> <div class="col-md-push-1 col-md-5 padding-top">
{% if location.address %} {% if location.address %}

2
app/templates/locations.html
View file

@ -18,7 +18,9 @@
<td>{{ loc.address }}<td> <td>{{ loc.address }}<td>
<td><a href="{{ loc.website}}"><span class="glyphicon glyphicon-link"></span></a></td> <td><a href="{{ loc.website}}"><span class="glyphicon glyphicon-link"></span></a></td>
<td> <td>
{% if not current_user.is_anonymous() %}
<a href="{{ url_for("order_bp.orders", location_id=loc.id) }}" class="btn btn-primary btn-xs">Create order</a> <a href="{{ url_for("order_bp.orders", location_id=loc.id) }}" class="btn btn-primary btn-xs">Create order</a>
{% endif %}
</td> </td>
</tr> </tr>
{%- endfor %} {%- endfor %}