From 390661f20cfd170d42c4a6a0c6bd00e397881787 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Thu, 23 Jun 2016 16:07:05 -0300
Subject: [PATCH] =?UTF-8?q?Ajeita=20layout=20habilitar=5Fdetail,=20troca?=
 =?UTF-8?q?=20url=20da=20logo=20e=20muda=20campos=20da=20listagem=20de=20s?=
 =?UTF-8?q?olicita=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sigi/apps/solicitacoes/views.py          | 5 ++++-
 templates/base.html                      | 2 +-
 templates/usuarios/habilitar_detail.html | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py
index 6c8198d..3ca4f3b 100644
--- a/sigi/apps/solicitacoes/views.py
+++ b/sigi/apps/solicitacoes/views.py
@@ -4,7 +4,7 @@ import random
 from django.contrib.auth.mixins import LoginRequiredMixin
 
 import sigi.apps.crud.base
-from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView
+from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView, CrudBaseMixin
 from sigi.apps.usuarios.models import Usuario
 
 from .forms import SistemaForm, SolicitacaoEditForm, SolicitacaoForm
@@ -41,6 +41,9 @@ class SolicitacaoCrud(LoginRequiredMixin, Crud):
         def layout_key(self):
             return u'SolicitacaoList'
 
+    class BaseMixin(CrudBaseMixin):
+        list_field_names = [u'codigo', u'sistema', u'titulo', u'data_criacao']
+
 
 class SistemaCrud(Crud):
     model = Sistema
diff --git a/templates/base.html b/templates/base.html
index 7947e02..adb5dcf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -56,7 +56,7 @@
           <header class="masthead">
             <div class="container">
               <div class="navbar-header">
-                <a href="/">
+                <a href="/home/atendimento">
                   <img align="left" height="120" width="120" src="{% static 'img/img_atendimento/logo.png' %}" alt="Logo" class="img-responsive visible-lg-inline-block vcenter" >
                   <span class="vcenter" style="display:inline-block; color:black;" align="right">
                     <h2>Interlegis</h4><small><p>Sistema de Solicitação de Serviços</p></small>
diff --git a/templates/usuarios/habilitar_detail.html b/templates/usuarios/habilitar_detail.html
index 04667b2..96cff33 100644
--- a/templates/usuarios/habilitar_detail.html
+++ b/templates/usuarios/habilitar_detail.html
@@ -34,8 +34,10 @@
     <dd>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- {{ usuario.vinculo }}</dd>
     <dt>Casa Legislativa: </dt>
     <dd>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- {{ usuario.casa_legislativa }}</dd>
-    <dt>Telefones: </dt>
+    <dt>Telefone(s): </dt>
     <dd>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- [{{ usuario.primeiro_telefone.ddd }}] - {{usuario.primeiro_telefone.numero}}</dd>
-    <dd>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- [{{ usuario.segundo_telefone.ddd }}] - {{usuario.segundo_telefone.numero}}</dd>
+    {% if usuario.segundo_telefone.ddd and usuario.segundo_telefone.numero %}
+      <dd>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- [{{ usuario.segundo_telefone.ddd }}] - {{usuario.segundo_telefone.numero}}</dd>
+    {% endif %}
   </dl>
 {% endblock detail_content %}