Skip to content

Commit

Permalink
adding science view (doing nothing)
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielmarcondes committed Jul 24, 2012
1 parent 74a3934 commit eb1ad28
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 0 deletions.
4 changes: 4 additions & 0 deletions groupsite/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ def news_view(request, news_id):
{'news':news, 'user':request.user}
)

def science_view(request):
return render_to_response("gmaoscience.html", {})


def people(request):
all_people = People.objects.all()
return render_to_response("gmaopeople.html", {'people':all_people, 'user':request.user})
Expand Down
18 changes: 18 additions & 0 deletions templates/gmaoscience.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{% extends 'gmaobase.html' %}

{% block pagebanner %}
<h2>Ciência</h2>
{% endblock %}

{% block body %}
<div class="news">
<div class="container">
<div class="row"><br>
<div class="span12">
<p>Oi</P>
</div>
</div>
</div>
</div>
{% endblock %}

1 change: 1 addition & 0 deletions urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
url(r'^gmao/people/$', 'groupsite.views.people'),
url(r'^gmao/news/$', 'groupsite.views.news'),
url(r'^gmao/news/(.*)/$', 'groupsite.views.news_view'),
url(r'^gmao/scientific_data/$', 'groupsite.views.science_view'),
url(r'^gmao/login/$', 'django.contrib.auth.views.login', {'template_name' : 'gmaologin.html'}),
url(r'^gmao/logout/$', 'django.contrib.auth.views.logout_then_login', {'login_url' : '/gmao/login/'}),

Expand Down

0 comments on commit eb1ad28

Please sign in to comment.