From: mathieu Date: Wed, 18 May 2016 10:36:29 +0000 (+0200) Subject: End lowercase + english X-Git-Tag: 1.6.2^2~15^2~1^2~6 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e9c3b91a7a01f3d6e6cab7ecc8a8ad6b9524a90d;p=telemeta.git End lowercase + english --- diff --git a/telemeta/forms/boolean_form.py b/telemeta/forms/boolean_form.py index fff4ef15..02e47b84 100644 --- a/telemeta/forms/boolean_form.py +++ b/telemeta/forms/boolean_form.py @@ -2,7 +2,7 @@ from django import forms class BooleanSearch(forms.Form): - def getBrackets(dir): + def get_brackets(dir): list = [] for i in range(4): brackets = "" @@ -15,8 +15,8 @@ class BooleanSearch(forms.Form): return list boolean = forms.ChoiceField(choices=[('ET', 'ET',), ('OU', 'OU',)], label='', required=False) - startBracket = forms.ChoiceField(label='',choices=getBrackets('left'), required=False) - textField = forms.CharField(label='', widget=forms.TextInput(attrs={'required':''})) - endBracket = forms.ChoiceField(label='', choices=getBrackets('right'), required=False) + start_bracket = forms.ChoiceField(label='', choices=get_brackets('left'), required=False) + text_field = forms.CharField(label='', widget=forms.TextInput(attrs={'required': ''})) + end_bracket = forms.ChoiceField(label='', choices=get_brackets('right'), required=False) diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html index df96a4a6..5d7ae3de 100644 --- a/telemeta/templates/search/advanceSearch.html +++ b/telemeta/templates/search/advanceSearch.html @@ -381,12 +381,12 @@ $(function() { function deleteField(e) { e.preventDefault(); - var nombre = $('input[name*="textField"]').length; - if(nombre==3){ + var number = $('input[name*="textField"]').length; + if(number==3){ $('#del').remove(); } - $('#bloc-'+(nombre-1)).remove(); - $('#id_form-TOTAL_FORMS').attr('value', nombre-1); + $('#bloc-'+(number-1)).remove(); + $('#id_form-TOTAL_FORMS').attr('value', number-1); } diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index 9da922de..4d149538 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -4,222 +4,241 @@ {% load bootstrap3 %} {% settings_value 'INSTALLED_APPS' as INSTALLED_APPS %} {% if 'googletools' in INSTALLED_APPS %} -{% load googletools %} + {% load googletools %} {% endif %} {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} {% get_current_language_bidi as LANGUAGE_BIDI %} - + - - - + + + -{% block analytics %} -{% if 'googletools' in INSTALLED_APPS %} -{% site_verification_code %} -{% analytics_code %} -{% endif %} -{% endblock analytics %} + {% block analytics %} + {% if 'googletools' in INSTALLED_APPS %} + {% site_verification_code %} + {% analytics_code %} + {% endif %} + {% endblock analytics %} - - + + -{%block head_title %}{% organization %} - {% description %}{% endblock %} + {% block head_title %}{% organization %} - {% description %}{% endblock %} -{% block stylesheets %} - - - + {% block stylesheets %} + + + - - -{% endblock %} + {% endblock %} -{% block extra_stylesheets %}{% endblock %} + {% block extra_stylesheets %}{% endblock %} -{% block javascript %} - - - - - + {% block javascript %} + + + + + -{% if user.is_authenticated %} - -{% else %} - -{% endif %} -{% endblock %} + {% if user.is_authenticated %} + + {% else %} + + {% endif %} + {% endblock %} -{% block extra_javascript %}{% endblock %} + {% block extra_javascript %}{% endblock %} {% block layout %} -
-{% block header %} - {% endblock layout %} diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 1684a29a..9d9c3bac 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -61,7 +61,7 @@ //playlists: {% if user.is_authenticated %} {% for playlist in playlists %} - {% if forloop.counter0 in rang_item_playliste %} + {% if forloop.counter0 in rang_item_playlist %} playlistUtils.addPlaylist('{{ playlist.playlist.title }}'+ gettrans('(playlisted)'),'{{playlist.playlist.public_id}}'); {% else %} playlistUtils.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}'); diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html index 46d44890..6a11ed0f 100644 --- a/telemeta/templates/telemeta/mediaitem_list.html +++ b/telemeta/templates/telemeta/mediaitem_list.html @@ -31,16 +31,22 @@
  • {% trans "Unpublished" %}
  • {% trans "Published" %}
  • {% trans "Digitized" context "item list" %}
    • diff --git a/telemeta/urls.py b/telemeta/urls.py index 3b01fc36..6e4205e0 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -131,7 +131,7 @@ urlpatterns = patterns('', url(r'^search/quick/(?P[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'), url(r'^search/advance/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search'), url(r'^search/advance/(?P[A-Za-z0-9._-]+)/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search_type'), - url(r'^search/booleaninstru/$', boolean_view.getBooleanQuery), + url(r'^search/booleaninstru/$', boolean_view.get_boolean_query), url(r'^search/playlist_add/(?P[A-Za-z0-9._-]+)/$', NewPlaylistView().display, name='haystack_playlist'), url(r'^search/playlist_confirmation/(?P[A-Za-z0-9._-]+)/$',NewPlaylistView().addToPlaylist, name='add_confirmation'), diff --git a/telemeta/util/search_signals.py b/telemeta/util/search_signals.py index c9654e02..6bf32793 100644 --- a/telemeta/util/search_signals.py +++ b/telemeta/util/search_signals.py @@ -4,7 +4,10 @@ from telemeta.models import * from telemeta.search_indexes import * from django.db.models import Q - +#Custom realtime signal in order to update the "autcomplete" index +#when add/remove instruments/locations in items. +#Differences of values of fields are checked by the tracker +#of django-dirtyfields' module class RealTimeCustomSignal(signals.RealtimeSignalProcessor): handleFields = ('location', 'instrument', 'alias') handleModels = (MediaItem, MediaItemPerformance, ) diff --git a/telemeta/views/item.py b/telemeta/views/item.py index 85c87344..ba0d1821 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -827,7 +827,7 @@ class ItemDetailView(ItemViewMixin, DetailView): context['format'] = item_format context['private_extra_types'] = private_extra_types.values() context['site'] = 'http://' + Site.objects.all()[0].name - context['rang_item_playliste']=rang + context['rang_item_playlist']=rang # if ts_item: # context['ts_item_id'] = ts_item.pk # else: diff --git a/telemeta/views/search.py b/telemeta/views/search.py index b1e553eb..3fd5f495 100644 --- a/telemeta/views/search.py +++ b/telemeta/views/search.py @@ -27,6 +27,8 @@ from django.http import HttpResponse from telemeta.forms.boolean_form import * from django.forms.formsets import formset_factory import re +import unicodedata + class HaystackSearch(FacetedSearchView, SavedSearchView): @@ -179,7 +181,7 @@ def autocomplete(request): suggestions = [] for chaine in collecteurs: for word in chaine.split('; '): - if word != "" and escapeAccentAndLower(request.GET.get('q', '')) in escapeAccentAndLower(word): + if word != "" and escape_accent_and_lower(request.GET.get('q', '')) in escape_accent_and_lower(word): suggestions.append(word) elif attribut == "location" or attribut == "instruments": sqs = SearchQuerySet().using('autocomplete') @@ -204,18 +206,14 @@ def autocomplete(request): }) return HttpResponse(the_data, content_type='application/json') - -import unicodedata - - -def escapeAccentAndLower(chaine): +def escape_accent_and_lower(chaine): return unicodedata.normalize('NFD', chaine).encode('ascii', 'ignore').lower() class BooleanSearchView(object): form = formset_factory(BooleanSearch) - def getBooleanQuery(self, request): + def get_boolean_query(self, request): if request.method != 'GET': return HttpResponse(json.dumps({'result': '[ERROR]:Not Request GET'}), content_type='application/json') @@ -226,9 +224,9 @@ class BooleanSearchView(object): formul = formset.forms[i] if i != 0: query += formul.cleaned_data["boolean"] + " " - query += formul.cleaned_data["startBracket"] - query += formul.cleaned_data["textField"].strip() + " " - query += formul.cleaned_data["endBracket"] + query += formul.cleaned_data["start_bracket"] + query += formul.cleaned_data["text_field"].strip() + " " + query += formul.cleaned_data["end_bracket"] try: self.is_correct_query(query.strip()) except Erreur as e: @@ -238,15 +236,15 @@ class BooleanSearchView(object): return HttpResponse(json.dumps({'result': '[ERROR]Field(s) missing'}), content_type='application/json') def is_correct_query(self, query): - tabQuery = query.split() - openBracket = 0 + tab_query = query.split() + open_bracket = 0 boolean = False - for mot in tabQuery: + for mot in tab_query: if mot == ")": # - if openBracket == 0: + if open_bracket == 0: raise Erreur("[ERROR]Open Bracket Is Missing !") else: - openBracket -= 1 + open_bracket -= 1 boolean = False elif mot == "ET" or mot == "OU": if boolean: @@ -254,12 +252,12 @@ class BooleanSearchView(object): else: boolean = True elif mot == "(": - openBracket += 1 + open_bracket += 1 else: boolean = False if boolean: raise Erreur("[ERROR]Boolean at the end of query") - elif openBracket != 0: + elif open_bracket != 0: raise Erreur("[ERROR]Close Bracket Is Missing") else: return True