\ No newline at end of file
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 bc86b24..91f6cb7 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig
@@ -2,76 +2,105 @@
{% block css %}
{% stylesheets filter="compass"
- "@CalciferBundle/Resources/assets/css/events.scss"
- "@CalciferBundle/Resources/assets/css/leaflet.scss"
- %}
-
+ "@CalciferBundle/Resources/assets/css/events.scss"
+ "@CalciferBundle/Resources/assets/css/leaflet.scss" %}
+
{% endstylesheets %}
{% endblock %}
{% block javascripts %}
{% javascripts
"@CalciferBundle/Resources/assets/js/events.js"
- "@CalciferBundle/Resources/assets/js/leaflet.js"
- %}
+ "@CalciferBundle/Resources/assets/js/leaflet.js" %}
{% endjavascripts %}
{% endblock %}
{% block body -%}
-
-
-
- Termine
- {% if tag|default(false) %} für Tag „{{ tag.name }}“{% endif %}
- {% if location|default(false) %} für Ort „{{ location.name }}“ {% endif %}
-
- {% if tag|default(false) %}
-
Link zur Kalenderdatei
- {% endif %}
- {% if location|default(false) %}
- {% if (location.description|length > 0) or location.hasAddress() %}
-
- {% if (location.description|length > 0) %}
-
{{ location.description|markdown }}
+
+
- Anschrift:
- {{ location.streetaddress }}{% if(location.streetnumber|length > 0) %} {{ location.streetnumber }}{% endif %}
- {% if(location.zipcode|length > 0) %}{{ location.zipcode }} {% endif %}{{ location.city }}
-
- {% endif %}
- {% if ((location.lon > 0) and (location.lat > 0)) %}
-
Auf einer OpenStreetMap-Karte anzeigen
-
- {% endif %}
-
+ {% endfor %}
{% endif %}
{% endif %}
-
+ {% if location|default(false) %} für Ort „{{ location.name }}“
{% endif %}
+
+ {% if tag|default(false) %}
+
Link zur
+ Kalenderdatei
+ {% endif %}
+ {% if location|default(false) %}
+ {% if (location.description|length > 0) or location.hasAddress() %}
+
+ {% if (location.description|length > 0) %}
+
{{ location.description|markdown }}
+ {% endif %}
+ {% if (location.hasAddress()) %}
+
+
+ Anschrift:
+ {{ location.streetaddress }}{% if(location.streetnumber|length > 0) %} {{ location.streetnumber }}{% endif %}
+
+ {% if(location.zipcode|length > 0) %}{{ location.zipcode }} {% endif %}{{ location.city }}
+
+ {% endif %}
+ {% if ((location.lon > 0) and (location.lat > 0)) %}
+
Auf einer OpenStreetMap-Karte anzeigen
+
+ {% endif %}
+
+ {% endif %}
+ {% endif %}
-
- {% for entity in entities %}
- {{ include('CalciferBundle:Event:event_box.html.twig',{'truncate_summary':true}) }}
- {% endfor %}
-
+ {% if entities|length > 0 %}
+
+
+ {% for entity in entities %}
+ {{ include('CalciferBundle:Event:event_box.html.twig',{'truncate_summary':true}) }}
+ {% endfor %}
+
+
+ {% else %}
+
+
+
Es konnten keine Termine gefunden werden.
+
+
+ {% endif %}
{% endblock %}
diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig
index 7d19293..592eecf 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig
@@ -17,7 +17,7 @@
{% endblock %}
{% block body -%}
-
+
{{ include('CalciferBundle:Event:event_box.html.twig',{'entity' : entity,'detail' : true}) }}
{% endblock %}
diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Location/edit.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Location/edit.html.twig
index 6eb61de..4bd2189 100644
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Location/edit.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Location/edit.html.twig
@@ -19,146 +19,151 @@
{% endblock %}
{% block body -%}
-
-
-
Ort bearbeiten
-
+
+
-