Changeset f6bc1e0


Ignore:
Timestamp:
07/08/12 19:40:29 (22 months ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, sabiod, server, storage, telecaster
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:
2 added
8 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/dublincore.py

    r5c42a44 rf6bc1e0  
    6666        result = [] 
    6767        for element in self.elements: 
    68             result.append((element.name, unicode(element.value))) 
     68            if isinstance(element.value, str): 
     69                value = element.value.decode('utf8') 
     70            else: 
     71                value = element.value 
     72            result.append((element.name, unicode(value))) 
    6973        return result 
    7074 
  • telemeta/models/media.py

    r521a3e9 rf6bc1e0  
    216216 
    217217    # Technical data 
    218     code                  = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code]) 
     218    code                  = CharField(_('code'), unique=True, required=True, 
     219                                      validators=[is_valid_collection_code]) 
    219220    old_code              = CharField(_('old code'), unique=False, null=True, blank=True) 
    220221    approx_duration       = DurationField(_('approximative duration')) 
     
    382383        if self.code: 
    383384            return self.code 
    384         return self.id 
     385        return str(self.id) 
    385386 
    386387    class Meta(MetaCore): 
  • telemeta/models/system.py

    rfad4d14 rf6bc1e0  
    8585    institution     = CharField(_('Institution')) 
    8686    department      = CharField(_('Department')) 
    87     attachment      = CharField(_('attachment')) 
     87    attachment      = CharField(_('Attachment')) 
    8888    function        = CharField(_('Function')) 
    8989    address         = TextField(_('Address')) 
  • telemeta/static/telemeta/css/telemeta.css

    rf0c855e rf6bc1e0  
    727727    text-decoration: none; 
    728728    margin: 0; 
    729     background: #fff url(more.png) no-repeat left top; 
     729    background: #fff url(/static/telemeta/images/more.png) no-repeat left top; 
    730730    background-position: 0 -16px; 
    731731    padding-bottom: 2px; 
  • telemeta/templates/telemeta/mediaitem_detail.html

    ra7f10c1 rf6bc1e0  
    4343 
    4444        //initializing the visualizers to be passed to the player 
     45        {% block graphers %} 
    4546        var visualizers = {}; 
    4647        {% for v in visualizers %} 
    4748            visualizers["{{v.name}}"] = "{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}"; 
    4849        {% endfor %} 
     50        {% endblock graphers %} 
     51 
    4952        {% if user.is_superuser %} 
    5053             loadPlayer('{% url telemeta-item-analyze-xml item.public_id %}', 
  • telemeta/urls.py

    rc676291 rf6bc1e0  
    115115    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, 
    116116        dict(template='telemeta/mediaitem_player_simple.html'), name="telemeta-item-player-simple"), 
     117    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, 
     118        dict(template='telemeta/mediaitem_player_contour.html'), name="telemeta-item-player-contour"), 
    117119    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/performances/$', item_view.item_performances_edit, 
    118120        dict(template='telemeta/mediaitem_performances_edit.html'), name="telemeta-item-performances_edit"), 
  • tools/dev/push.sh

    rd7de29b rf6bc1e0  
    2222#echo "Update jimi.parisson.com:" 
    2323echo "Update angus.parisson.com:" 
    24 ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \ 
    25                         cd /home/telemeta/telemeta-develop; git pull; \ 
    26                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations; 
    27                         cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;  
    28                         cd /home/telemeta/parisson/; ./manage.py migrate telemeta --delete-ghost-migrations; " 
     24ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \ 
     25                        cd /home/telemeta/telemeta-develop; git pull origin dev; \ 
     26                        cd /home/telemeta/demo/; ./manage.py migrate --delete-ghost-migrations; 
     27                        cd /home/telemeta/sandbox/; ./manage.py migrate --delete-ghost-migrations;  
     28                        cd /home/telemeta/parisson/; ./manage.py migrate --delete-ghost-migrations; " 
    2929 
    3030echo "Done !" 
Note: See TracChangeset for help on using the changeset viewer.