Commit 8f216970 authored by Jean Michel Rouly's avatar Jean Michel Rouly
Browse files

Merge branch 'jrouly'

asdflkn
parents 4e0dce88 9f5feaf5
......@@ -44,18 +44,32 @@
<div class="row">
<div class="col-md-6 text-left">
<h2>Schedule of Availability</h2>
<p>sunday: {{sunday}}</p>
<p>monday: {{monday}}</p>
<p>tuesday: {{tuesday}}</p>
<p>wednesday: {{wednesday}}</p>
<p>thursday: {{thursday}}</p>
<p>friday: {{friday}}</p>
<p>saturday: {{saturday}}</p>
{% if sunday %}
<p>sunday: {{sunday}}</p>
{% endif %}
{% if monday %}
<p>monday: {{monday}}</p>
{% endif %}
{% if tuesday %}
<p>tuesday: {{tuesday}}</p>
{% endif %}
{% if wednesday %}
<p>wednesday: {{wednesday}}</p>
{% endif %}
{% if thursday %}
<p>thursday: {{thursday}}</p>
{% endif %}
{% if friday %}
<p>friday: {{friday}}</p>
{% endif %}
{% if saturday %}
<p>saturday: {{saturday}}</p>
{% endif %}
</div>
<div class="col-md-6 text-left">
<h2>Tags</h2>
<p>
{% for tag in global_tags %}
{% for tag in requested_tags %}
[{{ tag }}]
{% endfor %}
</p>
......
......@@ -72,8 +72,8 @@ def person(request, slug):
return render_to_response('person.html', {
"current_user" : request.user,
"requested_user" : Person.objects.get(user__username=slug),
#"requested_tags" : Person.objects.get(user__username=slug).tags,
"global_tags" : Tag.objects.all(),
"requested_tags" : Person.objects.get(user__username=slug).tags.all(),
#"global_tags" : Tag.objects.all(),
"global_events" : Opportunity.objects.all(),
"sunday" : Person.objects.get(user__username=slug).sunday,
"monday" : Person.objects.get(user__username=slug).monday,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment