Skip to content

Commit

Permalink
Merge pull request #922 from /issues/921/perfilcandidaturas
Browse files Browse the repository at this point in the history 
Issues/921/perfilcandidaturas
  • Loading branch information
@lissteilor
lissteilor committed Sep 22, 2017
2 parents 80e4c7c + c66ac67 commit 5bb13d5
Show file tree
Hide file tree
Showing 11 changed files with 99 additions and 54 deletions.
6 changes: 6 additions & 0 deletions popular_proposal/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.contrib import admin
from popular_proposal.models import (PopularProposal,
ProposalTemporaryData,
Commitment,
ProposalLike)
from popular_proposal.forms import ProposalTemporaryDataModelForm
from popular_proposal.forms.form_texts import TEXTS
Expand Down Expand Up @@ -54,3 +55,8 @@ def is_organization(self, obj):
return obj.user.profile.is_organization
is_organization.short_description = u'Es organización?'
is_organization.admin_order_field = 'user__profile__is_organization'


@admin.register(Commitment)
class CommitmentAdmin(admin.ModelAdmin):
list_display = ('id', "candidate", "proposal")
77 changes: 53 additions & 24 deletions votai_general_theme/static/sass/_2017sitio1.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,9 @@ td.cal-date{
}

#you-org{
@extend .small-basic;
min-height: 60px;
color: white;
font-family: 'Montserrat', sans-serif;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 2px;
font-size: 10px;
padding-top: 12px;
line-height: 12px;
Expand Down Expand Up @@ -350,11 +347,6 @@ input[type=file]{
}

/*Detalle*/
#filters {
background-color: $blue-light;
padding: 20px 0px;
}

.nav-detalle-propuesta{
border: none;
margin-top: -55px;
Expand Down Expand Up @@ -466,6 +458,17 @@ input[type=file]{
}

/*Propuestas*/
#filters {
background-color: $blue-light;
padding: 20px 0px;
select.form-control{
background-color: white;
}
.form-control{
background-color: white;
}
}

.propuesta{
border: 3px solid $grey-one;
min-height: 550px;
Expand All @@ -486,7 +489,18 @@ input[type=file]{
background-color: $blue;
color: white;
}

.label-success{
background-color: $blue-light;
color: white;
}
.label-warning{
background-color: $yellow;
color: white;
}
.label-danger{
background-color: $red;
color: white;
}
.propuesta:after{
display: none;
}
Expand Down Expand Up @@ -783,14 +797,11 @@ p.intro{
}

label{
font-family: 'Montserrat', sans-serif;
@extend .small-basic;
color: $grey-one;
text-transform: uppercase;
letter-spacing: 2px;
font-size: 11px;
font-weight: 700;
margin: 10px 0 0 0;
line-height: 1.3;
font-size: 11px;
}

.proposal-step{
Expand Down Expand Up @@ -825,6 +836,14 @@ label{
line-height: 1.4;
}

.small-basic{
font-family: 'Montserrat', sans-serif;
text-transform: uppercase;
letter-spacing: 2px;
font-weight: 700;
line-height: 1.3;
}

/*LOGIN*/
.nav-pills.list-inline{
margin-bottom: 40px;
Expand All @@ -834,17 +853,27 @@ label{
height: 30px;
}

/*candidatos*/
/*CANDIDATES*/
#candidato-programa {
background-color: #7AB7FF;
color: #233346;
background-color: $blue-light;
color: $grey-one;
padding-top: 15px;
text-transform: uppercase;
font-weight: bold;
a {
color: #233346;
&hover {
color: #233346;
}
}
@extend .small-basic;
font-size: 11px;
}
.content_padding #agenda-candidato li.impar{
background-color: white;
}
.content_padding #agenda-candidato li.par{
border-top: 1px solid $grey-one;
margin-top: 10px;
padding-top: 14px;
}
.candidate-name{
margin: 30px 0 -10px;
}
.candidate-diary{
color: $grey-one;
}
2 changes: 1 addition & 1 deletion votai_general_theme/templates/backend_candidate/complete_profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% with user.candidacies.first as candidacy %}
<h2>Información para el perfil de {{candidacy.candidate.name}}</h2>

