Changeset 3cbd809


Ignore:
Timestamp:
May 19, 2012 8:47:07 AM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, search, server, storage, telecaster
Children:
bc866e5
Parents:
f38d30a (diff), d7d1e42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (19/05/2012 08:47:07)
git-committer:
yomguy <yomguy@…> (19/05/2012 08:47:07)
Message:

Merge branch 'master' of github.com:yomguy/Telemeta into develop

Files:
4 added
8 edited

Legend:

Unmodified
Added
Removed
  • INSTALL.rst

    r49a9b01 r1cd4f7e  
    1  
    21Don't worry, Telemeta is easy to setup as any other Django app ! 
    32 
     
    119118 
    120119    cd example/sandbox_sqlite 
    121     ./manage.py syncdb 
     120    ./manage.py syncdb --migrate 
    122121    ./manage.py runserver 9000 
    123122 
  • example/sandbox_mysql/settings.py

    rbf8dc4f rf38d30a  
    33 
    44import os.path 
     5from django.core.urlresolvers import reverse_lazy 
    56 
    67DEBUG = True 
     
    5960MEDIA_URL = '/media/' 
    6061 
    61 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a 
    62 # trailing slash. 
    63 # Examples: "http://foo.com/media/", "/media/". 
    64 ADMIN_MEDIA_PREFIX = 'http://localhost/django/media/' 
     62# Absolute path to the directory static files should be collected to. 
     63# Don't put anything in this directory yourself; store your static files 
     64# in apps' "static/" subdirectories and in STATICFILES_DIRS. 
     65# Example: "/home/media/media.lawrence.com/static/" 
     66STATIC_ROOT = '/home/dev/telemeta/static/' 
     67 
     68# URL prefix for static files. 
     69# Example: "http://media.lawrence.com/static/" 
     70STATIC_URL = '/static/' 
     71 
     72# Additional locations of static files 
     73STATICFILES_DIRS = ( 
     74# Put strings here, like "/home/html/static" or "C:/www/django/static". 
     75# Always use forward slashes, even on Windows. 
     76# Don't forget to use absolute paths, not relative paths. 
     77) 
     78 
     79# List of finder classes that know how to find static files in 
     80# various locations. 
     81STATICFILES_FINDERS = ( 
     82'django.contrib.staticfiles.finders.FileSystemFinder', 
     83'django.contrib.staticfiles.finders.AppDirectoriesFinder', 
     84#    'django.contrib.staticfiles.finders.DefaultStorageFinder', 
     85) 
    6586 
    6687# Make this unique, and don't share it with anybody. 
     
    84105) 
    85106 
    86 ROOT_URLCONF = 'sandbox.urls' 
     107ROOT_URLCONF = 'sandbox_mysql.urls' 
    87108 
    88109TEMPLATE_DIRS = ( 
     
    100121    'django.contrib.messages', 
    101122    'django.contrib.admin', 
     123    'django.contrib.staticfiles', 
    102124    'telemeta', 
    103125    'jsonrpc', 
     
    109131    'django.core.context_processors.request', 
    110132    'django.contrib.auth.context_processors.auth', 
     133    "django.core.context_processors.i18n", 
     134    "django.core.context_processors.media", 
     135    'django.core.context_processors.static', 
    111136) 
    112137 
     
    116141TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA' 
    117142TELEMETA_CACHE_DIR = MEDIA_ROOT + 'cache' 
    118 TELEMETA_EXPORT_CACHE_DIR = TELEMETA_CACHE_DIR + "/export" 
     143TELEMETA_EXPORT_CACHE_DIR = MEDIA_ROOT + 'export' 
    119144TELEMETA_DATA_CACHE_DIR = TELEMETA_CACHE_DIR + "/data" 
    120145 
    121146TELEMETA_DOWNLOAD_ENABLED = True 
    122147TELEMETA_STREAMING_FORMATS = ('mp3', 'webm') 
    123 TELEMETA_STREAMING_FORMATS = ('wav', 'mp3', 'webm') 
     148TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') 
    124149TELEMETA_PUBLIC_ACCESS_PERIOD = 51 
     150TELEMETA_DEFAULT_WAVEFORM_SIZES = ['360x130', '640x130'] 
     151 
    125152AUTH_PROFILE_MODULE = 'telemeta.userprofile' 
    126153SESSION_EXPIRE_AT_BROWSER_CLOSE = False 
    127154 
     155LOGIN_URL = '/login/' 
     156LOGIN_REDIRECT_URL = reverse_lazy('telemeta-desk-lists') 
     157 
    128158EMAIL_HOST = 'smtp.free.fr' 
    129159DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
  • example/sandbox_sqlite/settings.py

    re12b60a8 rf38d30a  
    33 
    44import os 
     5from django.core.urlresolvers import reverse_lazy 
    56 
    67DEBUG = True 
     
    155156SESSION_EXPIRE_AT_BROWSER_CLOSE = False 
    156157 
     158LOGIN_URL = '/login/' 
     159LOGIN_REDIRECT_URL = reverse_lazy('telemeta-desk-lists') 
     160 
    157161EMAIL_HOST = 'localhost' 
    158162DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
    159  
  • telemeta/models/enum.py

    rc8cdfbe rad264be  
    207207        verbose_name = _("original format") 
    208208 
     209class OriginalLocation(Enumeration): 
     210    "Item original location" 
     211 
     212    class Meta(MetaEnumeration): 
     213        db_table = 'original_location' 
     214        verbose_name = _("original location") 
  • telemeta/models/format.py

    r57305a5 rf38d30a  
    4040from django.core.exceptions import ValidationError 
    4141from telemeta.models.core import * 
    42 from telemeta.models.enum import ContextKeyword 
    4342from telemeta.util.unaccent import unaccent_icmp 
    44 from telemeta.models.location import LocationRelation, Location 
    45 from telemeta.models.system import Revision 
     43from telemeta.models.location import * 
     44from telemeta.models.system import * 
    4645from telemeta.models.query import * 
    4746from telemeta.models.instrument import * 
     
    5554    """ Physical format object as proposed by the LAM""" 
    5655 
    57     original_format = WeakForeignKey(OriginalFormat, related_name="format", 
     56    item                  = ForeignKey('MediaItem', related_name="format", verbose_name = _("item")) 
     57    original_format       = WeakForeignKey(OriginalFormat, related_name="format", 
    5858                                     verbose_name = _("original format")) 
    59     original_code = CharField(_('original code'), required=True) 
    60     original_format_number = CharField(_('original format number')) 
    61     status = CharField(_('status')) 
    62     conservation_state = TextField(_('technical properties / conservation state')) 
    63     comments = TextField(_('comments / notes')) 
     59    original_code         = CharField(_('original code'), required=True) 
     60    original_number       = CharField(_('original number')) 
     61    original_status       = CharField(_('status')) 
     62    original_state        = TextField(_('technical properties / conservation state')) 
     63    original_comments     = TextField(_('comments / notes')) 
     64    original_location     = WeakForeignKey(OriginalLocation, related_name="format", 
     65                                        verbose_name = _("original location")) 
     66    original_channels     = IntegerField(_("number of channels")) 
     67    original_audio_quality = TextField(_('audio quality')) 
     68    recording_system      = CharField(_('recording system')) 
    6469 
    6570    # Tapes 
    66     wheel_diameter = WeakForeignKey(WheelDiameter, related_name="format", 
    67                                     verbose_name = _("tape wheel diameter")) 
    68     tape_width  = WeakForeignKey(TapeWidth, related_name="format", 
    69                                  verbose_name = _("tape width (inch)")) 
    70     tape_thickness = CharField(_('tape thickness (um)')) 
    71     tape_diameter = CharField(_('tape diameter (mm)')) 
    72     tape_speed = WeakForeignKey(TapeSpeed, related_name="format", verbose_name = _("tape speed (m/s)")) 
    73     tape_vendor = WeakForeignKey(TapeVendor, related_name="format", verbose_name = _("tape vendor")) 
    74     tape_reference = CharField(_('tape reference')) 
    75     sticker_presence = BooleanField(_('sticker presence')) 
    76     recording_system = CharField(_('recording system')) 
    77     channels = IntegerField(_("number of channels")) 
    78     audio_quality = TextField(_('audio quality')) 
     71    tape_wheel_diameter = WeakForeignKey(WheelDiameter, related_name="format", 
     72                                        verbose_name = _("tape wheel diameter (cm)")) 
     73    tape_thickness      = CharField(_('tape thickness (um)')) 
     74    tape_speed          = WeakForeignKey(TapeSpeed, related_name="format", 
     75                                        verbose_name = _("tape speed (m/s)")) 
     76    tape_vendor         = WeakForeignKey(TapeVendor, related_name="format", 
     77                                        verbose_name = _("tape vendor")) 
     78    tape_reference      = CharField(_('tape reference')) 
     79    sticker_presence    = BooleanField(_('sticker presence')) 
     80 
    7981 
    8082    class Meta(MetaCore): 
  • telemeta/models/media.py

    r03ca023 rf38d30a  
    348348    track                 = CharField(_('item number')) 
    349349    creator_reference     = CharField(_('reference')) 
    350     original_format       = ForeignKey(Format, related_name="item", 
    351                                        verbose_name=_('original format'), blank=True, 
    352                                         null=True, on_delete=models.SET_NULL) 
    353350    external_references   = TextField(_('published references')) 
    354351    copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of')) 
    355     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") 
     352    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, 
     353                                      max_length=16, default="metadata") 
    356354    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") 
    357355 
     
    359357    approx_duration       = DurationField(_('approximative duration')) 
    360358 
    361     # All 
     359    # Manager 
    362360    objects               = MediaItemManager() 
    363361 
  • telemeta/templates/telemeta/profile_edit.html

    r566f17d r5d9d2cc  
    3131   onclick="document.getElementById('_editUserProfileForm').submit(); return false;">{% trans "Save" %}</a> 
    3232        </div> 
    33        </form>         
     33       </form> 
    3434      </div> 
    3535{% endblock %} 
  • tools/dev/push.sh

    rcd6363d rd68b189  
    2222#echo "Update jimi.parisson.com:" 
    2323echo "Update angus.parisson.com:" 
    24 ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \ 
    25                         cd /home/telemeta/telemeta-develop; git pull origin develop; \ 
     24ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \ 
     25                        cd /home/telemeta/telemeta-develop; git pull; \ 
    2626                        cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations; 
    2727                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;  
Note: See TracChangeset for help on using the changeset viewer.