Update README, cleanup, add tags

diff --git a/README.rst b/README.rst
index 217934d4f541df2ed7603fb6b9dbfe8cbf8cdb5e..87c51dfcd6b6ac92be76aa56764ece7ea6f33f9a 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -37,6 +37,7 @@ MacOS or Windows:
 Run these commands in a terminal::
 
     docker-machine create --driver virtualbox --virtualbox-memory 8096 manifeste
+    docker-machine manifeste start
     eval "$(docker-machine env manifeste)"
     docker-machine ip manifeste
     git clone --recursive git://git.forge.ircam.fr/Manifeste.git
@@ -47,8 +48,8 @@ Then, in another terminal::
 
     eval "$(docker-machine env manifeste)"
     cd Manifeste
-    docker-compose run db /srv/backup/restore_db.sh
-    docker-compose run pgdb /srv/backup/restore_db_eve.sh
+    docker-compose run db /srv/backup/restore_db.sh #(MAJ base festival)
+    docker-compose run pgdb /srv/backup/restore_db_eve.sh #(MAJ base eve)
 
 
 `More info <https://docs.docker.com/>`_ about using docker and related tools.

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

diff --git a/app/templates/base.html b/app/templates/base.html
index aa584fcf62bcc8e96ed3652e9987a997e3d1a854..9d3d705bbbc885b8a5ae283dffa2a0d0f82ae42a 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -22,15 +22,12 @@
 {% if LANGUAGE_BIDI %}
 <link rel="stylesheet" href="{% static "css/bootstrap-rtl.css" %}">
 {% endif %}
-{% ifinstalled cartridge.shop %}
-<link rel="stylesheet" href="{% static "css/cartridge.css" %}">
-{% if LANGUAGE_BIDI %}
-<link rel="stylesheet" href="{% static "css/cartridge.rtl.css" %}">
-{% endif %}
-{% endifinstalled %}
-{% block extra_css %}{% endblock %}
+{% block extra_css %}
+<link rel="stylesheet" href="{% static "festival/css/festival.css" %}">
+{% endblock %}
 {% endcompress %}
 
+
 {% compress js %}
 <script src="{% static "mezzanine/js/"|add:settings.JQUERY_FILENAME %}"></script>
 <script src="{% static "js/bootstrap.js" %}"></script>
@@ -38,6 +35,7 @@
 {% block extra_js %}{% endblock %}
 {% endcompress %}
 
+
 <!--[if lt IE 9]>
 <script src="{% static "js/html5shiv.js" %}"></script>
 <script src="{% static "js/respond.min.js" %}"></script>

diff --git a/app/templates/includes/footer_scripts.html b/app/templates/includes/footer_scripts.html
index 00456e8f2ced38bcfb3646684176dd8ed14031d2..01e649d1aff022bb307a0aebcd2a3b722c3e894f 100644 (file)
--- a/app/templates/includes/footer_scripts.html
+++ b/app/templates/includes/footer_scripts.html
@@ -1,4 +1,4 @@
-{% load mezzanine_tags %}
+{% load mezzanine_tags i18n staticfiles %}
 
 {% editable_loader %}