place title in title block (closes #43)

diff --git a/README.rst b/README.rst
index a95c82ccdff230d0ca340215706d5301d9db08f5..6a8fe2bd6b97c07b41c689847cf94dc64b5dcd43 100644 (file)
--- 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 34f1268ac02af52c2c8c039ea534f94773f9d439..5f5ec29da72c3c2cd354b846d933f2ab7040724e 100644 (file)
--- 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 82fa089cc25381899e4ab53c07a34dc7a572af74..d8582e2b6952773e404b289743ec01d0f0e4562f 100644 (file)
--- 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 e237ba7fe27ca8d1281ad068c96e4f64ad2b1bfe..5a2cde49c74033892abd17c88db0fd9532e9778c 100644 (file)
--- 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 %}