Merge branch 'devel' into 'master'

Merge in devel

See merge request oliver/ivatar!54

create.sh

@@ -28,7 +28,8 @@ else
 fi
 
 if [ -n "$LKERNAT_GITLAB_OPENSHIFT_ACCESS_TOKEN" ]; then
-    oc secrets new-basicauth lkernat-gitlab-openshift-falko-access-token --password=$LKERNAT_GITLAB_OPENSHIFT_ACCESS_TOKEN
+    #oc secrets new-basicauth lkernat-gitlab-openshift-falko-access-token --password=$LKERNAT_GITLAB_OPENSHIFT_ACCESS_TOKEN
+    oc create secret generic lkernat-gitlab-openshift-falko-access-token --from-literal=password=$LKERNAT_GITLAB_OPENSHIFT_ACCESS_TOKEN
     oc secrets add serviceaccount/builder secrets/lkernat-gitlab-openshift-falko-access-token
     SECRET_CMDLINE="--source-secret=lkernat-gitlab-openshift-falko-access-token"
 fi

ivatar/urls.py

@@ -5,7 +5,7 @@ from django.contrib import admin
 from django.urls import path, include
 from django.conf.urls import url
 from django.conf.urls.static import static
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, RedirectView
 from ivatar import settings
 from . views import AvatarImageView
 
@@ -20,6 +20,8 @@ urlpatterns = [  # pylint: disable=invalid-name
     url(
         r'avatar/(?P<digest>\w{32})',
         AvatarImageView.as_view(), name='avatar_view'),
+    url('contact/', TemplateView.as_view(template_name='contact.html'), name='contact'),
+    path('talk_to_us/', RedirectView.as_view(url='/contact'), name='talk_to_us'),
     url('', TemplateView.as_view(template_name='home.html')),
 ]
 

templates/base.html

@@ -38,7 +38,7 @@
                        </li>
                      {% endif %}
                      <li>
-                       <a class="nav-link" href="TODO contact"><i class="fa fa-envelope" aria-hidden="true"></i>
+                     <a class="nav-link" href="{% url 'contact' %}"><i class="fa fa-envelope" aria-hidden="true"></i>
                          {% trans 'Contact' %}
                        </a>
                      </li>

templates/contact.html

@@ -0,0 +1,39 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load static %}
+{% load bootstrap4 %}
+
+{% block title %}{% trans 'federated avatar hosting service' %}{% endblock %}
+
+{% block content %}
+
+There are a few ways to get in touch with the ivatar/libravatar developers:
+<h2>IRC</h2>
+
+If you have an IRC client already, you can join #libravatar on chat.freenode.net.
+
+Otherwise, you can use this <a href="http://webchat.freenode.net/?channels=libravatar">simple web interface</a>.
+
+Please keep in mind that you may live in a different timezone than most of the developers. So if you do not get a response, it's not because we're ignoring you, it's probably because we're sleeping :)
+
+<h2>Bug tracker</h2>
+
+If you have a question about a particular bug, or some feedback on it, the best thing to do is to comment on that bug itself.
+
+TODO TODO TODO
+
+<h2>Mailing list</h2>
+
+If you've got a proposal to discuss or prefer to write to us, you can join our developers mailing list.
+
+<h2>Identica / Twitter</h2>
+
+You can also put short notices to our attention on Identica or Twitter.
+
+<h2>Email</h2>
+
+Finally, if you need to email us: <a href="mailto:dev@libravatar.org">dev@libravatar.org</a>
+
+<div style="height:40px"></div>
+
+{% endblock %}