martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Filled with Data / Addressbook corrections

Browse Source
This commit is contained in:
Martin Bauer
2013-10-14 19:46:53 +02:00
parent 114a2df9cf
commit 175df72a21
23 changed files with 124 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
website/static/css/sign-in.css
View File

@@ -30,43 +30,6 @@
font-size: 17px;
margin: 0 0 40px 0;
}
#sign_in .header .social{
margin: 0 auto 28px;
float: none;
text-align: center;
}
#sign_in .header .social a.circle{
text-align: center;
width: 56px;
height: 56px;
border-radius: 100%;
margin-right: 25px;
display: inline-block;
-webkit-transition: border-color ease-in .1s;
-moz-transition: border-color ease-in .1s;
-o-transition: border-color ease-in .1s;
transition: border-color ease-in .1s;
}
#sign_in .header .social a.circle img{
display: inline-block;
margin-top: 15px;
}
#sign_in .header .social a.facebook{
border:2px solid #233678;
background: #233678;
}
#sign_in .header .social a.twitter{
border:2px solid #54AEE1;
background: #54AEE1;
}
#sign_in .header .social a.gplus{
border:2px solid #292929;
background: #292929;
margin: 0;
}
#sign_in .header .social a.circle:hover{
border-color: rgb(255, 255, 255);
}
#sign_in .division{
margin: 0 auto 50px;
float: none;

16
website/templates/website/event_countdown.html
View File

@@ -43,13 +43,15 @@
in <em>{{countdown.event.location}} </em>
<br/>
{% if countdown.participation == "?" %}
Du hast dich noch nicht für diesen Termin eingetragen!
{% elif countdown.participation == "Yes" %}
Du hast für diesen Termin zugesagt.
{% elif countdown.participation == "No" %}
Du hast für diesen Termin abgesagt.
{%endif %}
{% if 'participation' in countdown %}
{% if countdown.participation == "?" %}
Du hast dich noch nicht für diesen Termin eingetragen!
{% elif countdown.participation == "Yes" %}
Du hast für diesen Termin zugesagt.
{% elif countdown.participation == "No" %}
Du hast für diesen Termin abgesagt.
{%endif %}
{% endif %}
</p>
</div>
<div class="span6 count" id="clock">

2
website/templates/website/slider_intern_area.html
View File

@@ -90,7 +90,7 @@
<article class="slide" id="adressbook"
style="background: url('{{STATIC_URL}}/img/slides/spielen2.jpg') repeat-x top center;">
<div class="info">
<a href="/addressbook">Adressbuch</a>
<a href="/musicians">Adressbuch</a>
<div class="subtitle subtitlebg">Geburtstage, Telefonnummern, ...</div>
</div>
</article>

13
website/views.py
View File

@@ -21,24 +21,25 @@ from django.contrib.auth.models import User
def home_view(request):
context = dict()
# Event participation for slider text
context['hasParticipationSetForAllEvents'] = EventParticipation.hasUserSetParticipationForAllEvents( request.user)
if EventParticipation.isMember( request.user ):
context['hasParticipationSetForAllEvents'] = EventParticipation.hasUserSetParticipationForAllEvents( request.user)
# Countdown
countdown = dict()
events = Event.objects.filter( date__gte = datetime.now() ).order_by('date')[:1]
if ( len(events) > 0 ):
nextEvent = events[0]
part = EventParticipation.objects.filter( user = request.user ).filter( event = nextEvent )
if EventParticipation.isMember( request.user ):
part = EventParticipation.objects.filter( user = request.user ).filter( event = nextEvent )
countdown['participation'] = part[0].status
eventTime = datetime( events[0].date.year, events[0].date.month, events[0].date.day,
events[0].displaytime.hour, events[0].displaytime.minute )
countdown['event'] = events[0]
countdown['epoch'] = int( (eventTime - datetime.now() ).total_seconds() * 1000 )
countdown['participation'] = part[0].status
context['countdown'] = countdown
@@ -128,5 +129,5 @@ from django.core.urlresolvers import reverse
def change_password( request ):
template_name = "website/change_password.html"
return django.contrib.auth.views.password_change(request, template_name, post_change_redirect= reverse(home_view) )
return django.contrib.auth.views.password_change(request, template_name, post_change_redirect= "/" )