# HG changeset patch # User veltr # Date 1339088014 -7200 # Node ID cd7c289e56257125ae3ec3782532f28d7c02537e # Parent 8cda6414d63ec51f64b40196427ed10d5d377cc3# Parent d733ad1f26540f81a020ad94e05e9f4a9354b7df Merge with d733ad1f26540f81a020ad94e05e9f4a9354b7df diff -r 8cda6414d63e -r cd7c289e5625 .hgignore --- a/.hgignore Thu Jun 07 18:52:25 2012 +0200 +++ b/.hgignore Thu Jun 07 18:53:34 2012 +0200 @@ -10,4 +10,6 @@ ^web/index/.*$ ^web/log/.*$ ^web/static/.*$ -^script/record_mic/record_mic/bin$ \ No newline at end of file +^script/record_mic/record_mic/bin$ +syntax: regexp +^web/\.htaccess$ \ No newline at end of file diff -r 8cda6414d63e -r cd7c289e5625 .pydevproject --- a/.pydevproject Thu Jun 07 18:52:25 2012 +0200 +++ b/.pydevproject Thu Jun 07 18:53:34 2012 +0200 @@ -2,6 +2,6 @@ -python_tralalere +Default python 2.7 diff -r 8cda6414d63e -r cd7c289e5625 script/record_mic/record_mic_example.html --- a/script/record_mic/record_mic_example.html Thu Jun 07 18:52:25 2012 +0200 +++ b/script/record_mic/record_mic_example.html Thu Jun 07 18:53:34 2012 +0200 @@ -6,7 +6,7 @@ {% endblock %} {% block main_content %} -{% thumbnail content.image "135x120" format="PNG" crop="center" as im %}

Musitag

@@ -13,7 +12,9 @@
+ {% thumbnail content.image "213x190" format="PNG" crop="center" as im %} + {% endthumbnail %}

{{content.title}}

{{content.description}}

@@ -29,15 +30,15 @@
-{% endthumbnail %} {% endblock %} {% block end_body %}