Switch to new header system

Switch to article container
Use common location template
Improve each event display

diff --git a/Resources/views/user/index.html.twig b/Resources/views/user/index.html.twig
index 2cfc6c853207430a80b872709cec8c50aa18e69a..2e3b1bdca310d8ef68149f62d8f6c31b3d786282 100644 (file)
--- a/Resources/views/user/index.html.twig
+++ b/Resources/views/user/index.html.twig
@@ -1,22 +1,25 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}

-       <section id="dashboard">
-               <h2><a href="{{ path('rapsys_air') }}">{{ section }}</a></h2>
+       <article id="dashboard">
+               <header>
+                       <h2><a href="{{ path('rapsys_air_user') }}">{{ section }}</a></h2>
+                       <p>{{ description }}</p>
+               </header>

                <div class="panel">
                <div class="panel">

-                       {% if organizers is defined and organizers %}
-                               <div class="grid">
-                                       {% for group, users in organizers %}
-                                               <section class="cell">
+                       {% if users is defined and users %}
+                               <div class="grid two">
+                                       {% for group, list in users %}
+                                               <article class="cell">

                                                        <h3>{{ group }}</h3>
                                                        <ul>
                                                        <h3>{{ group }}</h3>
                                                        <ul>

-                                                               {% for id, organizer in users %}
-                                                                       <li><a href="{{ path('rapsys_air_organizer_view', {'id': id}) }}">{{ organizer }}</a></li>
+                                                               {% for id, user in list %}
+                                                                       <li><a href="{{ path('rapsys_air_user_view', {'id': id}) }}">{{ user }}</a></li>

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

-                                               </section>
+                                               </article>

                                        {% endfor %}
                                        {#{% for date, day in organizers %}
                                        {% endfor %}
                                        {#{% for date, day in organizers %}

-                                               <section class="{{ ['cell', 'seventh']|merge(day.class)|join(' ') }}">
+                                               <article class="{{ ['cell', 'seventh']|merge(day.class)|join(' ') }}">

                                                        <h3>{{ day.title }}</h3>
                                                        {% if day.sessions is not empty %}
                                                                <ul>
                                                        <h3>{{ day.title }}</h3>
                                                        {% if day.sessions is not empty %}
                                                                <ul>


@@ -33,23 +36,12 @@
                                                        {% else %}
                                                                &nbsp;
                                                        {% endif %}
                                                        {% else %}
                                                                &nbsp;
                                                        {% endif %}

-                                               </section>
+                                               </article>

                                        {% endfor %}#}
                                </div>
                        {% endif %}
                        {{ include('@RapsysAir/form/_toolbox.html.twig') }}
                </div>
                                        {% endfor %}#}
                                </div>
                        {% endif %}
                        {{ include('@RapsysAir/form/_toolbox.html.twig') }}
                </div>

-       </section>
-       {% if locations is defined and locations %}
-               <section id="location">
-                       <h2>{% trans %}Locations{% endtrans %}</h2>
-                       <div class="panel 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>
-       {% endif %}
+       </article>
+       {{ include('@RapsysAir/default/_location.html.twig') }}

 {% endblock %}
 {% endblock %}

diff --git a/Resources/views/user/view.html.twig b/Resources/views/user/view.html.twig
index 2484783718c67e51cc920b0abaa11fd7e51cc5b1..0a183f45d308115a16cb86a8e79088e8296b7da5 100644 (file)
--- a/Resources/views/user/view.html.twig
+++ b/Resources/views/user/view.html.twig
@@ -1,27 +1,36 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}

-       <section id="dashboard">
-               <h2><a href="{{ path('rapsys_air_organizer_view', {'id': id}) }}">{{ section }}</a></h2>
-               <div class="panel calendar">
+       <article id="dashboard">
+               <header>
+                       <h2><a href="{{ path('rapsys_air_user_view', {'id': id}) }}">{{ section }}</a></h2>
+                       <p>{{ description }}</p>
+               </header>
+               <div class="panel">

                        {% if calendar is defined and calendar %}
                        {% if calendar is defined and calendar %}

-                               <div class="grid">
+                               <div class="grid calendar seven">

                                        {% for date, day in calendar %}
                                        {% for date, day in calendar %}

-                                               <section class="{{ ['cell', 'seventh']|merge(day.class)|join(' ') }}">
+                                               <section class="{{ day.class|join(' ') }}">

                                                        <h3>{{ day.title }}</h3>
                                                        {% if day.sessions is not empty %}
                                                                <ul>
                                                                        {% for session in day.sessions %}
                                                        <h3>{{ day.title }}</h3>
                                                        {% if day.sessions is not empty %}
                                                                <ul>
                                                                        {% 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 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>
+                                                                                               {% if session.pseudonym is defined and session.pseudonym %}
+                                                                                                       <span class="reducible pseudonym">{{ session.pseudonym }}</span>
+                                                                                               {% endif %}
+                                                                                       </a>

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

-                                                       {% else %}
-                                                               &nbsp;

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


@@ -29,33 +38,6 @@
                        {% endif %}
                        {{ include('@RapsysAir/form/_toolbox.html.twig') }}
                </div>
                        {% endif %}
                        {{ include('@RapsysAir/form/_toolbox.html.twig') }}
                </div>

-       </section>
-       {% if locations is defined and locations %}
-               <section id="location">
-                       <h2>{% trans %}Locations{% endtrans %}</h2>
-                       <div class="panel grid">
-                               {% for id, title in locations %}
-                                       <section class="cell">
-                                               <h3><a href="{{ path('rapsys_air_location_view', {'id': id}) }}">{{ title }}</a></h3>
-                                               {% if snippets is defined and snippets[id] is defined and snippets[id] %}
-                                                       {{ form_start(snippets[id]) }}
-                                                               <div>
-                                                                       {{ form_row(snippets[id].description) }}
-
-                                                                       {{ form_row(snippets[id].submit) }}
-
-                                                                       {% if snippets[id].delete is defined %}
-                                                                               {{ form_row(snippets[id].delete) }}
-                                                                       {% endif %}
-                                                               </div>
-
-                                                               {# render csrf token etc .#}
-                                                               <footer style="display:none">{{ form_rest(snippets[id]) }}</footer>
-                                                       {{ form_end(snippets[id]) }}
-                                               {% endif %}
-                                       </section>
-                               {% endfor %}
-                       </div>
-               </section>
-       {% endif %}
+       </article>
+       {{ include('@RapsysAir/default/_location.html.twig') }}

 {% endblock %}
 {% endblock %}