CAMP/camp
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

don't show current item in context, link to all

Browse Source
This commit is contained in:
j 2017-12-23 00:06:44 +01:00
parent f7a5cdf532
commit 068d9f4201
8 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/templates/events.html
View File

@ -46,6 +46,7 @@
{% endfor %}
<a href="{% url 'events_list' %}">more</a>
</div>
</div>

2
content/templates/preview.html
View File

@ -18,4 +18,4 @@
<p> {{ content.formatted_teaser }} </p>
</div>
</div>
</div>
</div>

1
content/templates/projects.html
View File

@ -40,6 +40,7 @@
{% else %}
<p>No projects.</p>
{% endif %}
<a href="{% url 'projects_list' %}">more</a>
</div>
</div>

34
content/templates/results.html
View File

@ -25,7 +25,9 @@
{% elif row.type.name == 'events' %}
<div class="row results">
<div class="small-4 small-offset-2 columns">
<img src="{{ row.image_url }}">
{% if row.image_url %}
<a href="{{ row.get_absolute_url }}"> <img src="{{ row.image_url }}"> </a>
{% endif %}
</div>
<div class="small-4 end columns">
<a href="{{ row.get_absolute_url }}" class="sidebar-title">{{ row.title }}</a>
@ -38,7 +40,35 @@
{% elif row.type.name == 'projects' %}
<div class="row results">
<div class="small-4 small-offset-2 columns">
<img src="{{ row.image_url }}">
{% if row.image_url %}
<a href="{{ row.get_absolute_url }}"> <img src="{{ row.image_url }}"> </a>
{% endif %}
</div>
<div class="small-4 end columns">
<a href="{{ row.get_absolute_url }}" class="sidebar-title">{{ row.title }}</a>
<p> {{row.formatted_teaser}} </p>
<a href="{{ row.get_absolute_url }}">read more</a> </p>
</div>
</div>
{% elif row.type.name == 'works' %}
<div class="row results">
<div class="small-4 small-offset-2 columns">
{% if row.image_url %}
<a href="{{ row.get_absolute_url }}"> <img src="{{ row.image_url }}"> </a>
{% endif %}
</div>
<div class="small-4 end columns">
<a href="{{ row.get_absolute_url }}" class="sidebar-title">{{ row.title }}</a>
<p> {{row.formatted_teaser}} </p>
<a href="{{ row.get_absolute_url }}">read more</a> </p>
</div>
</div>
{% elif row.type.name == 'texts' %}
<div class="row results">
<div class="small-4 small-offset-2 columns">
{% if row.image_url %}
<a href="{{ row.get_absolute_url }}"> <img src="{{ row.image_url }}"> </a>
{% endif %}
</div>
<div class="small-4 end columns">
<a href="{{ row.get_absolute_url }}" class="sidebar-title">{{ row.title }}</a>

1
content/templates/section_index.html
View File

@ -19,6 +19,7 @@
</div>
</div>
{% endfor %}
<a href="index/">more</a>
</div>
</div>

3
content/templates/texts.html
View File

@ -45,13 +45,14 @@
{% endif %}
<div class="small-6 columns">
<a href="{{ texts.get_absolute_url }}" class="sidebar-title">{{ texts.title }}</a>
<p> {{texts.header|striptags|truncatechars:100}} </p>
<p> {{ texts.formatted_teaser }} </p>
</div>
</div>
{% endfor %}
{% else %}
<p>No texts.</p>
{% endif %}
<a href="{% url 'texts_list' %}">more</a>
</div>
</div>

3
content/templates/works.html
View File

@ -39,13 +39,14 @@
</div>
<div class="small-6 columns">
<a href="{{ works.get_absolute_url }}" class="sidebar-title">{{ works.title }}</a>
<p> {{works.header|striptags|truncatechars:100}} </p>
<p> {{ works.formatted_teaser }} </p>
</div>
</div>
{% endfor %}
{% else %}
<p>No works.</p>
{% endif %}
<a href="{% url 'works_list' %}">more</a>
</div>
</div>

22
content/views.py
View File

@ -118,8 +118,14 @@ def events(request, shortname=None):
if not events.published and not request.user.is_staff:
raise Http404
gallery = get_or_none(Gallery, slug=shortname)
latest_content_list = Content.objects.filter(type__name='events').order_by('-datestart')[:10]
return render(request, 'events.html', {'events': events, 'latest_content_list': latest_content_list, 'gallery': gallery})
latest_content_list = Content.objects.filter(type__name__in=['events', 'news']).order_by('-datestart')
latest_content_list = latest_content_list.exclude(pk=events.pk)
latest_content_list = latest_content_list[:10]
return render(request, 'events.html', {
'events': events,
'latest_content_list': latest_content_list,
'gallery': gallery
})
def projects(request, shortname=None):
if not shortname:
@ -129,6 +135,8 @@ def projects(request, shortname=None):
raise Http404
gallery = get_or_none(Gallery, slug=shortname)
latest_content_list = Content.objects.filter(type__name='projects').order_by('-datestart')
latest_content_list = latest_content_list.exclude(pk=projects.pk)
latest_content_list = latest_content_list[:10]
return render(request, 'projects.html', {
'projects': projects,
'latest_content_list': latest_content_list,
@ -143,7 +151,13 @@ def works(request, shortname=None):
raise Http404
gallery = get_or_none(Gallery, slug=shortname)
latest_content_list = Content.objects.filter(type__name='works')
return render(request, 'works.html', {'works': works, 'latest_content_list': latest_content_list, 'gallery':gallery})
latest_content_list = latest_content_list.exclude(pk=works.pk)
latest_content_list = latest_content_list[:10]
return render(request, 'works.html', {
'works': works,
'latest_content_list': latest_content_list,
'gallery': gallery
})
def texts(request, shortname=None):
if not shortname:
@ -151,6 +165,8 @@ def texts(request, shortname=None):
texts = get_object_or_404(Content, shortname=shortname, type__name='texts')
gallery = get_or_none(Gallery, slug=shortname)
latest_content_list = Content.objects.filter(type__name='texts')
latest_content_list = latest_content_list.exclude(pk=texts.pk)
latest_content_list = latest_content_list[:10]
return render(request, 'texts.html', {
'texts': texts,
'latest_content_list': latest_content_list,