From 25b81140fac72ddffbedc17e733fabf06d5051fb Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Mon, 1 Oct 2012 13:07:29 +0200
Subject: TinyMCE: allow external images

---
 chimere/static/chimere/js/textareas.js         | 2 +-
 chimere/templates/chimere/blocks/welcome.html  | 4 ++--
 chimere/templates/chimere/detail.html          | 4 ++--
 chimere/templates/chimere/feeds/rss_descr.html | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chimere/static/chimere/js/textareas.js b/chimere/static/chimere/js/textareas.js
index 048718d..e15e7f2 100644
--- a/chimere/static/chimere/js/textareas.js
+++ b/chimere/static/chimere/js/textareas.js
@@ -22,7 +22,7 @@ tinyMCE.init({
     theme : "advanced",
     editor_selector : "mceEditor",
     relative_urls : false,
-    theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link",
+    theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link,image",
     theme_advanced_buttons2 : "",
     theme_advanced_buttons3 : ""
 });
diff --git a/chimere/templates/chimere/blocks/welcome.html b/chimere/templates/chimere/blocks/welcome.html
index 95ad1ac..72d37b3 100644
--- a/chimere/templates/chimere/blocks/welcome.html
+++ b/chimere/templates/chimere/blocks/welcome.html
@@ -39,10 +39,10 @@ $(function(){
                             </div>
                             {%endif%}
                             {% if news.description %}
-                                <p class='description'>{{news.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td th tr"|safe}}</p>
+                                <p class='description'>{{news.description|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td th tr"|safe}}</p>
                             {% endif %}
                             {% for property in news.getProperties %}
-                                <p class='{{news.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td th tr"|safe }}</p>
+                                <p class='{{news.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td th tr"|safe }}</p>
                             {% endfor %}
                             <p class='marker_link'><a href='{% get_tinyfied_url news area_name %}'>{% trans "See it on the map"%}</a></p>
                         {% endif %}
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index 95e6a70..5bd9841 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -17,10 +17,10 @@
     {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span>
     {% endif %}
     {% if marker.description %}
-    <p class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p>
+    <p class='description'>{{ marker.description|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p>
     {% endif %}
     {% for property in marker.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 table td tr th"|safe}}</p>
+    <p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</p>
     {% endfor %}
     {% if marker.multimedia_items %}
     <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
diff --git a/chimere/templates/chimere/feeds/rss_descr.html b/chimere/templates/chimere/feeds/rss_descr.html
index 48f72df..b157c56 100644
--- a/chimere/templates/chimere/feeds/rss_descr.html
+++ b/chimere/templates/chimere/feeds/rss_descr.html
@@ -3,9 +3,9 @@
 <div id='detail_content'>
 {% 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 %}
+{% if obj.description %}<li class='description'><strong>{% trans "Description:" %}</strong> {{ obj.description|sanitize:"p b i br hr strong em img:src:alt 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 %}
+{% if property.value %}<li id='{{property.propertymodel.getNamedId}}'><strong>{{property.propertymodel.name}}{% trans ":"%}</strong> {{ property.value|sanitize:"p b i br hr strong em img:src:alt span:style a:href:target ul li ol h1 h2 h3 h4"|safe }}</li>{% endif %}
 {% endfor %}
 </ul>
 </div>
-- 
cgit v1.2.3