From 77c450f0f17deddf63b96bc82e436eca6c0563b3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Aug 2012 19:24:21 +0200 Subject: Work on an alternative multimedia form --- chimere/static/chimere/css/styles.css | 37 +++++- chimere/static/chimere/img/close.png | Bin 0 -> 856 bytes chimere/static/chimere/img/film_logo.png | Bin 0 -> 748 bytes chimere/static/chimere/img/img_logo.png | Bin 0 -> 864 bytes .../chimere/blocks/alternate_multimedia.html | 124 +++++++++++++++++++++ chimere/templatetags/chimere_tags.py | 5 + 6 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 chimere/static/chimere/img/close.png create mode 100644 chimere/static/chimere/img/film_logo.png create mode 100644 chimere/static/chimere/img/img_logo.png create mode 100644 chimere/templates/chimere/blocks/alternate_multimedia.html diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 023c037..6529981 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -26,7 +26,7 @@ h2, h3, th, .action li, .action li a, color:#333; } -.nominatim-widget{ +.nominatim-widget, .disabled{ color:#aaa; } @@ -186,6 +186,10 @@ fieldset{ margin-top:8px; } +.hidden{ + display:none; +} + .ui-dialog-buttonset{ text-align:center; } @@ -695,6 +699,37 @@ table.inline-table td input[type=file]{ margin-right: auto; } +ul#multimedia_list_content{ + padding:0; + margin:0; + list-style-type:none; +} + +ul#multimedia_list_content li{ + padding:0.5em 5px 0.5em 35px; + margin:0; + display:block; + list-style-type:none; + border-bottom:1px solid; +} + +ul#multimedia_list_content li img{ + display:block; + float:right; +} + +ul#multimedia_list_content li.picture{ + background-image:url("../img/img_logo.png"); + background-position:4px center; + background-repeat:no-repeat; +} + +ul#multimedia_list_content li.multimedia{ + background-image:url("../img/film_logo.png"); + background-position:6px center; + background-repeat:no-repeat; +} + /* openlayer customisation */ .olControlPermalink { display: block; diff --git a/chimere/static/chimere/img/close.png b/chimere/static/chimere/img/close.png new file mode 100644 index 0000000..f9e8d04 Binary files /dev/null and b/chimere/static/chimere/img/close.png differ diff --git a/chimere/static/chimere/img/film_logo.png b/chimere/static/chimere/img/film_logo.png new file mode 100644 index 0000000..1ccdc2e Binary files /dev/null and b/chimere/static/chimere/img/film_logo.png differ diff --git a/chimere/static/chimere/img/img_logo.png b/chimere/static/chimere/img/img_logo.png new file mode 100644 index 0000000..b487506 Binary files /dev/null and b/chimere/static/chimere/img/img_logo.png differ diff --git a/chimere/templates/chimere/blocks/alternate_multimedia.html b/chimere/templates/chimere/blocks/alternate_multimedia.html new file mode 100644 index 0000000..86fd7ed --- /dev/null +++ b/chimere/templates/chimere/blocks/alternate_multimedia.html @@ -0,0 +1,124 @@ +{% load i18n %} +
+ {% for formset in formsets %} + {{ formset.management_form }} + {% endfor %} + + +
+
+
{% trans "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc eu luctus ipsum. Donec vel urna a turpis consectetur consectetur. Vestibulum ut enim vel odio porta vulputate." %} +
+
+ + +
+
+ {% trans "Image" %} + {% trans "Audio, video, other..." %} +
+
+ +

{% trans "Or" %}

+ +
+ +
+ + diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index a07dc44..71ac9b0 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -216,6 +216,11 @@ def multimedia_render(context, multimedia_file): context['multimedia_item'] = multimedia_file return context +@register.inclusion_tag('chimere/blocks/alternate_multimedia.html') +def alternate_multimedia(formset_multi, formset_picture): + return {'formsets':[formset_multi, formset_picture], + "STATIC_URL": settings.STATIC_URL} + @register.simple_tag def get_tinyfied_url(marker, area_name=''): if not marker or not hasattr(marker, 'get_absolute_url'): -- cgit v1.2.3