Merge branch 'devel' into 'master'

Avoid mixed-content warning and only display secure content if serving via https

See merge request oliver/ivatar!28

ivatar/tools/templates/check.html

@@ -35,6 +35,7 @@
 
     <ul class="horizontal-list avatar-list centered" style="font-size:smaller;">
       {% if mailurl %}
+        {% if not request.is_secure %}
         <li>
           <div style="float:left;">
             <a href="{{ mailurl }}">
@@ -48,6 +49,7 @@
           </div>
           <br/>MD5
         </li>
+        {% endif %}
         <li>
           <div style="float:left;">
             <a href="{{ mailurl_secure }}">
@@ -61,7 +63,7 @@
           </div>
           <br/>MD5
         </li>
-
+        {% if not request.is_secure %}
         <li>
           <div style="float:left;">
             <a href="{{ BASE_URL }}{{ mail_hash256 }}?s={{ size }}">
@@ -75,6 +77,7 @@
           </div>
           <br/>SHA256
         </li>
+        {% endif %}
         <li>
           <div style="float:left;">
             <a href="{{ SECURE_BASE_URL }}{{ mail_hash256 }}?s={{ size }}">
@@ -91,6 +94,7 @@
       {% endif %}
 
       {% if openidurl %}
+        {% if not request.is_secure %}
         <li>
           <div style="float:left;">
             <a href="{{ openidurl }}">
@@ -104,6 +108,7 @@
           </div>
           <br/>SHA256
         </li>
+        {% endif %}
         <li>
           <div style="float:left;">
             <a href="{{ openidurl_secure }}">