Changeset f6bc1e0

Timestamp:

07/08/12 19:40:29 (11 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, lam, nlivemulti, storage

Children:

5a2b932

Parents:

19f0503

git-author:

yomguy <yomguy@…> (07/08/12 19:40:29)

git-committer:

yomguy <yomguy@…> (07/08/12 19:40:29)

Message:

fix unicodes, fix colors, cleanup, add new player view (contour, white bg), add old (awdio) cgi process

Files:

• telemeta/models/dublincore.py (modified) (1 diff)
• telemeta/models/media.py (modified) (2 diffs)
• telemeta/models/system.py (modified) (1 diff)
• telemeta/static/telemeta/css/more.png (modified) (previous)
• telemeta/static/telemeta/css/telemeta.css (modified) (1 diff)
• telemeta/templates/telemeta/mediaitem_detail.html (modified) (1 diff)
• telemeta/templates/telemeta/mediaitem_player_contour.html (added)
• telemeta/urls.py (modified) (1 diff)
• tools/dev/push.sh (modified) (1 diff)
• tools/scripts/process-waveform-cgi.py (added)

telemeta/models/dublincore.py

@@ -66 +66 @@
         result = []
         for element in self.elements:
-            result.append((element.name, unicode(element.value)))
+            if isinstance(element.value, str):
+                value = element.value.decode('utf8')
+            else:
+                value = element.value
+            result.append((element.name, unicode(value)))
         return result
 

telemeta/models/media.py

@@ -216 +216 @@
 
     # Technical data
-    code                  = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code])
+    code                  = CharField(_('code'), unique=True, required=True,
+                                      validators=[is_valid_collection_code])
     old_code              = CharField(_('old code'), unique=False, null=True, blank=True)
     approx_duration       = DurationField(_('approximative duration'))
@@ -382 +383 @@
         if self.code:
             return self.code
-        return self.id
+        return str(self.id)
 
     class Meta(MetaCore):

telemeta/models/system.py

@@ -85 +85 @@
     institution     = CharField(_('Institution'))
     department      = CharField(_('Department'))
-    attachment      = CharField(_('attachment'))
+    attachment      = CharField(_('Attachment'))
     function        = CharField(_('Function'))
     address         = TextField(_('Address'))

telemeta/static/telemeta/css/telemeta.css

@@ -727 +727 @@
     text-decoration: none;
     margin: 0;
-    background: #fff url(more.png) no-repeat left top;
+    background: #fff url(/static/telemeta/images/more.png) no-repeat left top;
     background-position: 0 -16px;
     padding-bottom: 2px;

telemeta/templates/telemeta/mediaitem_detail.html

@@ -43 +43 @@
 
         //initializing the visualizers to be passed to the player
+        {% block graphers %}
         var visualizers = {};
         {% for v in visualizers %}
             visualizers["{{v.name}}"] = "{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}";
         {% endfor %}
+        {% endblock graphers %}
+
         {% if user.is_superuser %}
              loadPlayer('{% url telemeta-item-analyze-xml item.public_id %}',

telemeta/urls.py

@@ -115 +115 @@
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/simple/$', item_view.item_detail,
         dict(template='telemeta/mediaitem_player_simple.html'), name="telemeta-item-player-simple"),
+    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/countour/$', item_view.item_detail,
+        dict(template='telemeta/mediaitem_player_contour.html'), name="telemeta-item-player-contour"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/performances/$', item_view.item_performances_edit,
         dict(template='telemeta/mediaitem_performances_edit.html'), name="telemeta-item-performances_edit"),

tools/dev/push.sh

@@ -22 +22 @@
 #echo "Update jimi.parisson.com:"
 echo "Update angus.parisson.com:"
-ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \
-                        cd /home/telemeta/telemeta-develop; git pull; \
-                        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/parisson/; ./manage.py migrate telemeta --delete-ghost-migrations; "
+ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \
+                        cd /home/telemeta/telemeta-develop; git pull origin dev; \
+                        cd /home/telemeta/demo/; ./manage.py migrate --delete-ghost-migrations;
+                        cd /home/telemeta/sandbox/; ./manage.py migrate --delete-ghost-migrations; 
+                        cd /home/telemeta/parisson/; ./manage.py migrate --delete-ghost-migrations; "
 
 echo "Done !"