diff --git a/requirements.txt b/requirements.txt index e902eb73..fcb58927 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,8 @@ django-debug-toolbar>=1.6 dj-database-url>=0.4.2 django-compressor>=2.1 django-compressor-toolkit>=0.6.0 +django-constance>=2.2.0 +django-picklefield>=1.0.0 django-bower>=5.2.0 django-cors-headers>=2.0.0 python3-openid>=3.0.10 diff --git a/wikilegis/accounts/backends.py b/wikilegis/accounts/backends.py index 040a7db7..d1fc0c87 100644 --- a/wikilegis/accounts/backends.py +++ b/wikilegis/accounts/backends.py @@ -18,6 +18,7 @@ def authenticate(self, remote_user, request=None): ) if created: - user.first_name = remote_user_data['name'] + user.first_name = remote_user_data['first_name'] + user.last_name = remote_user_data['last_name'] return user diff --git a/wikilegis/core/templates/amendments/_comments.html b/wikilegis/core/templates/amendments/_comments.html index caeec37f..21e37859 100644 --- a/wikilegis/core/templates/amendments/_comments.html +++ b/wikilegis/core/templates/amendments/_comments.html @@ -13,7 +13,7 @@ {% elif amendment.bill_is_closed %}
-

{% trans "This project is closed for participations." %}

+

{{ config.CLOSED_TEXT }}

{% else %}
diff --git a/wikilegis/core/templates/amendments/_content.html b/wikilegis/core/templates/amendments/_content.html index d7c9a72e..434e4920 100644 --- a/wikilegis/core/templates/amendments/_content.html +++ b/wikilegis/core/templates/amendments/_content.html @@ -23,7 +23,7 @@ {% elif segment.bill.status == 'closed' %}
-

{% trans "This project is closed for participations." %}

+

{{ config.CLOSED_TEXT }}

{% endif %} diff --git a/wikilegis/core/templates/bill/_content.html b/wikilegis/core/templates/bill/_content.html index ce0de6b9..d8a65952 100644 --- a/wikilegis/core/templates/bill/_content.html +++ b/wikilegis/core/templates/bill/_content.html @@ -3,7 +3,8 @@
- + {% get_media_prefix as MEDIA_URL %} +

{{bill.title}}

diff --git a/wikilegis/core/templates/bill/_info.html b/wikilegis/core/templates/bill/_info.html index 65007755..b5262b5a 100644 --- a/wikilegis/core/templates/bill/_info.html +++ b/wikilegis/core/templates/bill/_info.html @@ -54,7 +54,7 @@

{{bill.title}}

{{bill.amendments_count}} - {% trans "Amendments suggestions" %} + {{ config.SUGGESTION_TEXT }}
@@ -67,7 +67,7 @@

{{bill.title}}

-

{% trans "Do you support this bill?" %}

+

{{ config.VOTE_TEXT }}

{% include "segment/_votes.html" with segment=bill %}
diff --git a/wikilegis/core/templates/bill/_newsletter.html b/wikilegis/core/templates/bill/_newsletter.html index 07610169..c4020696 100644 --- a/wikilegis/core/templates/bill/_newsletter.html +++ b/wikilegis/core/templates/bill/_newsletter.html @@ -6,7 +6,7 @@ {% else %}
- {% trans 'Subscribe to this bill' %} + {{ config.NEWSLETTER_TEXT }}
diff --git a/wikilegis/core/templates/home.html b/wikilegis/core/templates/home.html index 3252df1d..c2377de5 100644 --- a/wikilegis/core/templates/home.html +++ b/wikilegis/core/templates/home.html @@ -12,12 +12,12 @@
diff --git a/wikilegis/core/templates/report/bill_report.html b/wikilegis/core/templates/report/bill_report.html index c612437e..f26da4ba 100644 --- a/wikilegis/core/templates/report/bill_report.html +++ b/wikilegis/core/templates/report/bill_report.html @@ -19,8 +19,8 @@

{{ object.title }}

- thumbs_up_down {{object.votes_count}} Votos do Projeto - thumbs_up_down {{votes}} Votos em Dispositivos + thumbs_up_down {{object.votes_count}} {{ config.BILL_VOTES }} + thumbs_up_down {{votes}} {{ config.SEGMENT_VOTES }} forum{{comments}} Comentários people{{ attendees }}Participantes note_add{{object.amendments_count}}Propostas diff --git a/wikilegis/core/templates/segment/_comments.html b/wikilegis/core/templates/segment/_comments.html index 88e609e9..7a36b74f 100644 --- a/wikilegis/core/templates/segment/_comments.html +++ b/wikilegis/core/templates/segment/_comments.html @@ -13,7 +13,7 @@ {% elif segment.bill.status == 'closed' %}
-

{% trans "This project is closed for participations." %}

+

{{ config.CLOSED_TEXT }}

