From: Emilie Date: Fri, 26 Aug 2016 17:07:42 +0000 (+0200) Subject: Task #105 #106: hide some fields in admin X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=13823084f1e3c5da2f409755da5ee4f33003f70e;p=mezzo.git Task #105 #106: hide some fields in admin --- diff --git a/app/organization/media/models.py b/app/organization/media/models.py index ff770fab..d5aceeb5 100644 --- a/app/organization/media/models.py +++ b/app/organization/media/models.py @@ -12,7 +12,7 @@ from organization.core.models import CustomDisplayable from organization.pages.models import Page from mezzanine_agenda.models import Event from django.conf import settings - +import requests MEDIA_BASE_URL = getattr(settings, 'MEDIA_BASE_URL', 'http://medias.ircam.fr/embed/media/') diff --git a/app/organization/network/admin.py b/app/organization/network/admin.py index 0078351d..0645a9e6 100644 --- a/app/organization/network/admin.py +++ b/app/organization/network/admin.py @@ -13,11 +13,13 @@ from organization.media.models import PageAudio, PageVideo class PageAudioInline(StackedDynamicInlineAdmin): model = PageAudio + exclude = ("short_url", "keywords", "description", "slug", ) class PageVideoInline(StackedDynamicInlineAdmin): model = PageVideo + exclude = ("short_url", "keywords", "description", "slug", ) class OrganizationImageInline(TabularDynamicInlineAdmin): diff --git a/app/organization/pages/admin.py b/app/organization/pages/admin.py index 6c614222..3c73a53f 100644 --- a/app/organization/pages/admin.py +++ b/app/organization/pages/admin.py @@ -23,11 +23,13 @@ class PageImageInline(TabularDynamicInlineAdmin): class PageAudioInline(StackedDynamicInlineAdmin): model = PageAudio + exclude = ("short_url", "keywords", "description", "slug", ) class PageVideoInline(StackedDynamicInlineAdmin): model = PageVideo + exclude = ("short_url", "keywords", "description", "slug", ) class CustomPageAdmin(PageAdmin): diff --git a/app/templates/media/video/video_detail.html b/app/templates/media/video/video_detail.html new file mode 100644 index 00000000..b954cc14 --- /dev/null +++ b/app/templates/media/video/video_detail.html @@ -0,0 +1,52 @@ +{% extends "base.html" %} +{% load i18n %} +{% load mezzanine_tags keyword_tags %} + +{% block title %} +{{ video.title }} +{% endblock %} + +{% block main %} + +
+ {{ video.content|safe }} +
+ +
+ +
+ +{% with video as object %} + {% include "includes/share_buttons.html" %} +{% endwith %} + +{% if video.event %} +
+

{% trans 'Also discover' %}

+
+
+ {% with video.event as event %} + {% include 'agenda/includes/event_card.html' %} + {% for artist in video.artists.all %} + {% include "festival/inc/artist_card.html" %} + {% endfor %} + {% for v in event.videos.all %} + {% if v != video %} + {% with v as video %} + {% include 'festival/inc/video_card.html' %} + {% endwith %} + {% endif %} + {% endfor %} + {% for post in event.blog_posts.all %} + {% include 'blog/includes/post_card.html' %} + {% endfor %} + {% endwith %} + +
+
+{% endif %} + +{% endblock %}