From b6524a9ca1f50eadb13a924b2bb9171813248da1 Mon Sep 17 00:00:00 2001
From: artragis <artragis@gmail.com>
Date: Wed, 7 Oct 2015 13:55:38 +0200
Subject: [PATCH 1/2] permet de rendre les urls sans protocol avec un
 templatetag

---
 .../includes/featured_resource_item.part.html |  3 ++-
 templates/featured/index.html                 |  4 ++--
 .../templatetags/remove_url_protocole.py      | 20 +++++++++++++++++++
 .../tests/test_remove_url_protocole.py        | 16 +++++++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 zds/utils/templatetags/remove_url_protocole.py
 create mode 100644 zds/utils/templatetags/tests/test_remove_url_protocole.py

diff --git a/templates/featured/includes/featured_resource_item.part.html b/templates/featured/includes/featured_resource_item.part.html
index ff64b18f7f..430ebaee85 100644
--- a/templates/featured/includes/featured_resource_item.part.html
+++ b/templates/featured/includes/featured_resource_item.part.html
@@ -1,8 +1,9 @@
 {% load i18n %}
+{% load remove_url_protocole %}
 
 <article class="featured-resource-item">
     <a href="{{ featured_resource.url }}">
-        <img src="{{ featured_resource.image_url }}" alt="" class="featured-resource-illu">
+        <img src="{{ featured_resource.image_url|remove_url_protocole }}" alt="" class="featured-resource-illu">
         <div class="featured-resource-meta">
             <h3>{{ featured_resource.title }}</h3>
             <p class="featured-resource-description">{{ featured_resource.type }} {% if featured_resource.authors %} {% trans "par" %} <i>{{ featured_resource.authors }}</i>{% endif %}</p>
diff --git a/templates/featured/index.html b/templates/featured/index.html
index 58b6b83caf..64f6404f47 100644
--- a/templates/featured/index.html
+++ b/templates/featured/index.html
@@ -1,6 +1,6 @@
 {% extends "featured/base.html" %}
 {% load i18n %}
-
+{% load remove_url_protocole %}
 
 {% block title %}
     {% trans "Liste des unes" %}
@@ -41,7 +41,7 @@
                         </div>
                         <div class="topic-description">
                             <a href="{% url 'featured-resource-update' featured_resource.pk %}" class="topic-title-link navigable-link">
-                                <img src="{{ featured_resource.image_url }}"
+                                <img src="{{ featured_resource.image_url|remove_url_protocole }}"
                                     data-caption="{{ featured_resource.title }}"
                                     alt="{{ featured_resource.title }}"
                                     class="topic-image"
diff --git a/zds/utils/templatetags/remove_url_protocole.py b/zds/utils/templatetags/remove_url_protocole.py
new file mode 100644
index 0000000000..971c378359
--- /dev/null
+++ b/zds/utils/templatetags/remove_url_protocole.py
@@ -0,0 +1,20 @@
+from django import template
+from zds.settings import ZDS_APP
+
+
+register = template.Library()
+
+
+CONVERT_VALUES = ((1000, 'M'), (900, 'CM'), (500, 'D'), (400, 'CD'), (100, 'C'),
+                  (90, 'XC'), (50, 'L'), (40, 'XL'), (10, 'X'), (9, 'IX'), (5, 'V'),
+                  (4, 'IV'), (1, 'I'))
+
+
+@register.filter('remove_url_protocole')
+def remove_url_protocole(input_url):
+    """
+    make every image url pointing to this website protocol independant so that https is not broken
+    """
+    if ZDS_APP["site"]["dns"] in input_url:
+        return input_url.replace("http:/", "https:/").replace("https://" + ZDS_APP["site"]["dns"], "")
+    return input_url
diff --git a/zds/utils/templatetags/tests/test_remove_url_protocole.py b/zds/utils/templatetags/tests/test_remove_url_protocole.py
new file mode 100644
index 0000000000..1dbd3db75a
--- /dev/null
+++ b/zds/utils/templatetags/tests/test_remove_url_protocole.py
@@ -0,0 +1,16 @@
+from zds.settings import ZDS_APP
+from django.test import TestCase
+from zds.utils.templatetags.remove_url_protocole import remove_url_protocole
+
+
+class RemoveUrlProtocolTest(TestCase):
+
+    def test_remove_protocole_when_local_url(self):
+        self.assertEqual("/bla.html", remove_url_protocole("http://" + ZDS_APP["site"]["dns"] + "/bla.html"))
+        self.assertEqual("/bla.html", remove_url_protocole("https://" + ZDS_APP["site"]["dns"] + "/bla.html"))
+
+    def test_no_change_when_no_protocole(self):
+        self.assertEqual("/bla.html", remove_url_protocole("/bla.html"))
+
+    def test_no_change_when_extern_address(self):
+        self.assertEqual("http://www.google.com/bla.html", remove_url_protocole("http://www.google.com/bla.html"))

From ff00a9f63e41e60ba3cc6ff6dcffd55f6d7ce9b2 Mon Sep 17 00:00:00 2001
From: artragis <artragis@gmail.com>
Date: Mon, 9 Nov 2015 13:00:47 +0100
Subject: [PATCH 2/2] =?UTF-8?q?=C3=A9chappe=20aussi=20le=20http=20de=20l'a?=
 =?UTF-8?q?vatar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base.html                            | 6 +++---
 zds/utils/templatetags/remove_url_protocole.py | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 036d264a31..971ef6745c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,7 +8,7 @@
 {% load captureas %}
 {% load thumbnail %}
 {% load i18n %}
-
+{% load remove_url_protocole %}
 
 
 <!DOCTYPE html>
@@ -296,7 +296,7 @@
                                                         {% endif %}
                                                         <a href="{{ topic.last_read_post.get_absolute_url }}">
                                                             {% with p=last_answer.author.profile %}
-                                                                <img src="{{ p.get_avatar_url }}" alt="" class="avatar">
+                                                                <img src="{{ p.get_avatar_url|remove_url_protocole }}" alt="" class="avatar">
                                                             {% endwith %}
                                                             <span class="username">{{ last_answer.author.username }}</span>
                                                             <span class="date">{{ last_answer.pubdate|format_date:True|capfirst }}</span>
@@ -339,7 +339,7 @@
                                                     <li>
                                                         <a href="{{ first_unread.url }}">
                                                             {% with p=first_unread.author.profile %}
-                                                                <img src="{{ p.get_avatar_url  }}" alt="" class="avatar">
+                                                                <img src="{{ p.get_avatar_url|remove_url_protocole  }}" alt="" class="avatar">
                                                             {% endwith %}
                                                             <span class="username">{{ first_unread.author.username }}</span>
                                                             <span class="date">{{ first_unread.pubdate|format_date:True|capfirst }}</span>
diff --git a/zds/utils/templatetags/remove_url_protocole.py b/zds/utils/templatetags/remove_url_protocole.py
index 971c378359..285bbc8e67 100644
--- a/zds/utils/templatetags/remove_url_protocole.py
+++ b/zds/utils/templatetags/remove_url_protocole.py
@@ -5,11 +5,6 @@
 register = template.Library()
 
 
-CONVERT_VALUES = ((1000, 'M'), (900, 'CM'), (500, 'D'), (400, 'CD'), (100, 'C'),
-                  (90, 'XC'), (50, 'L'), (40, 'XL'), (10, 'X'), (9, 'IX'), (5, 'V'),
-                  (4, 'IV'), (1, 'I'))
-
-
 @register.filter('remove_url_protocole')
 def remove_url_protocole(input_url):
     """