diff --git a/sapl/base/tests/test_login.py b/sapl/base/tests/test_login.py index 91665ea8d..7fe7672e5 100755 --- a/sapl/base/tests/test_login.py +++ b/sapl/base/tests/test_login.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -import pytest from django.contrib.auth import get_user_model +import pytest + pytestmark = pytest.mark.django_db @@ -12,14 +13,15 @@ def user(): def test_login_aparece_na_barra_para_usuario_nao_logado(client): response = client.get('/') - assert '' in str( + assert '' in str( response.content) def test_username_do_usuario_logado_aparece_na_barra(client, user): assert client.login(username='jfirmino', password='123') response = client.get('/') - assert 'Login' not in str(response.content) + assert 'Login' not in str( + response.content) assert 'jfirmino' in str(response.content) assert 'Sair' in str(response.content) diff --git a/sapl/templates/404.html b/sapl/templates/404.html index 484a2a8f2..9bbd82f98 100644 --- a/sapl/templates/404.html +++ b/sapl/templates/404.html @@ -1,5 +1,7 @@ -{% load i18n staticfiles sass_tags menus %} +{% load i18n menus %} {% load common_tags %} +{% load render_bundle from webpack_loader %} +{% load webpack_static from webpack_loader %} @@ -11,19 +13,11 @@ {% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %} {% block head_content %} - + - {# Styles #} - - - - + {% render_bundle 'global' 'css' %} + {% render_bundle THEME_CUSTOM 'css' %} - - - - {# Scripts #} - {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} {% endblock %} @@ -55,7 +49,7 @@
- Logo {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #} @@ -126,31 +120,13 @@ {% endif %} {% block foot_js %} - - - - - - - - - - - - - - - - - - - - + + {% render_bundle 'global' 'js' %} + {% render_bundle THEME_CUSTOM 'js' %} + {% block extra_js %}{% endblock %} - - {# Scripts #} - {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} {% endblock %} @@ -82,7 +77,7 @@ - {% trans 'Logo do Interlegis' %} + {% trans 'Logo do Interlegis' %}

@@ -93,7 +88,7 @@

@@ -108,26 +103,10 @@ {% endblock footer_container %} {% block foot_js %} - - - - - - - - - - - - - - - - - - - + {% render_bundle 'global' 'js' %} + {% render_bundle THEME_CUSTOM 'js' %} + {% block extra_js %}{% endblock %} {% endblock foot_js %}