Merge branch 'devel' of https://git.linux-kernel.at/oliver/ivatar

ivatar/urls.py

@@ -20,6 +20,7 @@ urlpatterns = [  # pylint: disable=invalid-name
     url(
         r'avatar/(?P<digest>\w{32})',
         AvatarImageView.as_view(), name='avatar_view'),
+    url('security/', TemplateView.as_view(template_name='security.html'), name='security'),
     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

@@ -43,7 +43,7 @@
                        </a>
                      </li>
                      <li>
-                       <a href="TODO security"><i class="fa fa-user-secret" aria-hidden="true"></i>
+                     <a href="{% url 'security' %}"><i class="fa fa-user-secret" aria-hidden="true"></i>
                          {% trans 'Security' %}
                        </a>
                       </li>

templates/contact.html

@@ -11,15 +11,15 @@ 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.
-
+<br/>
 Otherwise, you can use this <a href="http://webchat.freenode.net/?channels=libravatar">simple web interface</a>.
-
+<br/>
 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.
-
+<br/>
 TODO TODO TODO
 
 <h2>Mailing list</h2>

templates/home.html

@@ -41,8 +41,8 @@
 </section>
 <section class="col-md-4">
 <h1>Useful links</h1>
-<a class="btn btn-default" href="https://wiki.libravatar.org/talk_to_us/">{% trans 'Contact us' %}</a><br/>
-<a class="btn btn-default" href="https://wiki.libravatar.org/security/">{% trans 'Security' %}</a><br/>
+<a class="btn btn-default" href="{% url 'contact' %}">{% trans 'Contact us' %}</a><br/>
+<a class="btn btn-default" href="{% url 'security' %}">{% trans 'Security' %}</a><br/>
 <a class="btn btn-default" href="https://code.launchpad.net/libravatar">{% trans 'Source code' %}</a><br/>
 <a class="btn btn-default" href="https://bugs.launchpad.net/libravatar">{% trans 'Report bugs' %}</a><br/>
 <a class="btn btn-default" href="https://answers.launchpad.net/libravatar">{% trans 'Questions' %}</a><br/>