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

Merge branch 'jrouly'

merging
parents 92570890 90efdf6a
......@@ -13,79 +13,68 @@
<div class="row">
<div class="col-md-3">
<a href="#" class="thumbnail">
<img src="/static/img/avatar-org.png" alt="profile photo">
<img src="/static/img/logo2.png" alt="profile photo">
</a>
</div>
<div class="text-left col-md-3">
<h4 class="profile-heading">Name</h4>
<h2 class="profile-value">Abdullah Abdurrah Sahyouni</h2>
<h2 class="profile-value">{{requested_org.name}}</h2>
<h4 class="profile-heading">Location</h4>
<h2 class="profile-value">Fairfax, Honda</h2>
<h2 class="profile-value">{{requested_org.city}}</h2>
<h4 class="profile-heading">Favourite Colour</h4>
<h2 class="profile-value">Orange</h2>
</div>
<div class="col-md-6 text-left">
<h2>Previous Events</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam
posuere mi non sem tincidunt consequat. Mauris consectetur orci ligula.
Aliquam id felis bibendum, consectetur mi ut, dapibus ante. Ut a metus
et arcu commodo imperdiet. Donec eget odio malesuada, congue risus a,
mattis orci. Aenean vehicula dui auctor pulvinar eleifend. Nulla
adipiscing molestie dui, sit amet blandit purus tincidunt non. Duis
tempor orci eu purus mattis, in pretium purus placerat. Quisque eu nibh
rhoncus, malesuada nulla in, facilisis nisl. Nam sed urna at velit
ullamcorper aliquam. Vivamus tincidunt tempor nunc eget laoreet. Nulla
facilisi.</p>
{% for event in global_events %}
<p>{{ event }}</p>
{% endfor %}
</div>
</div>
<div class="row">
<div class="col-md-12 text-left">
<h2>Brief Biography</h2>
<p>Description of bullshit that might be relevant who the fuck actually
knows holy shit I need a beer. Lorem ipsum dolor sit amet, consectetur
adipiscing elit. Nullam posuere mi non sem tincidunt consequat. Mauris
consectetur orci ligula. Aliquam id felis bibendum, consectetur mi ut,
dapibus ante. Ut a metus et arcu commodo imperdiet. Donec eget odio
malesuada, congue risus a, mattis orci. Aenean vehicula dui auctor
pulvinar eleifend. Nulla adipiscing molestie dui, sit amet blandit
purus tincidunt non. Duis tempor orci eu purus mattis, in pretium purus
placerat. Quisque eu nibh rhoncus, malesuada nulla in, facilisis nisl.
Nam sed urna at velit ullamcorper aliquam. Vivamus tincidunt tempor
nunc eget laoreet. Nulla facilisi.</p>
<p>Nam molestie, nunc eget porta tristique, ipsum orci elementum nunc, et
ornare leo massa a ligula. Etiam ut quam blandit, sollicitudin neque
vel, adipiscing lectus. Curabitur viverra volutpat blandit. Sed
vehicula ipsum et dolor varius luctus. Cum sociis natoque penatibus et
magnis dis parturient montes, nascetur ridiculus mus. Aliquam erat
volutpat. Mauris porttitor, mauris in ultrices egestas, magna lorem
gravida elit, at varius odio nisl nec leo. Suspendisse egestas suscipit
mi eu scelerisque. Mauris nec tincidunt nisi. Nunc lectus nibh,
imperdiet ac porttitor nec, scelerisque sed orci. Nulla placerat sed
sapien ac tincidunt.</p>
<p>Nunc facilisis egestas massa non mattis. Nunc lacinia placerat augue id
dignissim. Suspendisse in justo quam. Ut quis purus et ipsum hendrerit
suscipit. Vivamus suscipit ullamcorper sagittis. Vestibulum vitae ante
sed mauris aliquet gravida eu a risus. In consectetur vitae mauris eu
varius. Curabitur sit amet condimentum arcu, iaculis scelerisque lacus.
Pellentesque molestie justo at neque porttitor pulvinar. </p>
<h2>Brief Description</h2>
<p>{{requested_org.description}}</p>
</div>
</div>
<div class="row">
<div class="col-md-6 text-left">
<h2>Schedule of Availability</h2>
<p>Description of bullshit that might be relevant who the fuck actually
knows holy shit I need a beer.</p>
{% if sunday > 2 %}
<p>sunday: Available</p>
{% endif %}
{% if monday > 2 %}
<p>monday: Available</p>
{% endif %}
{% if tuesday > 2 %}
<p>tuesday: Available</p>
{% endif %}
{% if wednesday > 2 %}
<p>wednesday: Available</p>
{% endif %}
{% if thursday > 2 %}
<p>thursday: Available</p>
{% endif %}
{% if friday > 2 %}
<p>friday: Available</p>
{% endif %}
{% if saturday > 2 %}
<p>saturday: Available</p>
{% endif %}
</div>
<div class="col-md-6 text-left">
<h2>Tags</h2>
<p>[Small Boys] [Roofalin] [Unsafe Sex]</p>
<p>
{% for tag in requested_tags %}
[{{ tag }}]
{% endfor %}
</p>
</div>
</div>
......
......@@ -45,22 +45,8 @@
<div class="col-md-6 text-left">
<h2>Schedule of Availability</h2>
{% if sunday > 2 %}
<p>sunday: Available
{% if '0' in sunday %}
morning
{% endif %}
{% if '1' in sunday %}
afternoon
{% endif %}
{% if '2' in sunday %}
evening
{% endif %}
{% if '3' in sunday %}
night
{% endif %}
</p>
<p>sunday: Available</p>
{% endif %}
</p>
{% if monday > 2 %}
<p>monday: Available</p>
{% endif %}
......
......@@ -98,7 +98,6 @@ def opportunity(request, slug):
@login_required
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.all(),
#"global_tags" : Tag.objects.all(),
......@@ -117,7 +116,17 @@ def person(request, slug):
@login_required
def organization(request, slug):
return render_to_response('organization.html', {
# put the variables you need here
"requested_org" : Organization.objects.get(user__username=slug),
"requested_tags" : Organization.objects.get(user__username=slug).tags.all(),
#"global_tags" : Tag.objects.all(),
"global_events" : Opportunity.objects.all(),
"sunday" : len(Organization.objects.get(user__username=slug).sunday),
"monday" : len(Organization.objects.get(user__username=slug).monday),
"tuesday" : len(Organization.objects.get(user__username=slug).tuesday),
"wednesday" : len(Organization.objects.get(user__username=slug).wednesday),
"thursday" : len(Organization.objects.get(user__username=slug).thursday),
"friday" : len(Organization.objects.get(user__username=slug).friday),
"saturday" : len(Organization.objects.get(user__username=slug).saturday),
},
context_instance = RequestContext(request),
)
......
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