Commit f804344b authored by Patrick Kimber's avatar Patrick Kimber

edit event from detail page #903

parent 2416ca4c
......@@ -43,3 +43,7 @@ venv-*
# private info
.private
# media
media/
media-private/
......@@ -109,7 +109,7 @@ class Location(TimeStampedModel):
objects = LocationManager()
class Meta:
ordering = ('description',)
ordering = ('title',)
verbose_name = 'Location'
verbose_name_plural = 'Locations'
......
......@@ -20,7 +20,7 @@
<div class="pure-menu pure-menu-horizontal">
<ul class="pure-menu-list">
<li class="pure-menu-item">
<a href="{% url 'booking.list' %}" class="pure-menu-link">
<a href="{% url 'booking.list.month' object.start_date|date:'Y' object.start_date|date:'m' %}" class="pure-menu-link">
<i class="fa fa-reply"></i>
</a>
</li>
......@@ -156,16 +156,18 @@
</table>
</div>
</div>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-4-24">
<p>
<strong>Description</strong>
</p>
</div>
<div class="pure-u-1 pure-u-md-20-24">
{% include 'booking/_booking_description.html' with b=object %}
{% if object.description %}
<div class="pure-g">
<div class="pure-u-1 pure-u-md-4-24">
<p>
<strong>Description</strong>
</p>
</div>
<div class="pure-u-1 pure-u-md-20-24">
{% include 'booking/_booking_description.html' with b=object %}
</div>
</div>
</div>
{% endif %}
{% if booking_settings.notes_user_staff %}
<div class="pure-g">
<div class="pure-u-1 pure-u-md-4-24">
......
......@@ -32,13 +32,13 @@
</li>
{% endif %}
<li class="pure-menu-item">
<a href="{% url 'booking.list.month' first_prev_month|date:"Y" first_prev_month|date:"m" %}" class="pure-menu-link">
<a href="{% url 'booking.list.month' first_prev_month|date:'Y' first_prev_month|date:'m' %}" class="pure-menu-link">
<i class="fa fa-calendar"></i>
{{ first_prev_month|date:"M Y" }}
</a>
</li>
<li class="pure-menu-item">
<a href="{% url 'booking.list.month' first_next_month|date:"Y" first_next_month|date:"m" %}" class="pure-menu-link">
<a href="{% url 'booking.list.month' first_next_month|date:'Y' first_next_month|date:'m' %}" class="pure-menu-link">
<i class="fa fa-calendar"></i>
{{ first_next_month|date:"M Y" }}
</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment