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

Lots of stuff

Browse Source 
- Imagestore gallery
- remember me fixed
- youtube filter
- password change option
This commit is contained in:
Martin Bauer
2013-10-03 11:27:06 +02:00
parent 0e26988867
commit 114a2df9cf
179 changed files with 4987 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
website/static/img/church.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

79
website/templates/website/base.html
View File

@@ -81,6 +81,7 @@ $.ajaxSetup({
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% render_block "css" %}
</head>
@@ -117,6 +118,7 @@ $.ajaxSetup({
</a>
<ul class="dropdown-menu">
<li><a href="/musicians/profile">Eigenes Profil</a></li>
<li><a href="/changePassword">Passwort ändern</a> </li>
<li><a href="/logout"> Logout</a></li>
</ul>
</li>
@@ -131,83 +133,8 @@ $.ajaxSetup({
{% block feature_slider %}
<section id="feature_slider" class="">
<article class="slide" id="showcasing" style="background: url('{{STATIC_URL}}/img/backgrounds/silver.jpg') repeat-x top center;">
<img class="asset left-30 sp600 t120 z1" src="{{STATIC_URL}}/img/slides/gruppe.png" />
<div class="info">
<h2>Blechreiz</h2>
<h3>12 Musiker für einen guten Zweck </h3>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/ticotico2.jpg') repeat-x top center;">
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Termine</a>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/daempfer.jpg') repeat-x top center;">
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Termine</a>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/andi.jpg') repeat-x top center;">
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Termine</a>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/andi2.jpg') repeat-x top center;">
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Termine</a>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/applaus.jpg') repeat-x top center;">
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Termine</a>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/eindruck.jpg') repeat-x top center;">
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Termine</a>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/publikum.jpg') repeat-x top center;">
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Termine</a>
</div>
</article>
<article class="slide" id="tour" style="background: url('{{STATIC_URL}}/img/slides/spielen2.jpg') repeat-x top center;">
</article>
<article class="slide" id="showcasing" style="background: url('{{STATIC_URL}}/img/backgrounds/black_red_01.jpg') repeat-x top center;">
<img class="asset left-30 sp600 t120 z1" src="{{STATIC_URL}}/img/slides/tuba.png" />
<div class="info">
<h2>Konzerte</h2>
<a href="features.html">Nächste Termine</a>
</div>
</article>
</section>
{% include "website/slider_intern_area.html" %}
{% endblock %}
{% block content %} {% endblock %}

33
website/templates/website/change_password.html Normal file
View File

@@ -0,0 +1,33 @@
{% extends "website/base.html" %}
{% load crispy_forms_tags %}
<!-- No Feature slider -->
{% block feature_slider %}
{% endblock %}
<!-- Static Navbar at top -->
{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
{% block content %}
<div class="container">
<div class="row">
<h3>Passwort ändern</h3>
<div class="span12">
<form method="post">
{% csrf_token %}
{{ form }}
<br>
<input type="submit" class="btn btn-primary" value="Speichern"></input>
</form>
</div>
</div>
</div>
{% endblock %}

5
website/templates/website/login.html
View File

@@ -14,7 +14,6 @@
{% endblock %}
<!-- No Menu (yet) -->
{% block menu_contents %}
{% endblock %}
@@ -94,10 +93,10 @@
<input id="remember" type="checkbox"> Eingeloggt bleiben
</label>
</div>
<!--
<div class="span3 dosnt">
<a href="reset.html">Passwort vergessen?</a>
</div>
</div> -->
</div>
</div>

4
website/templates/website/mainpage.html
View File

@@ -3,9 +3,7 @@
{% load sekizai_tags staticfiles %}
{% block feature_slider %}
{% include "website/slider_intern_area.html" %}
{% endblock %}
{% block content %}

13
website/urls.py Normal file
View File

@@ -0,0 +1,13 @@
from django.conf.urls import patterns, url
from website.views import home_view, login_view, userlistForAutocompletion,logout_view, change_password
urlpatterns = patterns('',
url(r'$^', home_view ),
url(r'^login/$', login_view),
url(r'^login/usernames$', userlistForAutocompletion),
url(r'^logout/$', logout_view),
url(r'^changePassword/$', change_password),
)

16
website/views.py
View File

@@ -13,6 +13,7 @@ from eventplanner.models import Event, EventParticipation
from musicians.models import Musician
from datetime import datetime
from datetime import timedelta
from django.contrib.auth.models import User
@@ -89,7 +90,12 @@ def login_view( request ):
if user is not None:
if user.is_active:
if not request.POST.get('remember', None):
# Expire in one year
request.session.set_expiry( timedelta( weeks=52 ) )
else:
# Expire on browser close
request.session.set_expiry( 0 )
login(request, user)
result['redirect'] = "/"
print ( "Setting Redirect" )
@@ -114,3 +120,13 @@ def login_view( request ):
else:
nextPage = "/"
return render( request, 'website/login.html', { 'next' : nextPage } )
import django.contrib.auth.views
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) )