From 90b02b8374ce159d87bb3bc81f68eb762f180898 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 3 Mar 2016 10:01:30 +0100
Subject: [PATCH] place title in title block (closes #43)

---
 README.rst                                         |  7 ++++---
 app/festival/templates/festival/artist_detail.html | 10 ++++------
 app/festival/templates/festival/artist_list.html   |  4 +---
 app/festival/templates/festival/video_detail.html  | 10 ++++------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/README.rst b/README.rst
index a95c82cc..6a8fe2bd 100644
--- a/README.rst
+++ b/README.rst
@@ -16,7 +16,7 @@ On MacOSX or Windows install the `Docker Toolbox <https://www.docker.com/product
 
 Then run these commands::
 
-    git clone git://git.forge.ircam.fr/Manifeste.git
+    git clone git://git@git.forge.ircam.fr/Manifeste.git
     cd Manifeste
     docker-compose up db
 
@@ -64,5 +64,6 @@ $ gulp [task]
 Paths
 ============
 
-- `app/festival/templates` : Personnal templates
-- `app/festival/static/festival` : Static files
\ No newline at end of file
+- `app/templates` : Main templates
+- `app/festival/templates` : Personal templates
+- `app/festival/static` : Static files
diff --git a/app/festival/templates/festival/artist_detail.html b/app/festival/templates/festival/artist_detail.html
index 34f1268a..5f5ec29d 100644
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@ -2,12 +2,11 @@
 {% load i18n %}
 {% load mezzanine_tags keyword_tags %}
 
-{% block main %}
-
-<div class="artist-name">
- <h2>{{ artist.name }}</h2>
-</div>
+{% block title %}
+{{ artist.name }}
+{% endblock %}
 
+{% block main %}
 <div class="artist-bio">
  <p>
   {% if artist.photo %}
@@ -27,5 +26,4 @@
     {% endfor %}
     <a href="#" class="artist__event__cta">Réserver</a>
 </div>
-
 {% endblock %}
diff --git a/app/festival/templates/festival/artist_list.html b/app/festival/templates/festival/artist_list.html
index 82fa089c..d8582e2b 100644
--- a/app/festival/templates/festival/artist_list.html
+++ b/app/festival/templates/festival/artist_list.html
@@ -2,12 +2,11 @@
 {% load i18n %}
 {% load mezzanine_tags keyword_tags %}
 
-{% block main %}
-
 {% block title %}
  {% trans "Artists" %}
 {% endblock %}
 
+{% block main %}
 <div class="artist__list">
     <div class="artist__sizer"></div>
      {% for artist in object_list %}
@@ -23,5 +22,4 @@
         </div>
      {% endfor %}
 </div>
-
 {% endblock %}
diff --git a/app/festival/templates/festival/video_detail.html b/app/festival/templates/festival/video_detail.html
index e237ba7f..5a2cde49 100644
--- a/app/festival/templates/festival/video_detail.html
+++ b/app/festival/templates/festival/video_detail.html
@@ -2,12 +2,11 @@
 {% load i18n %}
 {% load mezzanine_tags keyword_tags %}
 
-{% block main %}
-
-<div class="video-title">
- <h1>{{ video.title }}</h1>
-</div>
+{% block title %}
+{{ video.title }}
+{% endblock %}
 
+{% block main %}
 <div class="video-description">
  {{ video.description }}
 </div>
@@ -20,5 +19,4 @@
   <h2>{% trans 'Related event' %}</h2>
     {{ video.event.title }}
 </div>
-
 {% endblock %}
-- 
2.39.5