Skip to content

Commit

Permalink
added decent 404, removed uneeded data dictionary. see http://docs.dj…
Browse files Browse the repository at this point in the history
  • Loading branch information
myusuf3 committed May 12, 2011
1 parent bbf035a commit 230506e
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 14 deletions.
3 changes: 1 addition & 2 deletions epio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ directory_name = prologger
/static = static

[services]
postgres = true

postgres = true
5 changes: 3 additions & 2 deletions templates/404.html → templates/400.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
</head>

<body>
SHIIIIIIIIIIIIIIIT.

<iframe width="560" height="349" src="http://www.youtube.com/embed/EBceFUdhKyM" frameborder="0" allowfullscreen></iframe>
<center>
<iframe width="853" height="510" src="http://www.youtube.com/embed/EBceFUdhKyM" frameborder="0" allowfullscreen></iframe>
</center>


</body>
Expand Down
39 changes: 39 additions & 0 deletions templates/500.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

<head>
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}media/css-style.css" />
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Serif">
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/gritter.css" />
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">google.load('jquery', '1.5');</script>
<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.gritter.js"></script>
<link rel="shortcut icon" href="{{MEDIA_URL}}/favicon.ico" />
<title>{%block title%}Prologger | v0.1{%endblock%}</title>

<style type="text/css">
{%block css%}
#main-index {
overflow:none;
padding-bottom: 165px;
padding-top: 180px;
background-color:none;
width:840px;
margin-left:-420px;
position: relative;
left:50%;
}
{%endblock%}
</style>

</head>

<body>

<center>
<iframe width="853" height="510" src="http://www.youtube.com/embed/EBceFUdhKyM" frameborder="0" allowfullscreen></iframe>
</center>


</body>

</html>
12 changes: 2 additions & 10 deletions views.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ def index(request):
landing page view user login and greeting
"""
data = []
data.append({'MEDIA_URL': MEDIA_URL})
return render(request,'index.html', {'data': data})
return render(request,'index.html')

def profile(request):
"""
Expand All @@ -57,8 +55,6 @@ def profile(request):
here we will put shit like user profile recently asked questions and github achievements
"""
data = []
data.append({'MEDIA_URL': MEDIA_URL})
return render(request,'profile.html', {'data': data})

def home (request):
Expand All @@ -67,8 +63,6 @@ def home (request):
I am hoping to have a news feed type of things for user to see what their friends are up to.
"""
data = []
data.append({'MEDIA_URL': MEDIA_URL})
return render(request,'home.html', {'data': data})


Expand All @@ -78,8 +72,6 @@ def groups(request):
Groups page shows what the dev teams you are part of recent team member stats and achievements
"""
data = []
data.append({'MEDIA_URL': MEDIA_URL})
return render(request,'groups.html', {'data': data})

def achievements(request):
Expand All @@ -91,7 +83,7 @@ def achievements(request):
achievements = prologger_user.achievements.all()
print achievements
data = {}
data.update({'user': prologger_user})
data.update({'user': prologger_user.user})
data.update({'achievements': achievements})
return render(request,'achievements.html', data)

Expand Down

0 comments on commit 230506e

Please sign in to comment.