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

Compare commits

base: CAMP:d044857b5d61cef67bc67615d43e291f8bd4c75e
Branches Tags
CAMP:master
CAMP:title-acronyms
..
compare: CAMP:b9c464b7a1e26660c58d273c655e747719aa4d80
Branches Tags
CAMP:master
CAMP:title-acronyms

No commits in common. "d044857b5d61cef67bc67615d43e291f8bd4c75e" and "b9c464b7a1e26660c58d273c655e747719aa4d80" have entirely different histories.
d044857b5d ... b9c464b7a1

3 changed files with 3 additions and 10 deletions
Show stats Expand all files Collapse all files

2
content/admin.py
View file

@ -68,7 +68,7 @@ class ContentAdmin(admin.ModelAdmin):
list_display = ('id', '__str__', 'datestart', 'shortname', 'type') list_display = ('id', '__str__', 'datestart', 'shortname', 'type')
list_filter = ['datestart', 'type'] list_filter = ['datestart', 'type']
search_fields = ['title', 'body', 'header', 'shortname'] search_fields = ['title', 'body', 'header', 'shortname']
raw_id_fields = ['photo', 'gallery'] raw_id_fields = ['photo']
inlines = [FileInline, LinkInline] inlines = [FileInline, LinkInline]
formfield_overrides = { formfield_overrides = {
models.TextField: {'widget': MaxLengthAdminMarkdownxWidget}, models.TextField: {'widget': MaxLengthAdminMarkdownxWidget},

2
content/templates/gallery.html
View file

@ -1,5 +1,5 @@
{% if gallery %} {% if gallery %}
<h6><strong>{{gallery.title}}</strong></h6> <h6><strong>Gallery: {{gallery.title}}</strong></h6>
<ul class="clearing-thumbs" data-clearing> <ul class="clearing-thumbs" data-clearing>
{% for photo in gallery.public %} {% for photo in gallery.public %}
<li><a href="{{ gallery.get_absolute_url }}#{{forloop.counter}}"><img src="{{ photo.get_thumbnail_url }}"></a></li> <li><a href="{{ gallery.get_absolute_url }}#{{forloop.counter}}"><img src="{{ photo.get_thumbnail_url }}"></a></li>

9
content/views.py
View file

@ -230,14 +230,7 @@ def contact(request):
def limit_content(content, q): def limit_content(content, q):
if q: if q:
content = content.filter( content = content.filter(Q(body__icontains=q) | Q(title__icontains=q) | Q(header__icontains=q)).distinct()
Q(body__icontains=q)
| Q(title__icontains=q)
| Q(header__icontains=q)
| Q(teaser__icontains=q)
| Q(schedule__icontains=q)
| Q(place__icontains=q)
).distinct()
return content return content