{% else %}
diff --git a/wikilegis/core/views.py b/wikilegis/core/views.py index e6ab384a..fee6b8ec 100644 --- a/wikilegis/core/views.py +++ b/wikilegis/core/views.py @@ -12,6 +12,7 @@ from distutils.util import strtobool from django.contrib.sites.models import Site from django.db.models import Q +from constance import config from core import models, model_mixins @@ -92,7 +93,8 @@ def render_bill_info(request, bill_id): return error html = render_to_string('bill/_info.html', {'request': request, - 'bill': bill}) + 'bill': bill, + 'config': config}) return JsonResponse({'html': html}) except ObjectDoesNotExist: message = _('The following URL has returned no known bill: ' @@ -111,7 +113,8 @@ def render_bill_content(request, bill_id): return error html = render_to_string('bill/_content.html', {'request': request, - 'bill': bill}) + 'bill': bill, + 'config': config}) return JsonResponse({'html': html}) except ObjectDoesNotExist: message = _('The following URL has returned no known bill: ' @@ -130,7 +133,8 @@ def render_bill_amendments(request, segment_id): return error html = render_to_string('amendments/_index.html', {'request': request, - 'segment': segment}) + 'segment': segment, + 'config': config}) return JsonResponse({'html': html}) except ObjectDoesNotExist: message = _('The following URL has returned no known segment.') @@ -212,7 +216,7 @@ def create_vote(model, segment_id, request): else: return JsonResponse( {'title': _('Oops'), - 'message': _('This bill is closed for participation :(')}, + 'message': config.CLOSED_TEXT}, status=403 ) diff --git a/wikilegis/wikilegis/settings/apps.py b/wikilegis/wikilegis/settings/apps.py index d15f1ff2..d69859a3 100644 --- a/wikilegis/wikilegis/settings/apps.py +++ b/wikilegis/wikilegis/settings/apps.py @@ -14,6 +14,8 @@ ] THIRD_PARTY = [ + 'constance', + 'constance.backends.database', 'compressor', 'compressor_toolkit', 'debug_toolbar', diff --git a/wikilegis/wikilegis/settings/constance.py b/wikilegis/wikilegis/settings/constance.py new file mode 100644 index 00000000..d61cc774 --- /dev/null +++ b/wikilegis/wikilegis/settings/constance.py @@ -0,0 +1,40 @@ +# EDITABLE SETTINGS +CONSTANCE_ADDITIONAL_FIELDS = { + 'image_field': ['django.forms.ImageField', {}] +} + +CONSTANCE_CONFIG = { + 'SUBTITLE': ('Sua ferramenta de edição legislativa', 'Subtítulo da página ' + 'inicial', str), + 'DESCRIPTION_P1': ('Analise os projetos de lei e contribua com sugestões ' + 'de nova redação a artigos ou parágrafos. Os deputados ' + 'relatores das proposições acompanham as participações ' + 'e podem adotar a sua ideia!', 'Primeiro parágrafo da ' + 'descrição na página inicial', str), + 'DESCRIPTION_P2': ('Nessa interação, ganha a sociedade, que participa mais ' + 'ativamente do processo legislativo, e ganha o ' + 'Parlamento, que aprova leis mais aprimoradas e ' + 'conectadas às necessidades dos cidadãos.', 'Segundo ' + 'parágrafo da descrição na página inicial', str), + 'VOTE_TEXT': ('Você apoia esse projeto de lei?', 'Descrição dos botões para' + ' apoiar o texto', str), + 'NEWSLETTER_TEXT': ('Assinar este projeto de lei', 'Texto para assinar a ' + 'newsletter', str), + 'SUGGESTION_TEXT': ('Sugestões de emendas', 'Texto para a quantidade de ' + 'sugestões', str), + 'CLOSED_TEXT': ('Este projeto está fechado para participação.', 'Texto ' + 'para exibir quando o texto estiver encerrado.', str), + 'COAT_OF_ARMS_IMAGE': ('brasao.png', 'Brasão do texto', 'image_field'), + 'BILL_VOTES': ('Votos do Projeto', 'Descrição dos votos no texto', str), + 'SEGMENT_VOTES': ('Votos em Dispositivos', 'Descrição dos votos em ' + 'segmentos de texto', str), +} + +CONSTANCE_CONFIG_FIELDSETS = { + 'Página inicial': ('SUBTITLE', 'DESCRIPTION_P1', 'DESCRIPTION_P2'), + 'Página do texto': ('VOTE_TEXT', 'NEWSLETTER_TEXT', 'SUGGESTION_TEXT', + 'CLOSED_TEXT', 'COAT_OF_ARMS_IMAGE'), + 'Relatório': ('BILL_VOTES', 'SEGMENT_VOTES'), +} + +CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend' diff --git a/wikilegis/wikilegis/settings/staticfiles.py b/wikilegis/wikilegis/settings/staticfiles.py index 64764162..735a40b0 100644 --- a/wikilegis/wikilegis/settings/staticfiles.py +++ b/wikilegis/wikilegis/settings/staticfiles.py @@ -62,6 +62,7 @@ ] THIRD_PARTY_CONTEXT_PROCESSORS = [ + 'constance.context_processors.config', 'social_django.context_processors.backends', 'social_django.context_processors.login_redirect', ] diff --git a/wikilegis/wikilegis/urls.py b/wikilegis/wikilegis/urls.py index d903f585..a827df41 100644 --- a/wikilegis/wikilegis/urls.py +++ b/wikilegis/wikilegis/urls.py @@ -26,5 +26,7 @@ url(r'^', include('accounts.urls')), ] +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + if settings.FORCE_SCRIPT_NAME and settings.DEBUG: urlpatterns += static('/static/', document_root=settings.STATIC_ROOT)