Changeset c501d80


Ignore:
Timestamp:
04/18/12 12:52:07 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
social
Children:
0edb535
Parents:
b786c83 (diff), af2a6ed (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@…> (04/18/12 12:52:07)
git-committer:
yomguy <yomguy@…> (04/18/12 12:52:07)
Message:

Merge branch 'master' into social

Files:
15 added
16 edited

Legend:

Unmodified
Added
Removed
  • CHANGELOG

    r251b6d8 r0d62fe4  
     1telemeta (1.4.3-1) unstable; urgency=low 
     2 
     3 * add solr-thumbnail for automatic thumbnail handling of all related media images (please install) 
     4 * add static media handling for solr and all various telemeta public files 
     5 * fix some wrong user properties 
     6 * SECURITY: you need to move your TELEMETA_EXPORT_CACHE_DIR from TELEMETA_CACHE_DIR cache (see example/sandbox_sqlite/settings.py) 
     7 * EXPERIMENTAL: WebM and MP4 video handling for items, NO transcode but decode, add a nice video.js player 
     8 * RECOMMEND: install django-extensions 
     9 
     10telemeta (1.4.2-1) unstable; urgency=low 
     11 
     12 * add user revisions to user profile 
     13 * move all edit buttons to main edit pages 
     14 * new Format object and various enumerations 
     15 * add last revision to item detail 
     16 * various bugfixes 
     17 
     18telemeta (1.4.1-1) unstable; urgency=low 
     19 
     20 * Fix a bug for related media title parsing 
     21 
    122telemeta (1.4-1) unstable; urgency=low 
    223 
    324For users: 
    4      
     25 
    526 * add a Desk providing links to home and personal data 
    627 * add Fonds, Corpus and their related media to the models and to the search engine 
  • README.rst

    rdd763818 r0d62fe4  
    4646====== 
    4747 
     481.4.3 
     49++++++ 
     50 
     51 * add solr-thumbnail for automatic thumbnail handling of all related media images (please install) 
     52 * add static media handling for solr and all various telemeta public files 
     53 * fix some wrong user properties 
     54 * SECURITY: you need to move your TELEMETA_EXPORT_CACHE_DIR from TELEMETA_CACHE_DIR cache (see example/sandbox_sqlite/settings.py) 
     55 * EXPERIMENTAL: WebM and MP4 video handling for items, NO transcode but decode, add a nice video.js player 
     56 * RECOMMEND: install django-extensions 
     57 
    48581.4.2 
    4959++++++ 
     
    8999See INSTALL.rst and email me if any pb! (you may, for example, not use 0002 migration) 
    90100 
    91 Full changelog : see `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_ 
     101Full changelog: see `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_ 
    92102 
    93103 
    94 Development 
    95 =========== 
     104Demo 
     105==== 
    96106 
    97 To participate to the development of telemeta, you will need a login/password couple. 
    98 You're welcome to email us to join and commit your great ideas ;) 
     107http://demo.telemeta.org 
    99108 
    100 To get the lastest development version, you need subversion and run:: 
     109login: demo 
     110password: demo 
    101111 
    102     $ git clone http://vcs.parisson.com/git/telemeta.git 
    103112 
    104 License 
    105 ======= 
     113Original Example 
     114================= 
    106115 
    107 CeCILL v2 (see LICENSE) 
     116`Sound archives <http://archives.crem-cnrs.fr>`_ of the French Ethnomusicology Research Center (CREM) et du Musée de l'Homme: 
     117 
     118 * a 100 year old world database migrated, 
     119 * more than 5000 geolocated collections, 
     120 * more than 32000 geolocated items, 
     121 * 700 Go of original ethnological music files accessible through the web. 
    108122 
    109123 
     
    123137================ 
    124138 
    125 TimeSide (Web Audio Components): http://code.google.com/p/timeside/ 
     139`TimeSide <http://code.google.com/p/timeside/>`_ - Web Audio Components 
     140 
     141    a python library library to compute audio analysis, transcode, and streaming to browsers. 
     142 
    126143 
    127144 
     
    143160 
    144161 
     162Development 
     163=========== 
     164 
     165You are welcome to participate to the development of the Telemeta project. 
     166 
     167To get the lastest development version, you need subversion and run:: 
     168 
     169    $ git clone http://vcs.parisson.com/git/telemeta.git 
     170 
     171License 
     172======= 
     173 
     174CeCILL v2, compatible with GPL v2 (see `LICENSE <http://github.com/yomguy/Telemeta/blob/master/LICENSE`_) 
     175 
     176 
    145177Sponsors 
    146178======== 
  • example/sandbox_sqlite/settings.py

    r74a669d rc501d80  
    6666# in apps' "static/" subdirectories and in STATICFILES_DIRS. 
    6767# Example: "/home/media/media.lawrence.com/static/" 
    68 STATIC_ROOT = '/data/telemeta/static/' 
     68STATIC_ROOT = '/home/dev/telemeta/static/' 
    6969 
    7070# URL prefix for static files. 
     
    140140    'django.core.context_processors.request', 
    141141    'django.contrib.auth.context_processors.auth', 
     142    "django.core.context_processors.i18n", 
     143    "django.core.context_processors.media", 
     144    'django.core.context_processors.static', 
    142145) 
    143146 
  • setup.py

    rb6c6871 r39e17d4  
    1515  version = telemeta.__version__, 
    1616  install_requires = [ 
    17         'django>=1.3.1', 
     17        'django>=1.4', 
    1818        'django-registration', 
    1919        'django-json-rpc', 
    2020        'timeside', 
    2121        'south', 
     22        'sorl-thumbnail', 
    2223        'django-pagination', 
    2324        'django-postman', 
    2425        'django-socialregistration', 
    25         'sorl-thumbnail', 
     26        'django-extensions', 
    2627  ], 
    2728  platforms=['OS Independent'], 
  • telemeta/htdocs/css/player.css

    r13ef1ae r0d62fe4  
    2020    width: 18px; 
    2121    padding: 10px 0 0 0; 
    22     height: 0px !important;  
     22    height: 0px !important; 
    2323    height /**/:10px; /* for IE5/Win only */ 
    2424    background-image: url('../images/maximize.png'); 
  • telemeta/htdocs/timeside/skins/lab/style.css

    rfe97d80 r0d62fe4  
    112112    width:24px; 
    113113} 
    114 .ts-player .ts-control .ts-volume-bar-container {  
     114.ts-player .ts-control .ts-volume-bar-container { 
    115115    background: url('img/controlbg-inverted.png'); 
    116116    background-position: -3px left; 
     
    122122    -webkit-border-radius: 5px; 
    123123    border-radius: 5px; 
    124      
     124 
    125125} 
    126126.ts-player .ts-control .ts-volume-bar { /*width will be changed inside the code*/ 
  • telemeta/models/media.py

    rfabced9 raf2a6ed  
    386386        return False 
    387387 
    388     def clean(self): 
    389         if self.code and not self.is_valid_code(self.code): 
    390             raise ValidationError("%s is not a valid item code for collection %s" 
    391                                         % (self.code, self.collection.code)) 
     388    #def clean(self): 
     389        #if self.code and not self.is_valid_code(self.code): 
     390            #raise ValidationError("%s is not a valid item code for collection %s" 
     391                                        #% (self.code, self.collection.code)) 
    392392 
    393393    def save(self, force_insert=False, force_update=False): 
  • telemeta/templates/telemeta/login.html

    r566f17d r0d62fe4  
    2020                onclick="document.getElementById('_loginForm').submit(); return false;">{% trans "Sign in" %}</a> 
    2121<input type="hidden" name="next" value="{{ next }}" /> 
    22 <span style="align: right;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span> 
     22<span style="align: right; font-weight: bold;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span> 
    2323</form> 
    2424{% endblock %} 
  • telemeta/templates/telemeta/mediaitem_detail.html

    r376c298 rffcaa31  
    7878 
    7979{% if "video" in mime_type %} 
    80 <link href="http://vjs.zencdn.net/c/video-js.css" rel="stylesheet"> 
    81 <script src="http://vjs.zencdn.net/c/video.js"></script> 
     80<script src="{% url telemeta-video-js "video.js" %}"></script> 
     81<link href="{% url telemeta-video-js "video-js.css" %}" rel="stylesheet"> 
    8282{% endif %} 
    8383 
     
    114114    {% if public_access or perms.telemeta.can_play_all_items %} 
    115115    <div id="player_maximized" class="ts-skin-lab"> 
     116       <div id="player_header"> 
    116117        <a href="#" class="toggle">Minimize</a> 
    117118        <a href="#" class="embed_player_frame">&lt;/&gt;</a> 
     119       </div> 
    118120        <div class="wazing"></div> 
    119121    </div> 
     
    133135        <source src="{% url telemeta-item-export item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" /> 
    134136        </video> 
    135         <div id="videotime"></div> 
     137        <!--<div id="videotime"></div>--> 
    136138    </div> 
    137139    <script> 
     
    200202            <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd> 
    201203            {% endif %} 
    202              
     204 
    203205        </dl> 
    204206        {% endblock general_info %} 
  • telemeta/urls.py

    r47b7698 rc676291  
    285285        {'document_root': htdocs+'/timeside'}, 
    286286        name="telemeta-timeside"), 
     287    url(r'^video-js/(?P<path>.*)$','django.views.static.serve', 
     288        {'document_root': htdocs+'/video-js'}, 
     289        name="telemeta-video-js"), 
    287290 
    288291    # Flat pages 
     
    302305 
    303306    # Users 
    304     url(r'^users/$', general_view.users, name="telemeta-users"), 
     307    url(r'^accounts/$', general_view.users, name="telemeta-users"), 
    305308 
    306309    # Desk 
     
    310313 
    311314    # Profiles 
    312     url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), 
    313     url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"), 
    314     url(r'^users/(?P<username>[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(),  name="telemeta-user-rss"), 
     315    url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), 
     316    url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"), 
     317    url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(),  name="telemeta-user-rss"), 
    315318 
    316319    # Registration 
  • telemeta/views/base.py

    r57833eb rb7b071c  
    257257        year_min, year_max = MediaCollection.objects.all().publishing_year_range() 
    258258        pub_years = year_min and year_max and range(year_min, year_max + 1) or [] 
     259        searches = Search.objects.filter(username=request.user) 
    259260        return render(request, 'telemeta/search_criteria.html', { 
    260261            'rec_years': rec_years, 
    261262            'pub_years': pub_years, 
    262263            'ethnic_groups': MediaItem.objects.all().ethnic_groups(), 
    263             'criteria': criteria 
     264            'criteria': criteria, 
     265            'searches': searches, 
    264266        }) 
    265267 
     
    423425        return HttpResponse("\n".join(data)) 
    424426 
     427    @method_decorator(login_required) 
    425428    def users(self, request): 
    426429        users = User.objects.all() 
     
    10381041    """Provide Admin web UI methods""" 
    10391042 
    1040     @method_decorator(permission_required('sites.change_site')) 
     1043    @method_decorator(permission_required('is_superuser')) 
    10411044    def admin_index(self, request): 
    10421045        return render(request, 'telemeta/admin.html', self.__get_admin_context_vars()) 
    10431046 
    1044     @method_decorator(permission_required('sites.change_site')) 
     1047    @method_decorator(permission_required('is_superuser')) 
    10451048    def admin_general(self, request): 
    10461049        return render(request, 'telemeta/admin_general.html', self.__get_admin_context_vars()) 
    10471050 
    1048     @method_decorator(permission_required('sites.change_site')) 
     1051    @method_decorator(permission_required('is_superuser')) 
    10491052    def admin_enumerations(self, request): 
    10501053        return render(request, 'telemeta/admin_enumerations.html', self.__get_admin_context_vars()) 
    10511054 
    1052     @method_decorator(permission_required('sites.change_site')) 
     1055    @method_decorator(permission_required('is_superuser')) 
    10531056    def admin_users(self, request): 
    10541057        users = User.objects.all() 
     
    13991402                                          'user_revisions': user_revisions}) 
    14001403 
     1404    @method_decorator(login_required) 
    14011405    def profile_edit(self, request, username, template='telemeta/profile_edit.html'): 
    14021406        if request.user.is_superuser: 
     
    14261430                user_form.save() 
    14271431                profile_form.save() 
    1428                 return HttpResponseRedirect('/users/'+username+'/profile/') 
     1432                return HttpResponseRedirect('/accounts/'+username+'/profile/') 
    14291433        else: 
    14301434            user_form = UserChangeForm(instance=user, prefix='user') 
  • telemeta/templates/telemeta/base.html

    r2c4c2e5b rb166a2e  
    6464<img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a> 
    6565{% else %} 
     66<div style="float: left;"> 
    6667<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
    67 <a href="{% url telemeta-login %}">{% trans "Sign in" %}</a> 
     68<a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a> 
     69</div> 
     70<div style="float: right;;"> 
     71{% load facebook %} 
     72{% facebook_button %} 
     73</div> 
    6874{% endif %} 
    6975</div> 
Note: See TracChangeset for help on using the changeset viewer.