Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Feat: Adiciona logo no footer e edição de título e descrição de Listagem de Candidaturas" #144

Merged
merged 1 commit into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/eleicao/cms_plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down
23 changes: 0 additions & 23 deletions app/eleicao/migrations/0019_auto_20231123_0544.py

This file was deleted.

2 changes: 0 additions & 2 deletions app/eleicao/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)())

Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions app/eleicao/templates/eleicao/plugins/candidate_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions app/eleicao/templates/eleicao/plugins/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}"
Expand Down
1 change: 0 additions & 1 deletion app/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ psycopg2-binary
django-select2
django-formtools
django-recaptcha
captcha
# Django CMS
django-cms
djangocms-text-ckeditor
Expand Down
Loading