New location view layout

diff --git a/Resources/views/location/view.html.twig b/Resources/views/location/view.html.twig
index 4c5508b84b2522e9ebfe2f9f8d6831c43798c1aa..d187053ba6d7b86108e66403572a5357a3500f8a 100644 (file)
--- a/Resources/views/location/view.html.twig
+++ b/Resources/views/location/view.html.twig
@@ -2,7 +2,7 @@
 {% block content %}
        <article id="dashboard">
                <header>
 {% block content %}
        <article id="dashboard">
                <header>

-                       <h2><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ section }}</a></h2>
+                       <h2><a href="{{ canonical }}">{{ title }}</a></h2>

                        <p>{{ description }}</p>
                </header>
                <div class="panel">
                        <p>{{ description }}</p>
                </header>
                <div class="panel">


@@ -15,20 +15,20 @@
                                                                <ul>
                                                                        {% for session in day.sessions %}
                                                                                <li class="{{ session.class|join(' ') }}">
                                                                <ul>
                                                                        {% for session in day.sessions %}
                                                                                <li class="{{ session.class|join(' ') }}">

-                                                                                       <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">
-                                                                                               <span>{{ session.start|localizeddate('none', 'short') }}</span>
-                                                                                               <span class="reducible">{{ session.location }}</span>
-                                                                                               <span class="info">
-                                                                                                       {% if session.weather is defined and session.weather %}
-                                                                                                               <span title="{{ session.weathertitle }}">{{ session.weather }}</span>
-                                                                                                       {% endif %}
-                                                                                                       <span title="{{ session.slottitle }}">{{ session.slot }}</span>
-                                                                                               </span>
-                                                                                               <span>{{ session.stop|localizeddate('none', 'short') }}</span>
-                                                                                               {% if session.pseudonym is defined and session.pseudonym %}
-                                                                                                       <span class="reducible{% if session.rate is not defined and session.hat is not defined %} pseudonym{% endif %}">{{ session.pseudonym }}</span>
+                                                                                       <a href="{{ session.link }}" title="{{ session.title }}">
+                                                                                               <span>{{ session.start|intldate('none', 'short') }}</span>
+                                                                                               <span class="reducible">{{ session.location.title }}</span>
+                                                                                               <span class="temperature"{% if session.temperature.title is defined and session.temperature.title %} title="{{ session.temperature.title }}"{% endif %}><span class="glyph">{{ session.temperature.glyph }}</span></span>
+                                                                                               <span>{{ session.stop|intldate('none', 'short') }}</span>
+                                                                                               <span class="reducible">{% if session.application.user.title is defined and session.application.user.title %}{{ session.application.user.title }}{% endif %}</span>
+                                                                                               <span class="rain"{% if session.rain.title is defined and session.rain.title %} title="{{ session.rain.title }}"{% endif %}><span class="glyph">{{ session.rain.glyph }}</span></span>
+                                                                                               {% if session.rate is defined and session.rate %}
+                                                                                                       <span class="rate" title="{{ session.rate.title }}">{% if session.rate.rate is defined and session.rate.rate %}{{ session.rate.rate }} {% endif %}<span class="glyph">{{ session.rate.glyph }}</span></span>
+                                                                                               {% else %}
+                                                                                                       <span></span>

                                                                                                {% endif %}
                                                                                                {% endif %}

-                                                                                               {% if session.rate is defined %}<span class="info">{{ session.rate }} {% if session.hat is defined and session.hat %}🎩{% else %}€{% endif %}</span>{% endif %}
+                                                                                               <span class="reducible">{{ session.location.zipcode }} {{ session.location.city }}</span>
+                                                                                               <span></span>

                                                                                        </a>
                                                                                </li>
                                                                        {% endfor %}
                                                                                        </a>
                                                                                </li>
                                                                        {% endfor %}