Skip to content

Commit

Permalink
agregando moco, plantillas y un poco de css
Browse files Browse the repository at this point in the history
  • Loading branch information
eos87 committed Oct 1, 2010
1 parent 5ebf975 commit 0f0760d
Show file tree
Hide file tree
Showing 17 changed files with 9,441 additions and 15 deletions.
5 changes: 4 additions & 1 deletion fed/encuesta/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ class Encuesta(models.Model):

def __unicode__(self):
return '%s | %s | %s | %s' % (self.organizacion, self.proyecto, CHOICE_PERIODO[int(self.periodo)][1], self.anio)


def get_periodo(self):
return CHOICE_PERIODO[self.periodo][1]

class Meta:
verbose_name = 'Informe'
verbose_name_plural = 'Informes'
Expand Down
10 changes: 5 additions & 5 deletions fed/encuesta/views.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from django.utils import simplejson
from decorators import session_required
from django.contrib.auth.decorators import login_required
from django.core.exceptions import ViewDoesNotExist
from django.db.models import Sum
from django.http import HttpResponse
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.utils import simplejson
from django.views.generic.simple import direct_to_template
from django.contrib.auth.decorators import login_required

from forms import *
from models import *
from decorators import session_required

def _queryset_filtrado(request, resultado):
'''metodo para obtener el queryset de encuesta
Expand All @@ -25,7 +24,8 @@ def _queryset_filtrado(request, resultado):

@login_required
def index(request):
return direct_to_template(request, 'index.html')
informes = Encuesta.objects.all().order_by('-id')[:5]
return render_to_response('index.html', RequestContext(request, locals()))

@login_required(redirect_field_name='next')
def influencia(request):
Expand Down
Binary file modified fed/fed.db
Binary file not shown.
95 changes: 95 additions & 0 deletions fed/files/css/fed.css
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,40 @@ button:hover{
line-height: 49px;
text-align: center;
}
.tools .salidas{
float: left;
margin-top: 8px;
margin-left: 10px;
}

.tools .loginfo{
color: #5d5d5d;
font-size: 13px;
float: right;
margin-right: 10px;
}

.tools .loginfo .avatar{
float: left;
padding: 4px 6px 2px 2px;
}
.tools .loginfo .username{
float: left;
margin-top: 8px;
display: inline;
margin-right: 5px;
}
.username a{
color: #3a9696;
font-size: 13px;
}
.username a img{
float: left;
padding-right: 4px;
padding-top: 2px;
padding-left: 5px;
}

.content{
margin-top: 20px;
}
Expand Down Expand Up @@ -129,6 +163,10 @@ img{
}
a{
outline: none;
text-decoration: none;
}
a:hover{
text-decoration: underline;
}

.mapa {
Expand All @@ -145,6 +183,63 @@ a{
padding-left: 14px;
}

.ultimas{
float: left;
width: 400px;
margin-left: 20px;
margin-right: 20px;
margin-top: 30px;
}
.ultimas .title{
font-size: 22px;
color: #646464;
}
.vline3{
float: left;
margin-top: 30px;
}
.acerca{
float: left;
width: 470px;
margin-left: 20px;
margin-top: 30px;
}
.acerca .title{
font-size: 40px;
color: #154476;
}
.acerca .desc{
font-size: 12px;
color: #000;
margin-top: 15px;
padding-bottom: 20px;

}
.registro{
margin-top: 15px;
}
.registro .hline{
margin-top: 10px;
}
.mas{
height: 20px;
margin-top: 4px;
float: left;
margin-bottom: -8px;
padding-right: 10px;
}
.mastext{
float: left;
}
.mastext .entry{
color: #000;
font-size: 13px;
}
.mastext .data{
color: #888a85;
font-size: 13px;
}

/* Estilo para las tablas */
.mostrar caption{
font-size: 14px;
Expand Down
Binary file added fed/files/images/admin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/hline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/indicadores.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/influencia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/mas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/salir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/vline2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fed/files/images/vline3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0f0760d

Please sign in to comment.