From 6908eeebc9f20b194a2869af69606ec770056fea Mon Sep 17 00:00:00 2001
From: Tim Schumacher <tim.schumacher@tourevo.com>
Date: Fri, 1 Aug 2014 11:32:27 +0200
Subject: [PATCH 1/2] Specify the favicon in the main template.

---
 .../Bundle/CalciferBundle/Resources/views/layout.html.twig       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig
index 5f8f997..dcc898a 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig
@@ -5,6 +5,7 @@
     <title>{% block title %}Terminverwaltung Calcifer{% endblock %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- Bootstrap -->
+    <link rel="shortcut icon" href="/favicon.png" />
     <link href='//fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'>
     {% stylesheets filter="compass"
         "@CalciferBundle/Resources/assets/css/main.scss"
-- 
2.39.5


From 6731d716f87cf22961c31b94af788f553db88d4b Mon Sep 17 00:00:00 2001
From: andibraeu <ab@andi95.de>
Date: Sat, 16 Aug 2014 09:39:07 +0200
Subject: [PATCH 2/2] added link to ics file

---
 .../CalciferBundle/Resources/views/Event/index.html.twig       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
index e820215..287a5a6 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
@@ -24,6 +24,9 @@
                 {% if tag|default(false) %} für Tag „{{ tag.name }}“{% endif %}
                 {% if location|default(false) %} für Ort „{{ location.name }}“{% endif %}
             </h1>
+            {% if tag|default(false) %}
+                <a href="{{ path('tag_show',{'slug' : tag.slug }) }}.ics"><i class="icon calendar"></i>Link zur Kalenderdatei</a>
+            {% endif %}
         </div>
     </div>
 
-- 
2.39.5