fix thumbs height

diff --git a/telemeta/templates/telemeta/inc/collection_related.html b/telemeta/templates/telemeta/inc/collection_related.html
index 1f1f2d38a56909ea2c317efbf52aecd8f9fc812f..b0840cae77777abdaafea846567ed44c4aba8536 100644 (file)
--- a/telemeta/templates/telemeta/inc/collection_related.html
+++ b/telemeta/templates/telemeta/inc/collection_related.html
@@ -60,13 +60,13 @@
                                 {% if media.is_image %}
                                 {% if media.file %}
                                 <a href="{% url telemeta-collection-related collection.public_id media.id %}">
-                                {% thumbnail media.file "420" as im %}
+                                {% thumbnail media.file "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
                                 </a>
                                 {% else %}
                                 <a href="{{ media.url }}">
-                                {% thumbnail media.url "420" as im %}
+                                {% thumbnail media.url "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
                                 </a>

diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html
index e771f6d29f0e111fe56d70c2e5cae88a008df278..0ab107d7c84ee60a6f83997a2b9c856534bcb9e8 100644 (file)
--- a/telemeta/templates/telemeta/inc/mediaitem_related.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_related.html
@@ -60,13 +60,13 @@
                                 {% if media.is_image %}
                                 {% if media.file %}
                                 <a href="{% url telemeta-item-related item.public_id media.id %}">
-                                {% thumbnail media.file "420" as im %}
+                                {% thumbnail media.file "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
                                 </a>
                                 {% else %}
                                 <a href="{{ media.url }}">
-                                {% thumbnail media.url "420" as im %}
+                                {% thumbnail media.url "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
                                 </a>

diff --git a/telemeta/templates/telemeta/inc/resource_related.html b/telemeta/templates/telemeta/inc/resource_related.html
index 137d08e5f722e2f2d909eb6c9b07bbe5e7be74ba..cbc819ee81fc5294449612cca2caf9717e37e487 100644 (file)
--- a/telemeta/templates/telemeta/inc/resource_related.html
+++ b/telemeta/templates/telemeta/inc/resource_related.html
@@ -60,13 +60,13 @@
                                 {% if media.is_image %}
                                   {% if media.file %}
                                   <a href="{% url telemeta-resource-related type resource.code media.id %}">
-                                   {% thumbnail media.file "420" as im %}
+                                   {% thumbnail media.file "x200" as im %}
                                     <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                    {% endthumbnail %}
                                    </a>
                                   {% else %}
                                   <a href="{{ media.url }}">
-                                  {% thumbnail media.url "420" as im %}
+                                  {% thumbnail media.url "x200" as im %}
                                    <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                   {% endthumbnail %}
                                   </a>

diff --git a/tools/dev/push.sh b/tools/dev/push.sh
index 04011d76c4e77a36aba2fb369fb2010a8cda3bd5..1eaecc17887061a76d25c113be1df4eb45f701ef 100755 (executable)
--- a/tools/dev/push.sh
+++ b/tools/dev/push.sh
@@ -7,9 +7,6 @@ do
     echo "Push $branch to origin:"
     git push origin $branch
 
-    echo "Push $branch to web:"
-    git push web $branch
-
     if [[ $branch == *master* ]]; then
         echo "Push $branch to github:"
         git push github $branch
@@ -18,18 +15,16 @@ do
 done
 
 git push --tags
-git push --tags web
 git push --tags github
 
 ssh vcs.parisson.com "cd /var/git/telemeta.git; git update-server-info"
-ssh vcs.parisson.org "cd /var/git/telemeta.git; git update-server-info"
 
 #echo "Update jimi.parisson.com:"
-#ssh jimi.parisson.com "cd /home/telemeta/telemeta; git pull origin production"
 echo "Update angus.parisson.com:"
 ssh angus.parisson.com "cd /home/telemeta/telemeta-prod; git pull origin production; \
                         cd /home/telemeta/telemeta; git pull origin master; \
                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations;
-                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations; "
+                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations; 
+                        cd /home/telemeta/parisson/; ./manage.py migrate telemeta --delete-ghost-migrations; "
 
 echo "Done !"