diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-21 18:54:27 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-21 18:54:27 +0200 |
| commit | eae78a7605cfe7e54207e4ecc75e7b4fabdbbe02 (patch) | |
| tree | ba23470dffdd96bf857584d49315db4ebf7a6c32 /chimere/templates | |
| parent | a966ee5c1cc4e21fe33d284221a0dffd8e227a8b (diff) | |
| parent | 087919acf3e4945313034715f045c686ae3c543b (diff) | |
| download | Chimère-eae78a7605cfe7e54207e4ecc75e7b4fabdbbe02.tar.bz2 Chimère-eae78a7605cfe7e54207e4ecc75e7b4fabdbbe02.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/forms.py
chimere/models.py
chimere/static/chimere/js/jquery.chimere.js
Diffstat (limited to 'chimere/templates')
| -rw-r--r-- | chimere/templates/chimere/feeds/rss_descr.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chimere/templates/chimere/feeds/rss_descr.html b/chimere/templates/chimere/feeds/rss_descr.html index 4f75ac6..48f72df 100644 --- a/chimere/templates/chimere/feeds/rss_descr.html +++ b/chimere/templates/chimere/feeds/rss_descr.html @@ -1,8 +1,11 @@ {% load i18n %} {% load sanitize %} <div id='detail_content'> -{% if obj.picture %}<img src='{{obj.picture.url}}' alt="{{obj.name}}"/>{%endif%} -<div>{% for property in obj.getProperties %} -<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4"|safe }}</p> -{% endfor %}</div> +{% for picture in obj.pictures.all %}<a href='{{picture.picture.url}}'><img src='{{picture.thumbnailfile.url}}' alt="{{picture.name}}"/></a>{% endfor %} +<ul> +{% if obj.description %}<li class='description'><strong>{% trans "Description:" %}</strong> {{ obj.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4"|safe }}</li>{% endif %} +{% for property in obj.getProperties %} +{% if property.value %}<li id='{{property.propertymodel.getNamedId}}'><strong>{{property.propertymodel.name}}{% trans ":"%}</strong> {{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4"|safe }}</li>{% endif %} +{% endfor %} +</ul> </div> |