--- 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
--- a/.pydevproject Thu Jun 07 18:52:25 2012 +0200
+++ b/.pydevproject Thu Jun 07 18:53:34 2012 +0200
@@ -2,6 +2,6 @@
<?eclipse-pydev version="1.0"?>
<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_tralalere</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</pydev_project>
--- 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 @@
<style type="text/css" media="screen">
html, body { height:100%; background-color: #AAAAAA;}
body { margin:0; padding:0; overflow:hidden; }
- #flashContent { width:220px; height:140px; }
+ #flashContent { width:220px; height:160px; }
</style>
<script type="text/javascript">
// External callback function
@@ -26,7 +26,7 @@
</head>
<body>
<div id="flashContent">
- <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="220" height="140" id="record_mic" align="middle">
+ <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="220" height="160" id="record_mic" align="middle">
<param name="movie" value="record_mic.swf" />
<param name="quality" value="high" />
<param name="bgcolor" value="#ffffff" />
@@ -41,7 +41,7 @@
<param name="allowFullScreen" value="true" />
<param name="flashvars" value="playVisible=true">
<embed src="record_mic.swf" quality="high" bgcolor="#ffffff"
- width="220" height="140" name="ExternalInterfaceExample" align="middle"
+ width="220" height="160" name="ExternalInterfaceExample" align="middle"
play="true" loop="false" quality="high" allowScriptAccess="always"
type="application/x-shockwave-flash" allowFullScreen="true" wmode="transparent"
flashvars="playVisible=true"
--- a/virtualenv/res/lib/lib_create_env.py Thu Jun 07 18:52:25 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py Thu Jun 07 18:53:34 2012 +0200
@@ -19,7 +19,7 @@
'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.8', 'local':"django-extensions-0.8.tar.gz"},
'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz"},
'DJANGO-TAGGING': { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':"django-tagging-0.3.1.tar.gz"},
- 'DJANGO-PISTON': { 'setup': 'django-piston', 'url':"https://bitbucket.org/jespern/django-piston/get/default.tar.gz", 'local':"django-piston.tar.gz"},
+ 'DJANGO-PISTON': { 'setup': 'django-piston', 'url':'django-piston-7c90898072ce-modifed.tar.gz', 'local':'django-piston-7c90898072ce-modifed.tar.gz'},
'OAUTH2': { 'setup': 'python-oauth2', 'url':"https://github.com/simplegeo/python-oauth2/tarball/hudson-python-oauth2-211", 'local':"oauth2-1.5.211.tar.gz"},
'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'http://code.google.com/p/httplib2/downloads/detail?name=httplib2-0.7.4.tar.gz&can=2&q=', 'local':"httplib2-0.7.4.tar.gz"},
'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'http://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', 'local':"django-oauth-plus.tar.gz"},
Binary file virtualenv/res/src/fabric-1.4.2.tar.gz has changed
Binary file web/tralalere/static/tralalere/swf/record_mic.swf has changed
--- a/web/tralalere/templates/home.html Thu Jun 07 18:52:25 2012 +0200
+++ b/web/tralalere/templates/home.html Thu Jun 07 18:53:34 2012 +0200
@@ -7,10 +7,9 @@
</div>
{% for content in contents %}
- {% thumbnail content.image "135x120" format="PNG" crop="center" as im %}
<div class="home-media">
<a href="#">
- <img class="home-media-image" src="{{im.url}}" width="{{ im.width }}" height="{{ im.height }}" />
+ {% thumbnail content.image "135x120" format="PNG" crop="center" as im %}<img class="home-media-image" src="{{im.url}}" width="{{ im.width }}" height="{{ im.height }}" />{% endthumbnail %}
</a>
<h3>
<a href="{% url player content.iri_id %}">{{content.title}}</a>
@@ -72,6 +71,5 @@
</li>
</ul>
</div>
- {% endthumbnail %}
{% endfor %}
{% endblock %}
--- a/web/tralalere/templates/player.html Thu Jun 07 18:52:25 2012 +0200
+++ b/web/tralalere/templates/player.html Thu Jun 07 18:53:34 2012 +0200
@@ -4,7 +4,6 @@
<script type="text/javascript" src="{{STATIC_URL}}tralalere/metadataplayer/LdtPlayer-core.js"></script>
{% endblock %}
{% block main_content %}
-{% thumbnail content.image "135x120" format="PNG" crop="center" as im %}
<div class="player-header">
<div class="player-topleft">
<h1>Musitag</h1>
@@ -13,7 +12,9 @@
</div>
</div>
<div class="player-album">
+ {% thumbnail content.image "213x190" format="PNG" crop="center" as im %}
<img src="{{im.url}}" />
+ {% endthumbnail %}
<h2>{{content.title}}</h2>
<h3>{{content.description}}</h3>
<div id="player-elements"></div>
@@ -29,15 +30,15 @@
<div id="player-andyou"></div>
<div id="player-annotator"></div>
</div>
-{% endthumbnail %}
{% endblock %}
{% block end_body %}
<script type="text/javascript">
IriSP.libFiles.defaultDir = "{{STATIC_URL}}tralalere/js";
- IriSP.widgetsDir = "metadataplayer";
+ IriSP.libFiles.locations.jwPlayerSWF = "{{STATIC_URL}}tralalere/swf/player.swf";
+ IriSP.widgetsDir = "{{STATIC_URL}}tralalere/metadataplayer";
var _metadata = {
- url: '{% url projectjson_id content.front_project.ldt_id %}',
+ url: '{% url ldt.ldt_utils.views.json.project_json_id content.front_project.ldt_id %}',
format: 'ldt'
};
var _config = {