Merge pull request #144 from nossas/revert-142-feat/candidate-list-ti…

…tle-description Revert "Feat: Adiciona logo no footer e edição de título e descrição de Listagem de Candidaturas"
nossas · Nov 23, 2023 · 233121e · 233121e
2 parents 8323445 + 2267ea6
commit 233121e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 32 deletions.
diff --git a/app/eleicao/cms_plugins.py b/app/eleicao/cms_plugins.py
@@ -103,6 +103,7 @@ def render(self, context, instance, placeholder):
             del form.fields["uf"]
             del form.fields["city"]
 
+
         ctx["form"] = form
 
         page_number = request.GET.get("page", 1)
@@ -113,8 +114,6 @@ def render(self, context, instance, placeholder):
         ctx["is_paginated"] = p.count > 1
         ctx["page_obj"] = page_obj
         ctx["object_list"] = page_obj.object_list
-
-        ctx.update({"title": instance.title, "description": instance.description})
 
         return ctx
 

diff --git a/app/eleicao/migrations/0019_auto_20231123_0544.py b/app/eleicao/migrations/0019_auto_20231123_0544.py
diff --git a/app/eleicao/models.py b/app/eleicao/models.py
@@ -165,8 +165,6 @@ class Meta:
 
 
 class EleicaoCandidateList(CMSPlugin):
-    title = models.CharField("Título", max_length=120, blank=True, null=True)
-    description = models.CharField("Descrição", max_length=120, blank=True, null=True)
     city = models.CharField("Cidade", max_length=120, blank=True, null=True)
     state = models.CharField("Estado", max_length=2, blank=True, null=True, choices=lazy(get_states, list)())
 

diff --git a/app/eleicao/static/images/eleicao/teia-de-criadores.png b/app/eleicao/static/images/eleicao/teia-de-criadores.png
diff --git a/app/eleicao/templates/eleicao/plugins/candidate_list.html b/app/eleicao/templates/eleicao/plugins/candidate_list.html
@@ -7,8 +7,8 @@
 <main class="container mx-auto candidate-list">
   <section class="list-header">
     <div class="px-5 py-20 text-center text-[#1842AC]">
-        <h1 class="mb-3 text-4xl md:text-6xl">{{ title }}</h1>
-        <p class="m-auto max-w-xl text-lg">{{ description }}<p>
+        <h1 class="mb-3 text-4xl md:text-6xl">Conheça as candidaturas</h1>
+        <p class="m-auto max-w-xl text-lg">As candidatas e candidatos abaixo assumiram o compromisso com o Estatuto da Criança e do Adolescente ao se cadastrar na plataforma.<p>
     </div>
   </section>
 

diff --git a/app/eleicao/templates/eleicao/plugins/footer.html b/app/eleicao/templates/eleicao/plugins/footer.html
@@ -30,8 +30,6 @@ <h3 class="text-3xl text-center text-blue-800">Realização</h3>
                 alt="Alana" />
               <img class="object-cover mx-auto w-44 md:w-32" src="{% static 'images/eleicao/vladimir-herzog.png' %}"
                 alt="Vladimir Herzog" />
-              <img class="object-cover mx-auto w-44 md:w-32" src="{% static 'images/eleicao/teia-de-criadores.png' %}"
-                alt="Teia de Criadores" />
               <img class="object-cover mx-auto w-44 md:w-32" src="{% static 'images/eleicao/minha-manaus.png' %}"
               alt="Minha Manaus" />
               <img class="object-cover mx-auto w-44 md:w-32" src="{% static 'images/eleicao/minha-bh.png' %}"

diff --git a/app/requirements.txt b/app/requirements.txt
@@ -4,7 +4,6 @@ psycopg2-binary
 django-select2
 django-formtools
 django-recaptcha
-captcha
 # Django CMS
 django-cms
 djangocms-text-ckeditor