- {% block content %}{% endblock %}
+
+
+
{% block content %}{% endblock %}
-
diff --git a/gedgo/templates/default/blogpost.html b/gedgo/templates/default/blogpost.html
index e00c880..b1295cf 100644
--- a/gedgo/templates/default/blogpost.html
+++ b/gedgo/templates/default/blogpost.html
@@ -8,7 +8,7 @@
{% if post.tagged_photos.all %}
{% for photo in post.tagged_photos.all %}
- 
+ 
{% endfor %}
{% endif %}
diff --git a/gedgo/templates/default/documentaries.html b/gedgo/templates/default/documentaries.html
index be0ba33..c56eb96 100644
--- a/gedgo/templates/default/documentaries.html
+++ b/gedgo/templates/default/documentaries.html
@@ -23,7 +23,7 @@
{% for documentary in documentaries.iterator %}
- 
+ 
{{ documentary.title }}
diff --git a/gedgo/templates/default/person.html b/gedgo/templates/default/person.html index 458f377..c480666 100644 --- a/gedgo/templates/default/person.html +++ b/gedgo/templates/default/person.html @@ -3,18 +3,16 @@ {% block leftsidebar %}
-{% for photo in person.photos %}
- {% if not photo == person.key_photo %}
-
+{% for photo in photos %}
+
- {% endif %}
{% empty %}
-
{% endblock %}
diff --git a/gedgo/templates/default/research.html b/gedgo/templates/default/research.html
index 4644d92..64c8d82 100644
--- a/gedgo/templates/default/research.html
+++ b/gedgo/templates/default/research.html
@@ -57,21 +57,21 @@
{% endif %}
{% if files %}
-
- (no photos)
-
+
+ (no photos)
+
{% endfor %}
-
+
-
-
- -- {% if f.preview %}+ +
+
- + +
+ {% if f.preview %}-- {{ f.name|truncatechars:45 }} -++ {% endfor %} diff --git a/gedgo/templates/default/research_preview.html b/gedgo/templates/default/research_preview.html index 3d73a31..5f8e740 100644 --- a/gedgo/templates/default/research_preview.html +++ b/gedgo/templates/default/research_preview.html @@ -1,5 +1,9 @@ {% extends "base.html" %} +{% block headappend %} + +{% endblock %} + {% block filesactive %} class = "active" {% endblock %} @@ -39,12 +43,23 @@{{ f.name|truncatechars:45 }}
+{{ file.name }}
-{% if file.preview %} + +{% if file.can_video %} + +{% elif file.preview %}{% else %}
{% endif %} +{% endblock %} +{% block javascript %} + {% endblock %} diff --git a/gedgo/urls.py b/gedgo/urls.py index 7dd3122..ccddf89 100644 --- a/gedgo/urls.py +++ b/gedgo/urls.py @@ -50,7 +50,7 @@ }), # Authenticated media fileserve view - url(r'^media/(?P\w+)/(?P .*)$', views.media), + url(r'^media/(?P .*)$', views.media), url(r'^$', lambda r: redirect('/gedgo/1/')), ] diff --git a/gedgo/views/model_views.py b/gedgo/views/model_views.py index 58a602e..26eaf77 100644 --- a/gedgo/views/model_views.py +++ b/gedgo/views/model_views.py @@ -40,6 +40,7 @@ def person(request, gedcom_id, person_id): context = { 'person': p, 'posts': BlogPost.objects.filter(tagged_people=p), + 'photos': [photo for photo in p.photos if not photo.id != p.key_photo], 'gedcom': g, 'form': form, 'comment_noun': noun diff --git a/gedgo/views/research.py b/gedgo/views/research.py index e42564e..bf730be 100644 --- a/gedgo/views/research.py +++ b/gedgo/views/research.py @@ -2,13 +2,13 @@ from django.contrib.auth.decorators import login_required from django.core.files.storage import default_storage -import sys from os import path import mimetypes from gedgo.views.util import serve_content, render from gedgo.storages import research_storage as storage +import sys sys.stdout = sys.stderr FOLDER_CACHE = ('', ([], [])) @@ -124,8 +124,8 @@ def can_preview(name): ( '.' in name and name.rsplit('.', 1)[1].lower() in ( - 'jpeg', 'jpg', 'gif', 'png', 'pdf', 'pages', - 'mov', 'avi', 'doc', 'mpg' + 'jpeg', 'jpg', 'gif', 'png', 'pdf', + 'mov', 'avi', 'doc', 'mpg', 'bmp' ) ) ) @@ -143,6 +143,7 @@ def process_file(name, p, is_dir=False): 'full_path': path.join(name, path.basename(p)), 'name': path.basename(p), 'path': fn, + 'can_video': not is_dir and p.rsplit('.')[1].lower() in ('mp4', 'avi'), 'preview': can_preview(p) } diff --git a/gedgo/views/util.py b/gedgo/views/util.py index 4601bf6..e537e3d 100644 --- a/gedgo/views/util.py +++ b/gedgo/views/util.py @@ -16,6 +16,9 @@ from os import path import mimetypes +import sys +sys.stdout = sys.stderr + STORAGES = { 'research': research_storage, @@ -24,13 +27,12 @@ @login_required -def media(request, storage_name, file_base_name): +def media(request, file_base_name): """ Authenticated view to serve media content and toggle storage classes """ filename = file_base_name.strip('/') - storage = STORAGES.get(storage_name, default_storage) - return serve_content(storage, filename) + return serve_content(default_storage, filename) def process_comments(request, noun): - + +
-
{% for f in files %}
-