Skip to content

Commit

Permalink
Adding first version of the backend for citizen
Browse files Browse the repository at this point in the history
  • Loading branch information
Felipe Álvarez committed Apr 1, 2016
1 parent 828e7e6 commit 5dfc771
Show file tree
Hide file tree
Showing 12 changed files with 119 additions and 0 deletions.
Empty file added backend_citizen/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions backend_citizen/admin.py
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
7 changes: 7 additions & 0 deletions backend_citizen/apps.py
@@ -0,0 +1,7 @@
from __future__ import unicode_literals

from django.apps import AppConfig


class BackendCitizenConfig(AppConfig):
name = 'backend_citizen'
Empty file.
5 changes: 5 additions & 0 deletions backend_citizen/models.py
@@ -0,0 +1,5 @@
from __future__ import unicode_literals

from django.db import models

# Create your models here.
Empty file.
24 changes: 24 additions & 0 deletions backend_citizen/tests/views_tests.py
@@ -0,0 +1,24 @@
# coding=utf-8
from django.core.urlresolvers import reverse
from elections.tests import VotaInteligenteTestCase as TestCase
from django.contrib.auth.models import User
from popular_proposal.models import ProposalTemporaryData, PopularProposal


PASSWORD = 'perrito'


class BackendCitizenViewsTests(TestCase):
def setUp(self):
super(BackendCitizenViewsTests, self).setUp()
self.fiera = User.objects.get(username='fiera')
self.fiera.set_password(PASSWORD)
self.fiera.save()

def test_my_profile_view(self):
url = reverse('backend_citizen:index')
response = self.client.get(url)
self.assertRedirects(response, reverse('auth_login')+"?next="+url)
self.client.login(username=self.fiera.username, password=PASSWORD)
response = self.client.get(url)
self.assertTemplateUsed(response, 'backend_citizen/index.html')
8 changes: 8 additions & 0 deletions backend_citizen/urls.py
@@ -0,0 +1,8 @@
from django.conf.urls import patterns, url
from backend_citizen.views import IndexView

urlpatterns = patterns('',
url(r'^index/?$',
IndexView.as_view(),
name='index'),
)
7 changes: 7 additions & 0 deletions backend_citizen/views.py
@@ -0,0 +1,7 @@
from django.shortcuts import render
from django.contrib.auth.mixins import LoginRequiredMixin
from django.views.generic.base import TemplateView


class IndexView(LoginRequiredMixin, TemplateView):
template_name='backend_citizen/index.html'
62 changes: 62 additions & 0 deletions votai_general_theme/templates/backend_citizen/index.html
@@ -0,0 +1,62 @@
{% extends "base.html" %}
{% load staticfiles %}
{% load i18n %}
{% load thumbnail %}
{% load bootstrap_tags %}
{% block extrajs %}
{% endblock extrajs %}

{% block content %}
<!-- ModalCommentsForAProposal -->
<div class="modal fade loadFromUrl" id="proposalComments" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">{% trans 'Actualiza los comentarios' %}</h4>
</div>
<div class="modal-body">
...
</div>
</div>
</div>
</div>
<!-- Modal ModerateProposal -->
<div class="modal fade loadFromUrl" id="moderateProposal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">{% trans '¿Deseas aceptar Propuesta Popular?' %}</h4>
</div>
<div class="modal-body">
...
</div>
</div>
</div>
</div>

<div>

<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script type="text/javascript" src="{% static 'js/jquery.gridAccordion.min.js' %}"></script>
<!-- Featured Elections -->
<div class="contenedorDestacado fondo-blanco">
<h1>{% blocktrans %}¡Bienvenid@ {{user}}!{% endblocktrans %}</h1>

</div>
<script>
$(function(){
$('.loadFromUrl').on('show.bs.modal', function (event) {
var anchor = $(event.relatedTarget) // Button that triggered the modal
var modal = $(this)
var body = modal.find('.modal-body');
body.load(anchor.data('url'));
})
});
</script>
{% endblock content %}

{% block extrafooter %}
{% endblock extrafooter %}

1 change: 1 addition & 0 deletions votainteligente/urls.py
Expand Up @@ -25,6 +25,7 @@
(r'^newsletter/', include('newsletter.urls')),
(r'^api/', include('popolorest.urls')),
(r'^backend_staff/', include('backend_staff.urls', namespace='backend_staff')),
(r'^backend_citizen/', include('backend_citizen.urls', namespace='backend_citizen')),
url(r'^accounts/', include('registration.backends.hmac.urls')),
)

Expand Down
2 changes: 2 additions & 0 deletions votainteligente/votainteligente_settings.py
Expand Up @@ -49,10 +49,12 @@
#'django.contrib.admindocs',
'popular_proposal',
'backend_staff',
'backend_citizen',
)

# REGISTRATION
ACCOUNT_ACTIVATION_DAYS = 7
LOGIN_REDIRECT_URL='backend_citizen:index'

MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
Expand Down

0 comments on commit 5dfc771

Please sign in to comment.