fix slug, add css main and main-panel classes

diff --git a/app/festival/models.py b/app/festival/models.py
index ad419e43153c5556a03657c6260e3f3cab262352..dbe9ea66a555b575931d0153b36090d2f0fe97e8 100644 (file)
--- a/app/festival/models.py
+++ b/app/festival/models.py
@@ -82,10 +82,12 @@ class Artist(Displayable, RichText, AdminThumbMixin):
     def __unicode__(self):
         return self.title
 
+    @property
+    def name(self):
+        return self.title
+
     def get_absolute_url(self):
-        url_name = "festival_artist_detail"
-        kwargs = {"slug": self.slug}
-        return reverse(url_name, kwargs=kwargs)
+        return reverse("festival-artist-detail", kwargs={'slug': self.slug})
 
 
 class Video(Displayable, RichText):
@@ -103,13 +105,12 @@ class Video(Displayable, RichText):
 
     @property
     def html(self):
+        #TODO: get html content from medias.ircam.fr with request module
         pass
 
     @models.permalink
     def get_absolute_url(self):
-        url_name = "festival_video_detail"
-        kwargs = {"slug": self.slug}
-        return reverse(url_name, kwargs=kwargs)
+        return reverse("festival-video-detail", kwargs={"slug": self.slug})
 
 
 class EventCategory(BaseNameModel):

diff --git a/app/festival/static/festival/css/festival.css b/app/festival/static/festival/css/festival.css
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0e1179d9b6694bcc11c412a859ebe94e029ebd5c 100644 (file)
--- a/app/festival/static/festival/css/festival.css
+++ b/app/festival/static/festival/css/festival.css
@@ -0,0 +1,8 @@
+
+.main {
+    margin-top: 5em;
+}
+
+.main-panel {
+    margin-top: 5em;
+}

diff --git a/app/festival/templates/festival/artist_detail.html b/app/festival/templates/festival/artist_detail.html
index aabab7fbc37ab98d64a1d5e34b282e3f824cd185..bce6fa687fae3510e7b220a4e56a1f39ed6aecc3 100644 (file)
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@ -12,12 +12,11 @@
  {{ artist.bio|safe }}
 </div>
 
-
 <div class="artist-events">
     <h2>{% trans 'Events' %}</h2>
     {% for event in artist.events.all %}
         {{ event.title }}
+    {% endfor %}
 </div>
-{% endfor %}
 
 {% endblock %}

diff --git a/app/templates/base.html b/app/templates/base.html
index d0e489738767bbcfc8432ee907e60fb1f4436b86..b222d24f6dd18e3ddf27b2e6609d6705c369460d 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -95,11 +95,11 @@
 <div class="container">
 <div class="row">
 
-<div class="col-md-9 left">
+<div class="col-md-9 left main">
     {% block main %}{% endblock %}
 </div>
 
-<div class="col-md-3 right">
+<div class="col-md-3 right main-panel">
     {% nevercache %}
     {% include "includes/language_selector.html" %}
     {% include "includes/user_panel.html" %}