Add weather and slot glyphs

Improve locations section

diff --git a/Resources/views/location/view.html.twig b/Resources/views/location/view.html.twig
index 6920fee02d762f41e38a2527b4e87c2ab553ed7e..dcff4019968c1673f0a3a034627b3ff2c8b8b73b 100644 (file)
--- a/Resources/views/location/view.html.twig
+++ b/Resources/views/location/view.html.twig
@@ -13,6 +13,10 @@
                                                                {% for session in day.sessions %}
                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
                                                                                <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">{{ session.title }}</a>
                                                                {% for session in day.sessions %}
                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
                                                                                <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">{{ session.title }}</a>

+                                                                               <span>
+                                                                                       {% if session.weather is defined and session.weather %}<span title="{{ session.weathertitle }}">{{ session.weather }}</span>{% endif %}
+                                                                                       <span title="{{ session.slottitle }}">{{ session.slot }}</span>
+                                                                               </span>

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


@@ -27,13 +31,16 @@
        </div>
        {% if locations is defined and locations %}
                <div class="panel location">
        </div>
        {% if locations is defined and locations %}
                <div class="panel location">

-                       <div class="grid">
-                               {% for id, title in locations %}
-                                       <section class="cell">
-                                               <h3><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h3>
-                                       </section>
-                               {% endfor %}
-                       </div>
+                       <section>
+                               <h3>{% trans %}Locations{% endtrans %}</h3>
+                               <div class="grid">
+                                       {% for id, title in locations %}
+                                               <section class="cell">
+                                                       <h4><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h4>
+                                               </section>
+                                       {% endfor %}
+                               </div>
+                       </section>

                </div>
        {% endif %}
 </section>
                </div>
        {% endif %}
 </section>

diff --git a/Resources/views/session/index.html.twig b/Resources/views/session/index.html.twig
index 716eb99e207f62c7f15bad7c7bcb89975da4e875..291e52a3735f3d7bdea6a33d9aab894d7d24da64 100644 (file)
--- a/Resources/views/session/index.html.twig
+++ b/Resources/views/session/index.html.twig
@@ -13,6 +13,10 @@
                                                                {% for session in day.sessions %}
                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
                                                                                <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">{{ session.title }}</a>
                                                                {% for session in day.sessions %}
                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
                                                                                <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">{{ session.title }}</a>

+                                                                               <span>
+                                                                                       {% if session.weather is defined and session.weather %}<span title="{{ session.weathertitle }}">{{ session.weather }}</span>{% endif %}
+                                                                                       <span title="{{ session.slottitle }}">{{ session.slot }}</span>
+                                                                               </span>

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


@@ -27,13 +31,16 @@
        </div>
        {% if locations is defined and locations %}
                <div class="panel location">
        </div>
        {% if locations is defined and locations %}
                <div class="panel location">

-                       <div class="grid">
-                               {% for id, title in locations %}
-                                       <section class="cell">
-                                               <h3><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h3>
-                                       </section>
-                               {% endfor %}
-                       </div>
+                       <section>
+                               <h3>{% trans %}Locations{% endtrans %}</h3>
+                               <div class="grid">
+                                       {% for id, title in locations %}
+                                               <section class="cell">
+                                                       <h4><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h4>
+                                               </section>
+                                       {% endfor %}
+                               </div>
+                       </section>

                </div>
        {% endif %}
 </section>
                </div>
        {% endif %}
 </section>

diff --git a/Resources/views/user/view.html.twig b/Resources/views/user/view.html.twig
index 2110208ad317408e1bd60cb59853f5fd7aeb0629..162c383b3371d0642b1c9bf73640f3db1894a433 100644 (file)
--- a/Resources/views/user/view.html.twig
+++ b/Resources/views/user/view.html.twig
@@ -13,6 +13,10 @@
                                                                {% for session in day.sessions %}
                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
                                                                                <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">{{ session.title }}</a>
                                                                {% for session in day.sessions %}
                                                                        <li class="{{ ['session']|merge(session.class)|join(' ') }}">
                                                                                <a href="{{ path('rapsys_air_session_view', {'id': session.id}) }}" title="{{ session.applications|join('\n') }}">{{ session.title }}</a>

+                                                                               <span>
+                                                                                       {% if session.weather is defined and session.weather %}<span title="{{ session.weathertitle }}">{{ session.weather }}</span>{% endif %}
+                                                                                       <span title="{{ session.slottitle }}">{{ session.slot }}</span>
+                                                                               </span>

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


@@ -27,13 +31,16 @@
        </div>
        {% if locations is defined and locations %}
                <div class="panel location">
        </div>
        {% if locations is defined and locations %}
                <div class="panel location">

-                       <div class="grid">
-                               {% for id, title in locations %}
-                                       <section class="cell">
-                                               <h3><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h3>
-                                       </section>
-                               {% endfor %}
-                       </div>
+                       <section>
+                               <h3>{% trans %}Locations{% endtrans %}</h3>
+                               <div class="grid">
+                                       {% for id, title in locations %}
+                                               <section class="cell">
+                                                       <h4><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h4>
+                                               </section>
+                                       {% endfor %}
+                               </div>
+                       </section>

                </div>
        {% endif %}
 </section>
                </div>
        {% endif %}
 </section>