From 4d6aa8124f07673dd17b5af18ce92b57ce78b37f Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 22 Jul 2015 17:26:58 -0300 Subject: [PATCH] Add django-bower and datepicker in comissao_form --- .gitignore | 3 +++ sapl/settings.py | 19 +++++++++++++++++++ templates/base.html | 24 ++++++++++++++---------- templates/comissoes/comissao_form.html | 13 +++++++++++++ 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 76e18f4c4..d2f6810f1 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,6 @@ target/ .vagrant static + +components +bower_components diff --git a/sapl/settings.py b/sapl/settings.py index 08b6d6a49..73fed924f 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -58,6 +58,9 @@ INSTALLED_APPS = ( # zurb foundation 'foundation', 'crispy_forms_foundation', + + # bower + 'djangobower', ) MIDDLEWARE_CLASSES = ( @@ -131,3 +134,19 @@ DAB_FIELD_RENDERER = \ CRISPY_TEMPLATE_PACK = 'foundation-5' CRISPY_FAIL_SILENTLY = not DEBUG + +BOWER_COMPONENTS_ROOT = os.path.join(BASE_DIR, "bower_components") + +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'djangobower.finders.BowerFinder', +) + +BOWER_INSTALLED_APPS = ( + 'jquery#1.9', + 'underscore', + 'foundation-datepicker', + 'components-font-awesome', + 'foundation-icon-fonts', +) diff --git a/templates/base.html b/templates/base.html index 4de008e05..92e27b075 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,16 +4,20 @@ - - {% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %} - - {% block head_content %} - - - - - - {% endblock %} + + {% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %} + + {% block header_content %} + + + + + + + + + + {% endblock %} diff --git a/templates/comissoes/comissao_form.html b/templates/comissoes/comissao_form.html index 238bb8b86..52e30039d 100644 --- a/templates/comissoes/comissao_form.html +++ b/templates/comissoes/comissao_form.html @@ -5,3 +5,16 @@ {% crispy form %} {% endblock %} +{% block foot_js %} + +{% endblock %} \ No newline at end of file