diff --git a/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html b/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html index de7da79..206151c 100644 --- a/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html +++ b/sigi/apps/parlamentares/templates/admin/parlamentares/parlamentar/change_list.html @@ -1,13 +1,10 @@ {% extends "admin/change_list.html" %} {% load admin_list i18n reporting_tags %} -{% block object-tools %} - -{% endblock %} \ No newline at end of file +{% block object-tools-items %} +
  • + + Carrinho / Exportar +
    • + {{ block.super }} +{% endblock %} diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 4c85c9f..eb2c5b3 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -40,6 +40,10 @@ TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader', # Application definition INSTALLED_APPS = ( + + 'django_admin_bootstrapped.bootstrap3', + 'django_admin_bootstrapped', + 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/templates/admin/base.html b/templates/admin/base.html index 176fc88..917de9b 100644 --- a/templates/admin/base.html +++ b/templates/admin/base.html @@ -1,82 +1,172 @@ -{% load admin_static %}{% load firstof from future %} - - +{% load admin_static bootstrapped_goodies_tags %} +{% load tree_menu_tags %} + + {% block title %}{% endblock %} - + + {% block extrastyle %}{% endblock %} - - {% if LANGUAGE_BIDI %}{% endif %} - + + + + + + + + + + + + + {% block extrahead %}{% endblock %} + {% block blockbots %}{% endblock %} + {% load i18n %} -
    +
    + + {% if not is_popup %} {% block container-top %}{% endblock %} - {% if not is_popup %} - - - \ No newline at end of file + diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index 0b931df..046637a 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -1,4 +1,5 @@ {% extends "admin/base.html" %} +{% load i18n %}{% load admin_static bootstrapped_goodies_tags %} {% load tree_menu_tags %} {% load static from staticfiles %} @@ -32,22 +33,9 @@ {% endblock %} {% block branding %} -

    - Sistema de Informações Gerenciais do Interlegis -

    + Sistema de Informações Gerenciais do Interlegis {% endblock %} -{% block userlinks %} - Encerrar sessão -{% endblock %} - -{% block nav-global %} - -{% endblock %} - - {% block footer %} {% if not is_popup %} diff --git a/templates/admin/change_list.html b/templates/admin/change_list.html new file mode 100644 index 0000000..3cd975d --- /dev/null +++ b/templates/admin/change_list.html @@ -0,0 +1,122 @@ +{% extends "admin/base_site.html" %} +{% load i18n admin_urls admin_static admin_list bootstrapped_goodies_tags %} + +{% block extrastyle %} + {{ block.super }} + + {% if cl.formset %} + + {% endif %} + {% if cl.formset or action_form %} + {% url 'admin:jsi18n' as jsi18nurl %} + + {% endif %} + {{ media.css }} +{% endblock %} + +{% block extrahead %} +{{ block.super }} +{{ media.js }} +{% if action_form %}{% if actions_on_top or actions_on_bottom %} + +{% endif %}{% endif %} +{% endblock %} + +{% block bodyclass %}_change-list{% endblock %} + +{% block coltype %}flex{% endblock %} + +{% block object-tools %} + + + + {% if cl.has_filters %} + + {% endif %} + {% block search %}{% search_form cl %}{% endblock %} +{% endblock %} + +{% block content %} +
    {% csrf_token %} + +{% if cl.formset.errors %} +
    +

    + {% blocktrans count cl.formset.errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} +

    + {{ cl.formset.non_form_errors }} +
    +{% endif %} + + +{% with app_name=cl.opts.module_name|lower|slugify %} + {% render_with_template_if_exist cl.opts.app_label|lower|add:"/admin_app_"|add:app_name|add:"_description.html" "" %} +{% endwith %} + +{% if action_form and actions_on_top and cl.full_result_count %} +
    {% admin_actions %}
    +{% endif %} + +
    +
    + {% block date_hierarchy %} + {% date_hierarchy cl %} + {% endblock %} + + {% if cl.formset %} +
    {{ cl.formset.management_form }}
    + {% endif %} + + {% block result_list %} + {% result_list cl %} + {% endblock %} +
    +
    +{# {% if cl.formset and cl.result_count %} #} +
    +
    +
    + {% if action_form and actions_on_bottom and cl.full_result_count %} + {% admin_actions %} + {% endif %} +
    +
    + +
    +
    +
    +{# {% endif %} #} + +{% block pagination %} + {% pagination cl %} +{% endblock %} +
    +{% endblock %} + + diff --git a/templates/treemenus/menu.html b/templates/treemenus/menu.html index ced095d..572cce7 100644 --- a/templates/treemenus/menu.html +++ b/templates/treemenus/menu.html @@ -1,7 +1,7 @@ {% load tree_menu_tags %} {% ifequal menu_type "unordered-list" %} -