Browse Source

Correction mise en page

François 6 năm trước cách đây
mục cha
commit
7ecc20c829

+ 7 - 12
app/Resources/views/base.html.twig

@@ -80,18 +80,8 @@
 				<h1>{% block titre %}{% endblock %}</h1>
 			</header>
 			<main role="main">
-				<div>
-					{% for type, messages in app.session.flashBag.all %}
-						{% for message in messages %}
-							{% if type == 'error' %}{% set type = 'danger' %} {% endif %}
-							<div data-toggle="notify" data-message="{{ message }}" data-type="{{ type }}"></div>
-						{% endfor %}
-					{% endfor %}
-					{% block body %}{% endblock %}
-				</div>
-
+				{% block body %}{% endblock %}
 			</main>
-
 			<footer class="footer">
 				<div class="text-center fixed-bottom bg-white">
 					<span class="text-muted small">Cette application est développée en Symfony 3.4 - Code source disponible sur <a target="_blank" href="https://gogs.fdlibre.eu/sangfroid/films">Gogs</a><br>Licence <a target="_blank" href="http://www.wtfpl.net">WTFLP</a></span>
@@ -99,8 +89,13 @@
                 {% block footer %}
                 {% endblock %}
 			</footer>
-
 		</div>
+        {% for type, messages in app.session.flashBag.all %}
+            {% for message in messages %}
+                {% if type == 'error' %}{% set type = 'danger' %} {% endif %}
+				<div data-toggle="notify" data-message="{{ message }}" data-type="{{ type }}"></div>
+            {% endfor %}
+        {% endfor %}
 		<script src="{{ asset('build/app.js') }}"></script>
 		{% block javascripts %}{% endblock %}
     </body>

+ 15 - 18
src/AppBundle/Resources/views/videotheque/voirfilm.html.twig

@@ -1,26 +1,23 @@
 {% extends "@App/videotheque/base.html.twig" %}
 
 {% block title %}Fiche film{% endblock %}
-{% block titre %}{% endblock %}
+{% block titre %}
+    {%  if film.usersWantToView.contains(app.user) %}
+        <a href="#" class="boutonVoir" data-content="{{ film.id }}"><i class="fa fa-star"></i></a>
+    {%  else %}
+        <a href="#" class="boutonVoir" data-content="{{ film.id }}"><i class="fa fa-star-o"></i></a>
+    {%  endif %}
+    {{ film.titre }}
+    {% if film.usersWhoSeen.contains(app.user) %}
+        <a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-secondary">Pas vu</i><i class="badge badge-success">Vu</i></a>
+        {#<a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-success">Vu</i></a>#}
+    {%  else %}
+        <a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-danger">Pas vu</i><i class="badge badge-secondary">Vu</i></a>
+        {#<a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-secondary">Pas vu</i></a>#}
+    {%  endif %}
+{% endblock %}
 
 {%  block body %}
-    <div class="row">
-        <h1>
-            {%  if film.usersWantToView.contains(app.user) %}
-                <a href="#" class="boutonVoir" data-content="{{ film.id }}"><i class="fa fa-star"></i></a>
-            {%  else %}
-                <a href="#" class="boutonVoir" data-content="{{ film.id }}"><i class="fa fa-star-o"></i></a>
-            {%  endif %}
-            {{ film.titre }}
-            {% if film.usersWhoSeen.contains(app.user) %}
-                <a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-secondary">Pas vu</i><i class="badge badge-success">Vu</i></a>
-                {#<a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-success">Vu</i></a>#}
-            {%  else %}
-                <a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-danger">Pas vu</i><i class="badge badge-secondary">Vu</i></a>
-                {#<a href="#" class="boutonVu" data-content="{{ film.id }}"><i class="badge badge-secondary">Pas vu</i></a>#}
-            {%  endif %}
-        </h1>
-    </div>
     <div class="row">
         <div class="col-8">
             <div class="row">