From f914f3e53fb69ce7418215d2109c9a589dcaead9 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 28 Jun 2016 17:13:42 -0300 Subject: [PATCH] #40 Substitui /home/atendimento por /atendimento --- sigi/apps/home/urls.py | 2 +- sigi/apps/solicitacoes/urls.py | 2 +- sigi/apps/usuarios/urls.py | 20 ++++++++++---------- sigi/urls.py | 4 ++-- templates/base.html | 2 +- templates/usuarios/login.html | 2 +- templates/usuarios/usuario_list.html | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sigi/apps/home/urls.py b/sigi/apps/home/urls.py index 94bc18f..1cf329a 100644 --- a/sigi/apps/home/urls.py +++ b/sigi/apps/home/urls.py @@ -4,7 +4,7 @@ from django.views.generic.base import TemplateView urlpatterns = patterns( 'sigi.apps.home.views', - url(r'^home/atendimento', TemplateView.as_view( + url(r'^atendimento', TemplateView.as_view( template_name='index_atendimento.html'), name='index_atendimento'), url(r'^$', 'index', name='sigi_index'), diff --git a/sigi/apps/solicitacoes/urls.py b/sigi/apps/solicitacoes/urls.py index 289bbef..b44fa1f 100644 --- a/sigi/apps/solicitacoes/urls.py +++ b/sigi/apps/solicitacoes/urls.py @@ -9,6 +9,6 @@ from .apps import AppConfig app_name = AppConfig.name urlpatterns = [ - url(ur'home/atendimento/solicitacao/', + url(ur'atendimento/solicitacao/', include(SolicitacaoCrud.get_urls())), ] diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index 5e4497a..d9be142 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -20,7 +20,7 @@ app_name = AppConfig.name EMAIL_SEND_USER='atendimento@interlegis.leg.br' recuperar_email = [ - url(ur'^home/atendimento/recuperar/recuperar_senha/$', + url(ur'^atendimento/recuperar/recuperar_senha/$', password_reset, {u'template_name': u'usuarios/recuperar_senha.html', u'password_reset_form': RecuperarSenhaEmailForm, @@ -29,36 +29,36 @@ recuperar_email = [ u'from_email': EMAIL_SEND_USER, u'html_email_template_name': u'usuarios/recuperar_senha_email.html'}, name=u'recuperar_senha'), - url(ur'^home/atendimento/recuperar/recuperar_recuperar/finalizado/$', + url(ur'^atendimento/recuperar/recuperar_recuperar/finalizado/$', password_reset_done, {u'template_name': u'usuarios/recuperar_senha_enviado.html'}, name=u'recuperar_senha_finalizado'), - url(ur'^home/atendimento/recuperar/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', + url(ur'^atendimento/recuperar/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', password_reset_confirm, {u'post_reset_redirect': u'usuarios:recuperar_senha_completo', u'template_name': u'usuarios/recuperacao_senha_form.html', u'set_password_form': RecuperacaoMudarSenhaForm}, name=u'recuperar_senha_confirma'), - url(ur'^home/atendimento/recuperar/completo/$', + url(ur'^atendimento/recuperar/completo/$', password_reset_complete, {u'template_name': u'usuarios/recuperacao_senha_completo.html'}, name=u'recuperar_senha_completo'), ] urlpatterns = recuperar_email + [ - url(ur'^home/atendimento/login/$', login, { + url(ur'^atendimento/login/$', login, { u'template_name': u'usuarios/login.html', u'authentication_form': LoginForm}, name=u'login'), - url(ur'^home/atendimento/logout/$', logout, {u'next_page': u'/home/atendimento'}, + url(ur'^atendimento/logout/$', logout, {u'next_page': u'/atendimento'}, name=u'logout'), - url(ur'^home/atendimento/usuario/', include(UsuarioCrud.get_urls())), + url(ur'^atendimento/usuario/', include(UsuarioCrud.get_urls())), - url(ur'^home/atendimento/habilitar/(?P\d+)$', + url(ur'^atendimento/habilitar/(?P\d+)$', HabilitarDetailView.as_view(), name=u'habilitar_detail'), - url(ur'^home/atendimento/habilitar/(?P\d+)/edit$', + url(ur'^atendimento/habilitar/(?P\d+)/edit$', HabilitarEditView.as_view(), name=u'habilitar_edit'), - url(ur'^home/atendimento/usuario/(?P\d+)/mudar_senha$', + url(ur'^atendimento/usuario/(?P\d+)/mudar_senha$', MudarSenhaView.as_view(), name=u'mudar_senha'), url(ur'^usuario/confirmar/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', ConfirmarEmailView.as_view(), name=u'confirmar_email'), diff --git a/sigi/urls.py b/sigi/urls.py index cb29f9d..ea67a57 100644 --- a/sigi/urls.py +++ b/sigi/urls.py @@ -1,4 +1,4 @@ -#-*- coding:utf-8 -*- +# -*- coding:utf-8 -*- from django.conf import settings from django.conf.urls import include, patterns, url @@ -36,7 +36,7 @@ urlpatterns = patterns( # to enable language selection # Suspended - #url(r'^i18n/', include('django.conf.urls.i18n')), + # url(r'^i18n/', include('django.conf.urls.i18n')), ) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/templates/base.html b/templates/base.html index a78a3df..7c5d503 100644 --- a/templates/base.html +++ b/templates/base.html @@ -55,7 +55,7 @@
- + Logo

Interlegis

Sistema de Solicitação de Serviços

 diff --git a/templates/usuarios/login.html b/templates/usuarios/login.html index 61b1e0c..4064ff9 100644 --- a/templates/usuarios/login.html +++ b/templates/usuarios/login.html @@ -27,7 +27,7 @@

Esqueceu sua senha?
- +
diff --git a/templates/usuarios/usuario_list.html b/templates/usuarios/usuario_list.html index 3618be2..e596179 100644 --- a/templates/usuarios/usuario_list.html +++ b/templates/usuarios/usuario_list.html @@ -22,7 +22,7 @@ {% for value, href in value_list %} {% if href %} - {{ value }} + {{ value }} {% else %} {{ value|safe }} {% endif %}