<p><a href="{{candidacy.candidate.get_absolute_url}}">
<p><a href="{{candidacy.candidate.get_absolute_url}}" class="btn btn-dark">
{% trans 'Ir a ver mi perfil' %}</a></p>
{% endwith %}
<!-- image -->
Expand Down
2 changes: 1 addition & 1 deletion votai_general_theme/templates/backend_candidate/i_have_commited.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h2>Tus compromisos</h2>
<td>
<a href="{{commitment.get_absolute_url}}">
{% if commitment.commited %}
<span class="label label-success">
<span class="label label-warning">
Te comprometiste
</span>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion votai_general_theme/templates/backend_citizen/stats.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h4 class="modal-title">Alcaldes que se han pronunciado sobre {{stat.proposal.ti
{% for commitment in stat.pronouncing__alcalde.all %}
<li><a href="{{commitment.candidate.get_absolute_url}}">{{commitment.candidate}}</a>
{% if commitment.commited %}
<span class="label label-success">Se comprometió</span>
<span class="label label-warning">Se comprometió</span>
{% else %}
<span class="label label-danger">Dijo que NO</span>
{% endif %}(<a href="{{commitment.get_absolute_url}}">ver el compromiso</a>)</li>
Expand Down
40 changes: 22 additions & 18 deletions votai_general_theme/templates/elections/candidate_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

{% block mainelection %}
<div class="container text-center" itemscope itemtype="http://schema.org/Person">
<h1 itemprop="name">{{ candidate.name }}</h1>
<h1 itemprop="name" class="candidate-name">{{ candidate.name }}</h1>
{% if user|is_candidate %}
<h3>{% get_personal_data candidate=candidate personal_data='lema' as lema %}{{lema.value}}</h3>
{% with user.candidacies.first as candidacy %}
{% if candidacy.candidate == candidate %}
{% url 'backend_candidate:complete_profile' slug=candidacy.candidate.election.slug candidate_id=candidacy.candidate.id as complete_profile %}
<a href="{{complete_profile}}" class="btn btn-default">Modificar mi perfil</a>
<a href="{{complete_profile}}" class="btn btn-dark">Modificar mi perfil</a>
{% endif %}
{% endwith%}
{% endif %}
Expand All @@ -57,42 +57,44 @@ <h3>{% get_personal_data candidate=candidate personal_data='lema' as lema %}{{le
<td>
{% get_personal_data candidate=candidate personal_data='Partido' as partido %}
{% if partido.value %}
<p><b>Partido</b></p>
<p class="small-basic"><b>Partido</b></p>
<p>{{partido.value}}</p>
{% endif %}
</td>
{% get_personal_data candidate=candidate personal_data='Pacto' as pacto %}
{% if pacto.value %}
<td colspan="2">
<p class="small-basic"><b>Pacto</b></p>
<p>{{pacto.value}}</p>
</td>
<tr>
</tr>
<td>
{% if candidate.elections.count %}
<p><b>Cargo al que postula</b></p>
<p class="small-basic"><b>Cargo al que postula</b></p>
<ul class="list-inline">
{% for e in candidate.elections.all %}
<li>{{e.position}}</li>
{% endfor %}
</ul>
{% endif %}
</td>
</tr>
{% get_personal_data candidate=candidate personal_data='Pacto' as pacto %}
{% if pacto.value %}
<tr>
<td colspan="2">
<p><b>Pacto</b></p>
<p>{{pacto.value}}</p>
</td>


</tr>
{% endif %}
{% get_personal_data candidate=candidate personal_data='experiencia' as experiencia %}
{% if experiencia.value %}
<tr>
<td colspan="2">
<p><b>Experiencia</b></p>
<p class="small-basic"><b>Experiencia</b></p>
{{ experiencia.value|markdown }}
</td>
</tr>
{% endif %}
<tr>
<td>
<p><b>Compromisos Ciudadanos</b></p>
<p class="small-basic"><b>Compromisos Ciudadanos</b></p>
{% if candidate.commitments.committed.count %}
<p>Este candidato se ha comprometido con</p>
<p class="btn btn-info"><i class="fa fa-heart"></i>{{candidate.commitments.committed.count}} Propuestas ciudadanas</p>
Expand All @@ -102,7 +104,7 @@ <h3>{% get_personal_data candidate=candidate personal_data='lema' as lema %}{{le
</td>
<td>
{% if candidate.contact_details.count %}
<p><b>Contactos</b></p>
<p class="small-basic"><b>Contactos</b></p>
<ul class="list-inline">
{% include 'elections/candidates/social_media.html' with candidate=candidate %}
</ul>
Expand All @@ -120,14 +122,14 @@ <h3>{% get_personal_data candidate=candidate personal_data='lema' as lema %}{{le
{% get_personal_data candidate=candidate personal_data='program_link' as program_link %}
{% if program_link.value %}
<div id="candidato-programa" class="container-fluid">
<p class="text-center">Revisa su programa <a target="_blank" href="{{program_link.value}}" class="btn btn-default">aquí</a></p>
<p class="text-center">Revisa su programa <a target="_blank" href="{{program_link.value}}" class="btn btn-white">aquí</a></p>
</div>
{% endif %}

<div id="candidato-propuestas" class="container">
<h3 class="text-center">Compromisos Ciudadanos</h3>
{% if candidate.commitments.committed.count %}
<p>Acá encontrarás un total de {{candidate.commitments.committed.count}} propuestas a las que {{candidate.name}} se comprometió a cumplir dentro del plan de gobierno.</p>
<p class="text-center">Acá encontrarás un total de {{candidate.commitments.committed.count}} propuestas a las que {{candidate.name}} se comprometió a cumplir dentro del plan de gobierno.</p>
{% include 'elections/candidates/propuestas_a_las_que_se_ha_comprometido.html' with candidate=candidate election=election %}
{% else %}
{% if user|is_candidate %}
Expand All @@ -137,15 +139,17 @@ <h3 class="text-center">Compromisos Ciudadanos</h3>
{% endif %}
{% endif %}

<div class="col-md-12 text-center">
{% if user|is_candidate %}
{% with user.candidacies.first as candidacy %}
{% if candidacy.candidate == candidate and not candidate.commitments.count %}
{% url 'backend_candidate:proposals_for_me' slug=candidacy.candidate.election.slug candidate_id=candidacy.candidate.id as proposals_for_me %}
<a href="{{proposals_for_me}}" class="btn btn-default">Revisar propuestas ciudadanas</a>
<a href="{{proposals_for_me}}" class="btn btn-dark">Revisar propuestas ciudadanas</a>
{% endif %}
{% endwith%}
{% endif %}
</div>
</div>

{% endblock mainelection %}

Expand Down
7 changes: 4 additions & 3 deletions votai_general_theme/templates/elections/candidates/agenda.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{% load votainteligente_extras %}
{% cache 500 political_positions candidate.id %}

<h5 class="text-center">Agenda</h5>

<div class="candidate-diary">
<p class="small-basic text-center">Agenda</h5>
{% if candidate.agenda.count %}
<ul id="agenda-candidato" class="list-unstyled">
{% for activity in candidate.agenda.all|slice:":3" %}
Expand All @@ -14,6 +14,7 @@ <h5 class="text-center">Agenda</h5>
<p>Este candidato no cuenta con una agenda de actividades</p>
{% endif %}
{% if user|manages_this:candidate %}
<a href="{% url 'backend_candidate:add_activity' slug=candidate.id %}" class="btn btn-default"><i class="fa fa-plus"></i> Agrega tus actividades</a>
<a href="{% url 'backend_candidate:add_activity' slug=candidate.id %}" class="btn btn-white"><i class="fa fa-plus"></i> Agrega tus actividades</a>
{% endif %}
{% endcache %}
</div>
4 changes: 2 additions & 2 deletions votai_general_theme/templates/popular_proposal/_estado_para_candidato.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
{% get_commitment candidacy proposal as commitment %}
{% if commitment %}
{% if commitment.commited %}<!-- El candidato es terrible de pulento y nos dijo que si-->
<a href="{{commitment.get_absolute_url}}" data-toggle="tooltip" data-placement="top" title="¡Ya te comprometiste con esta propuesta! Puedes revisar tu compromiso acá"><span class="label label-success">Te comprometiste</span></a>
{% else %}<!-- El candidato no está ni ahí con nosotros-->
<a href="{{commitment.get_absolute_url}}" data-toggle="tooltip" data-placement="top" title="¡Ya te comprometiste con esta propuesta! Puedes revisar tu compromiso acá"><span class="label label-warning">Te comprometiste</span></a>
{% else %}<!-- El candidato no está ni ahí con nosotros-->
<a href="{{commitment.get_absolute_url}}" data-toggle="tooltip" data-placement="top" title="Dijiste que NO a esta propuesta y puedes revisar tu justificación acá"><span class="label label-danger">La rechazaste</span></a>
{% endif %}
{% else %}<!-- Si es que el candidato no se ha pronunciado -->
Expand Down
7 changes: 6 additions & 1 deletion votai_general_theme/templates/popular_proposal/_likers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<a href="#" class="btn btn-apoyo" disabled="disabled">No Comprometido</a>
</div>
{% endif %}
{% else %}
{% else %}<!-- esto sólo lo ven los candidatos -->
{% with proposal.get_absolute_url as detail_url %}
<div class="btn_pronunciarme {{support_button_extra_class}}">
<a href="{% url 'popular_proposals:commit_yes' candidate_pk=candidacy.candidate.id proposal_pk=proposal.id %}" alt="Comprometerme" class="btn btn-apoyo">
Expand All @@ -43,6 +43,11 @@
{% if not support_button_extra_class %}No comprometerme{% else %}<i class="fa fa-thumbs-down" aria-hidden="true"></i>{% endif %}
</a>
</div>
{% if proposal.contact_details and not support_button_extra_class %}
<hr>
<label>Contacta a esta organización</label>
<p>{{proposal.contact_details}}</p>
{% endif %}
{% endwith %}
{% endif %}
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions votai_general_theme/templates/popular_proposal/commitment/commit_no.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@

{% bootstrap_field form.detail show_label=false %}
<div class="tips">
<b class="text-dark">Terminos y Condiciones</b>
<b class="main-title">Terminos y Condiciones</b>
{% include 'popular_proposal/commitment/terms_and_conditions.html' %}
</div>
{% bootstrap_field form.terms_and_conditions show_label=false %}
<button type="submit" class="btn btn-danger">
<button type="submit" class="btn btn-dark">

{% if candidate.election.position == 'concejal' %}
{% trans 'No apoyaré esta propuesta'%}
Expand Down
2 changes: 1 addition & 1 deletion votai_general_theme/templates/popular_proposal/commitment/commit_yes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>Firmar Compromiso</h1>

<form enctype="multipart/form-data" action="{% url 'popular_proposals:commit_yes' proposal_pk=proposal.id candidate_pk=candidate.id %}" method="POST" role="form">{% csrf_token %}
<div class="tips">
<b class="text-dark">Terminos y Condiciones</b>
<b class="main-title">Terminos y Condiciones</b>
{% include 'popular_proposal/commitment/terms_and_conditions.html' %}
</div>
{% bootstrap_field form.terms_and_conditions show_label=false %}
Expand Down

0 comments on commit 5bb13d5

Please sign in to comment.