# HG changeset patch
# User cavaliet
# Date 1397731971 -7200
# Node ID 4f871f986f318474b0df9aa476bea123908eef33
# Parent  e11d50187832e902d3c42c51fdffc2d1498cdd0b
v0.5.1 spectacle becomes theatre

diff -r e11d50187832 -r 4f871f986f31 src/spel/__init__.py
--- a/src/spel/__init__.py	Wed Apr 16 17:22:46 2014 +0200
+++ b/src/spel/__init__.py	Thu Apr 17 12:52:51 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 5, 0, "final", 0)
+VERSION = (0, 5, 1, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r e11d50187832 -r 4f871f986f31 src/spel/templates/spel_base.html
--- a/src/spel/templates/spel_base.html	Wed Apr 16 17:22:46 2014 +0200
+++ b/src/spel/templates/spel_base.html	Thu Apr 17 12:52:51 2014 +0200
@@ -26,7 +26,7 @@
         </div>
         <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
-            {% url 'spel_spectacle' as url %}
+            {% url 'spel_theatre' as url %}
             <li{% if request.path == url %} class="active"{% endif %}><a href="{{ url }}">Théâtre</a></li>
             <li><a href="#">Opéra</a></li>
             {% url 'spel_corpus' as url %}
diff -r e11d50187832 -r 4f871f986f31 src/spel/templates/spel_home.html
--- a/src/spel/templates/spel_home.html	Wed Apr 16 17:22:46 2014 +0200
+++ b/src/spel/templates/spel_home.html	Thu Apr 17 12:52:51 2014 +0200
@@ -4,6 +4,6 @@
 {% block page_title %}Accueil{% endblock %}</title>
 
 {% block spel_content %}
-      <p><a href="{% url 'spel_spectacle' %}">Théâtre</a></p>
+      <p><a href="{% url 'spel_theatre' %}">Théâtre</a></p>
       <p><a href="#">Opéra</a></p>
 {% endblock %}
diff -r e11d50187832 -r 4f871f986f31 src/spel/templates/spel_spectacle.html
--- a/src/spel/templates/spel_spectacle.html	Wed Apr 16 17:22:46 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-{% extends "spel_base.html" %}
-{% load static %}
-
-{% block common_css %}
-  <link rel="stylesheet" href="{% static 'spel/lib/bootstrap/css/bootstrap.min.css' %}">
-  <link rel="stylesheet" href="{% static 'spel/lib/bootstrap-multiselect.css' %}">
-  <link rel="stylesheet" href="{% static 'spel/lib/datepicker3.css' %}">
-  <link rel="stylesheet" href="{% static 'spel/lib/theme.bootstrap.css' %}">
-  <link rel="stylesheet" href="{% static 'spel/css/spel.css' %}">
-{% endblock %}
-
-{% block page_title %}Spectacles{% endblock %}
-
-{% block spel_content %}
-      <h3>Page Spectacle</h3>
-      <div class="row">
-        <div class="col-md-6 chapters">
-          <h4 class="text-center">CHAPITRES</h4>
-          <div class="row">
-            <div class="col-md-4">Dates de répétition :</div>
-            <div class="col-md-7 input-daterange input-group">
-              <span class="input-group-addon">de</span>
-		      <input type="text" class="input-sm form-control" name="start_date" />
-		      <span class="input-group-addon">jusqu'à</span>
-		      <input type="text" class="input-sm form-control" name="end_date" />
-		    </div>
-		  </div>
-          <div class="row">
-            <div class="col-md-4">
-              <select id="mulsel1" class="multiselect" multiple="multiple" data-title="Types de chapitres">
-              </select>
-            </div>
-            <div class="col-md-4">
-              <select id="mulsel2" class="multiselect" multiple="multiple" data-title="Modalités scéniques" disabled="disabled">
-              </select>
-            </div>
-            <div class="col-md-4">
-              <select id="mulsel3" class="multiselect" multiple="multiple" data-title="Personnages" disabled="disabled">
-              </select>
-            </div>
-          </div>
-          <div class="row toggle-text"><span class="glyphicon glyphicon-play"></span> Voir les références de textes</div>
-          <div class="row theatre-text" style="display: none;">
-            <iframe src="{% url 'spel_ctb' %}" width="97%" height="150px"></iframe>
-            <span>Début : </span><select id="start-text"></select>
-            <span>Fin : </span><select id="end-text"></select>
-          </div>
-          <div class="row text-center">
-            <button id="btn-filter-chapters" class="btn btn-success" disabled="disabled">FILTRER</button>
-          </div>
-          <div class="chapter-results"></div>
-        </div>
-        <div class="col-md-6 annotations">
-          <h4 class="text-center">ANNOTATIONS</h4>
-          <form class="form-horizontal" role="form">
-            <div class="form-group">
-              <div class="col-md-8 col-md-offset-1">
-                <input type="text" class="form-control" id="search-input">
-              </div>
-              <div class="col-md-3">
-                <button id="btn-search-annotations" class="btn btn-success" disabled="disabled">
-                  <span class="glyphicon glyphicon-search form-control-feedback"></span>
-                </button>
-              </div>
-            </div>
-          </form>
-          <div class="row">
-	          <div class="col-md-8 col-md-offset-1">
-	            <select id="mulsel4" class="multiselect" multiple="multiple" data-title="Catégories d'annotations" disabled="disabled">
-	            </select>
-	          </div>
-	          <div class="col-md-3">
-	            <button id="btn-filter-annotations" class="btn btn-success">FILTRER</button>
-	          </div>
-	      </div>
-          <div class="annotation-results"></div>
-        </div>
-      </div>
-{% endblock %}
-{% block page_js %}
-  <script type="text/javascript" src="{% static 'spel/lib/jquery.min.js' %}"></script>
-  <script type="text/javascript" src="{% static 'spel/lib/jquery.tablesorter.min.js' %}"></script>
-  <script type="text/javascript" src="{% static 'spel/lib/jquery.tablesorter.widgets.min.js' %}"></script>
-  <script type="text/javascript" src="{% static 'spel/lib/bootstrap/js/bootstrap.min.js' %}"></script>
-  <script type="text/javascript" src="{% static 'spel/lib/bootstrap-multiselect.js' %}"></script>
-  <script type="text/javascript" src="{% static 'spel/lib/bootstrap-datepicker.js' %}"></script>
-  <script type="text/javascript" src="{% static 'spel/lib/locales/bootstrap-datepicker.fr.js' %}"></script>
-  <script type="text/javascript" src="{% static 'spel/js/spectacle.js' %}"></script>
-  <script type="text/javascript">
-  var urlMS = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=500&name__startswith=modalites_sceniques:";
-  var urlP = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=500&name__startswith=personnages:";
-  var urlTI = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=500&name__startswith=type_inter:&order_by=name";
-  var urlRT = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=1000&name__startswith=ref_text:";
-  var urlChapters = "{% url 'spel_chapters' %}";
-  var urlAnnotations = "{% url 'spel_annotations' %}";
-  var csrf_token = "{{csrf_token}}";
-  $('.input-daterange').datepicker({
-	    format: "yyyy-mm-dd",
-	    language: "fr",
-	    startDate: new Date({{ start_date|date:"Y" }}, {{ start_date|date:"n"|add:"-1" }}, {{ start_date|date:"j" }}),
-	    endDate: new Date({{ end_date|date:"Y" }}, {{ end_date|date:"n"|add:"-1" }}, {{ end_date|date:"j" }})
-  });
-  </script>
-{% endblock %}
diff -r e11d50187832 -r 4f871f986f31 src/spel/templates/spel_theatre.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/spel/templates/spel_theatre.html	Thu Apr 17 12:52:51 2014 +0200
@@ -0,0 +1,104 @@
+{% extends "spel_base.html" %}
+{% load static %}
+
+{% block common_css %}
+  <link rel="stylesheet" href="{% static 'spel/lib/bootstrap/css/bootstrap.min.css' %}">
+  <link rel="stylesheet" href="{% static 'spel/lib/bootstrap-multiselect.css' %}">
+  <link rel="stylesheet" href="{% static 'spel/lib/datepicker3.css' %}">
+  <link rel="stylesheet" href="{% static 'spel/lib/theme.bootstrap.css' %}">
+  <link rel="stylesheet" href="{% static 'spel/css/spel.css' %}">
+{% endblock %}
+
+{% block page_title %}Théâtre{% endblock %}
+
+{% block spel_content %}
+      <h3>Page Théâtre</h3>
+      <div class="row">
+        <div class="col-md-6 chapters">
+          <h4 class="text-center">CHAPITRES</h4>
+          <div class="row">
+            <div class="col-md-4">Dates de répétition :</div>
+            <div class="col-md-7 input-daterange input-group">
+              <span class="input-group-addon">de</span>
+		      <input type="text" class="input-sm form-control" name="start_date" />
+		      <span class="input-group-addon">jusqu'à</span>
+		      <input type="text" class="input-sm form-control" name="end_date" />
+		    </div>
+		  </div>
+          <div class="row">
+            <div class="col-md-4">
+              <select id="mulsel1" class="multiselect" multiple="multiple" data-title="Types de chapitres">
+              </select>
+            </div>
+            <div class="col-md-4">
+              <select id="mulsel2" class="multiselect" multiple="multiple" data-title="Modalités scéniques" disabled="disabled">
+              </select>
+            </div>
+            <div class="col-md-4">
+              <select id="mulsel3" class="multiselect" multiple="multiple" data-title="Personnages" disabled="disabled">
+              </select>
+            </div>
+          </div>
+          <div class="row toggle-text"><span class="glyphicon glyphicon-play"></span> Voir les références de textes</div>
+          <div class="row theatre-text" style="display: none;">
+            <iframe src="{% url 'spel_ctb' %}" width="97%" height="150px"></iframe>
+            <span>Début : </span><select id="start-text"></select>
+            <span>Fin : </span><select id="end-text"></select>
+          </div>
+          <div class="row text-center">
+            <button id="btn-filter-chapters" class="btn btn-success" disabled="disabled">FILTRER</button>
+          </div>
+          <div class="chapter-results"></div>
+        </div>
+        <div class="col-md-6 annotations">
+          <h4 class="text-center">ANNOTATIONS</h4>
+          <form class="form-horizontal" role="form">
+            <div class="form-group">
+              <div class="col-md-8 col-md-offset-1">
+                <input type="text" class="form-control" id="search-input">
+              </div>
+              <div class="col-md-3">
+                <button id="btn-search-annotations" class="btn btn-success" disabled="disabled">
+                  <span class="glyphicon glyphicon-search form-control-feedback"></span>
+                </button>
+              </div>
+            </div>
+          </form>
+          <div class="row">
+	          <div class="col-md-8 col-md-offset-1">
+	            <select id="mulsel4" class="multiselect" multiple="multiple" data-title="Catégories d'annotations" disabled="disabled">
+	            </select>
+	          </div>
+	          <div class="col-md-3">
+	            <button id="btn-filter-annotations" class="btn btn-success">FILTRER</button>
+	          </div>
+	      </div>
+          <div class="annotation-results"></div>
+        </div>
+      </div>
+{% endblock %}
+{% block page_js %}
+  <script type="text/javascript" src="{% static 'spel/lib/jquery.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'spel/lib/jquery.tablesorter.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'spel/lib/jquery.tablesorter.widgets.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'spel/lib/bootstrap/js/bootstrap.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'spel/lib/bootstrap-multiselect.js' %}"></script>
+  <script type="text/javascript" src="{% static 'spel/lib/bootstrap-datepicker.js' %}"></script>
+  <script type="text/javascript" src="{% static 'spel/lib/locales/bootstrap-datepicker.fr.js' %}"></script>
+  <script type="text/javascript" src="{% static 'spel/js/spectacle.js' %}"></script>
+  <script type="text/javascript">
+  var urlMS = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=500&name__startswith=modalites_sceniques:";
+  var urlP = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=500&name__startswith=personnages:";
+  var urlTI = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=500&name__startswith=type_inter:&order_by=name";
+  var urlRT = "{% url 'api_dispatch_list' resource_name='tags' api_name='1.0' %}?format=json&limit=1000&name__startswith=ref_text:";
+  var urlChapters = "{% url 'spel_chapters' %}";
+  var urlAnnotations = "{% url 'spel_annotations' %}";
+  var csrf_token = "{{csrf_token}}";
+  $('.input-daterange').datepicker({
+	    format: "yyyy-mm-dd",
+	    language: "fr",
+	    startDate: new Date({{ start_date|date:"Y" }}, {{ start_date|date:"n"|add:"-1" }}, {{ start_date|date:"j" }}),
+	    endDate: new Date({{ end_date|date:"Y" }}, {{ end_date|date:"n"|add:"-1" }}, {{ end_date|date:"j" }})
+  });
+  </script>
+{% endblock %}
diff -r e11d50187832 -r 4f871f986f31 src/spel/urls.py
--- a/src/spel/urls.py	Wed Apr 16 17:22:46 2014 +0200
+++ b/src/spel/urls.py	Thu Apr 17 12:52:51 2014 +0200
@@ -6,7 +6,7 @@
 from django.views.generic import RedirectView, TemplateView
 from ldt.auth.views import login as pf_login
 from ldt.text import VERSION_STR
-from .views import AnnotationRequest, ChapterRequest, Spectacle
+from .views import AnnotationRequest, ChapterRequest, Theatre
 
 #from django.conf import settings
 
@@ -44,7 +44,7 @@
     
     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
     url(r'^$', TemplateView.as_view(template_name="spel_home.html"), name='spel_home'),
-    url(r'^spectacle$', Spectacle.as_view(), name='spel_spectacle'),
+    url(r'^theatre$', Theatre.as_view(), name='spel_theatre'),
     url(r'^chapters$', ChapterRequest.as_view(), name='spel_chapters'),
     url(r'^annotations', AnnotationRequest.as_view(), name='spel_annotations'),
     url(r'^ctb', TemplateView.as_view(template_name="ctb.html"), name='spel_ctb'),
diff -r e11d50187832 -r 4f871f986f31 src/spel/views.py
--- a/src/spel/views.py	Wed Apr 16 17:22:46 2014 +0200
+++ b/src/spel/views.py	Thu Apr 17 12:52:51 2014 +0200
@@ -33,8 +33,8 @@
 
 
 
-class Spectacle(TemplateView):
-    template_name = "spel_spectacle.html"
+class Theatre(TemplateView):
+    template_name = "spel_theatre.html"
     def get(self, request):
         # Get start and end for date bounds (earliest is available only on django 1.6)
         start_date = Content.objects.all().order_by("content_creation_date")[0].content_creation_date
diff -r e11d50187832 -r 4f871f986f31 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Wed Apr 16 17:22:46 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Apr 17 12:52:51 2014 +0200
@@ -48,7 +48,7 @@
     'DEFUSEDXML' : {'setup':'defusedxml', 'url':'https://pypi.python.org/packages/source/d/defusedxml/defusedxml-0.4.1.tar.gz', 'local': 'defusedxml-0.4.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-TASTYPIE' : {'setup':'django-tastypie', 'url':'https://github.com/toastdriven/django-tastypie/archive/v0.9.15.tar.gz', 'local': 'django-tastypie-0.9.15.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-CHUNCKED-UPLOADS' : {'setup': 'django-chuncked-uploads', 'url':'https://github.com/IRI-Research/django-chunked-uploads/archive/v0.5.tar.gz', 'local':'django-chunked-uploads-0.5.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-    'LDT' : {'setup': 'ldt', 'url':'http://www.iri.centrepompidou.fr/dev/hg/platform/archive/1494fc70a5a2.tar.gz', 'local':'ldt-1.53.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+    'LDT' : {'setup': 'ldt', 'url':'http://www.iri.centrepompidou.fr/dev/hg/spel/raw-file/e11d50187832/virtualenv/res/src/ldt-1.53.1.tar.gz', 'local':'ldt-1.53.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 }
 
 if system_str == 'Windows':
diff -r e11d50187832 -r 4f871f986f31 virtualenv/res/src/django-tagging-0.3.1-IRI.tar.gz
Binary file virtualenv/res/src/django-tagging-0.3.1-IRI.tar.gz has changed