deps: remove dynamic upgrade at start, pin TimeSide 0.9.5, fix logo

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 08f98a66700036e3b15cf1b3fdf23697e9cb7339..c699815a07a98271f3dce176bf2f7981f1f1b83f 100755 (executable)
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -22,7 +22,7 @@ gid='www-data'
 # pip install django-debug-toolbar==1.6
 # pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat
 # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta
-pip install -U youtube-dl librosa django-cacheops==4.2
+# pip install -U youtube-dl librosa django-cacheops==4.2
 
 # install plugins
 /srv/app/bin/setup_plugins.sh

diff --git a/app/bin/worker.sh b/app/bin/worker.sh
index 256dc2dae8b21bfa3ad33ee15fc578795ce1c4ee..fc4ba84175b3250875349dd8b33ee63cfe255b37 100755 (executable)
--- a/app/bin/worker.sh
+++ b/app/bin/worker.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+!/bin/bash
 
 # paths
 app='/srv/app'
@@ -12,7 +12,7 @@ wsgi=$app'/wsgi.py'
 # pip install django-debug-toolbar==1.6
 # pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat
 # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta
-pip install -U youtube-dl librosa
+# pip install -U youtube-dl librosa
 
 # install plugins
 /srv/app/bin/setup_plugins.sh

diff --git a/lib/TimeSide b/lib/TimeSide
index 1c58dfcf1b78401c7f67664157fede6692e71572..932b7fab9fc8daed4b3ccab30c72ef207c88ef9e 160000 (submodule)
--- a/lib/TimeSide
+++ b/lib/TimeSide
@@ -1 +1 @@
-Subproject commit 1c58dfcf1b78401c7f67664157fede6692e71572
+Subproject commit 932b7fab9fc8daed4b3ccab30c72ef207c88ef9e

diff --git a/telemeta/static/telemeta/css/telemeta.css b/telemeta/static/telemeta/css/telemeta.css
index 84fde9976477969d35f5c48d4eb5bcadb24087d1..c522877a6498ff12691b72779554de90d58da1ec 100644 (file)
--- a/telemeta/static/telemeta/css/telemeta.css
+++ b/telemeta/static/telemeta/css/telemeta.css
@@ -121,7 +121,7 @@ svg {
     padding: 0em;
 /*     background: url("../images/waves.png") 100% 0% no-repeat; */
 }
-
+    width: 100px;
 #content_header, #header{
     margin-bottom: .8em;
 }
@@ -1008,7 +1008,7 @@ a.image-link {
     -moz-border-radius: 0px 0px 0px 0px;
     -webkit-border-radius: 0px 0px 0px 0px;
     border-radius: 0px 0px 0px 0px;
-
+    width: 100px;
 }
 
 .map-thumbnail {

diff --git a/telemeta/templates/telemeta/home.html b/telemeta/templates/telemeta/home.html
index 0c01a3094f36e421a4b0194391c1ac949ac81be4..7f52c9f781873ca2bb15a893dd93d77132a0e6a9 100644 (file)
--- a/telemeta/templates/telemeta/home.html
+++ b/telemeta/templates/telemeta/home.html
@@ -42,6 +42,7 @@
     <a href="http://www.parisson.com" target="_blank"><img class="logo" src="{{ STATIC_URL }}telemeta/images/parisson_logo_125_72.png" alt="Parisson"></a>
     <a href="http://www.huma-num.fr" target="_blank"><img class="logo" src="{{ STATIC_URL }}telemeta/images/logohumanum.png" alt="Huma-Num"></a>
     <a href="http://www.europeanasounds.eu/" target="_blank"><img class="logo" src="{{ STATIC_URL }}telemeta/images/Europeana_sounds_landscape_2.jpg" alt="Europeana sounds"></a>
+    <br><br>
     <a href="http://www.univ-poitiers.fr/" target="_blank"><img class="logo" src="{{ STATIC_URL }}telemeta/images/logo-universite-poitiers.svg" alt="Université de Poitiers"></a>
     <a href="http://passes-present.eu/" target="_blank"><img class="logo" src="{{ STATIC_URL }}telemeta/images/logo_pp-1.jpg" alt="LABEX Les Passés dans le Présent"></a>
     <a href="http://www.iut.univ-paris8.fr/" target="_blank"><img class="logo" src="{{ STATIC_URL }}telemeta/images/logo-iut-montreuil-moyen.jpg" alt="IUT de Montreuil"></a>