CAMP/itf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Johnson Chetty 2013-09-19 02:48:34 +02:00
commit 654a9a92e8
12 changed files with 192 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
itf/app/models.py
View File

@ -115,6 +115,17 @@ class ItfModel(models.Model):
return d
def get_gallery_image(self):
from mediagallery.models import Photo
if self.galleries:
qset = Photo.objects.filter(album__in=self.galleries.all())
if qset.count() == 0:
return None
else:
return qset[0].image
else:
return None
def get_videos(self):
from mediagallery.models import YoutubeVideo
@ -145,7 +156,10 @@ class ItfModel(models.Model):
#Get the ModuleTab object associated with this object.
def get_tab(self):
modelextra = self.get_modelextra()
tab = ModuleTab.objects.filter(model=modelextra)[0]
if modelextra:
tab = ModuleTab.objects.filter(model=modelextra)[0]
else:
tab = ModuleTab.objects.all()[0] #FIXME!!!
return tab
@ -182,7 +196,10 @@ class ItfModel(models.Model):
except:#FIXME: ideally catch only MultipleObjectsReturned (figure out where to import that from :/ ) #FUCKING way ugly hack to get clashing model ctype names with django internal models working (get_real_ctypes simply checks, if there are multiple content objects with the same 'module_name', which one is_itf_model, and returns that).
ctype = get_real_ctype(self.__class__._meta.module_name)
# modelextra = ModelExtra.objects.filter(model=ctype)[0]
modelextra = ctype.modelextra_set.all()[0]
try:
modelextra = ctype.modelextra_set.all()[0]
except:
modelextra = None
return modelextra
'''
@ -234,12 +251,13 @@ class ItfModel(models.Model):
imgfield = self.get_modelextra().default_image
if imgfield:
try:
thumb = get_thumbnail(imgfield, size, crop="center").url
except:
thumb = ''
#try:
thumb = get_thumbnail(imgfield, size, crop="center").url
#except:
# print imgfield.url
# thumb = 'http://placehold.it/%s' % size
else:
thumb = '' # Add default image for site
thumb = 'http://placehold.it/%s' % size # Add default image for site
return {
'thumb': thumb
}

3
itf/events/models.py
View File

@ -56,6 +56,9 @@ class Event(ItfModel):
def get_title(self):
return self.__unicode__()
def main_image(self):
return self.image
def get_dict(self):
# links = self.connections.all().order_by('link_type')
# link_keys = self.connections.all().values_list['link_type'].distinct()

1
itf/itfprofiles/admin.py
View File

@ -52,6 +52,7 @@ class CityAdmin(admin.ModelAdmin):
admin.site.register(Occupation, OccupationAdmin)
admin.site.register(GroupOccupation)
admin.site.register(Relation, RelationAdmin)
admin.site.register(TheatreGroup, TheatreGroupAdmin)
admin.site.register(Person)

14
itf/itfprofiles/models.py
View File

@ -76,6 +76,9 @@ class Person(ItfModel):
def get_title(self):
return self.__unicode__()
def main_image(self):
return self.image
def get_dict(self):
#lconnections = [obj for obj in self.connections.all()]
#rconnections = [ obj for obj in PersonPerson.objects.filter(person2=self)
@ -435,6 +438,9 @@ class Production(ItfModel):
return True
return self.group.user_has_perms(user)
def main_image(self):
return self.get_gallery_image()
def get_people(self):
persons = [{"person":self.director, "role":"director", "assoc_type":'production', "assoc_name":self.name },
{"person":self.playwright, "role":"playwright", "assoc_type":'production', "assoc_name":self.name }
@ -449,9 +455,13 @@ class Production(ItfModel):
def get_dict(self):
from events.models import Event
rel_level1 = [obj for obj in Production.objects.filter(script=self.script)]
rel_level2 = list(set(obj.production_set.all() for obj in self.script.related_scripts.all()))
shows = Event.objects.filter(production=self).order_by('-start_date')
last_date = None
if shows.count() > 0:
last_date = shows[0].start_date
return {
'name': self.name,
'anecdotes': self.anecdotes,
@ -461,8 +471,10 @@ class Production(ItfModel):
'script': self.script,
'synopsis': self.synopsis,
'awards': [ obj for obj in self.awards.all()],
'shows': shows,
'languages': [ obj for obj in self.languages.all()],
'debut_date':self.debut_date,
'last_date': last_date,
'sibling_productions': rel_level1,
'related_productions' : rel_level2,
'people': self.get_people()

14
itf/static/css/noel/main.css
View File

@ -272,7 +272,13 @@ cursor:pointer;
z-index:2;
clear:both;}
#loginMenu li
#loginMenu li.usernameDisplay {
float: left;
display: inline;
padding: 6px 6px;
}
#loginMenu li.loginTab
{display:inline;
float:left;
background-color:#FFF;
@ -288,16 +294,16 @@ border-top-left-radius:8px;
-webkit-box-shadow:0px -1px 3px #d4d4d4;
box-shadow:0px -1px 3px #d4d4d4;}/*not converted to links*/
#loginMenu li a, #loginMenu li a:link, #loginMenu li a:visited, #loginMenu li a:active
#loginMenu li.loginTab a, #loginMenu li.loginTab a:link, #loginMenu li.loginTab a:visited, #loginMenu li.loginTab a:active
{text-decoration:none;
color:#ff8400;}
#loginMenu li:hover
#loginMenu li.loginTab:hover
{color:#FFF;
background-color:#f7bd00;
border:1px solid transparent;}
#loginMenu li:hover a
#loginMenu li.loginTab:hover a
{color:#FFF;}
.loginMenuSelected

4
itf/templates/modules/itfprofiles/person.html
View File

@ -145,7 +145,7 @@ $(function() {
{% for group in groups %}
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ group.group.get_main_image.thumb }}" alt="{{ group.group.name }}" />
</div>
<div class="productionEachTextA">
@ -220,7 +220,7 @@ $(function() {
{% for p in productions %}
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ p.production.get_main_image.thumb }}" alt="{{ p.production.name }}" />
</div>
<div class="productionEachTextA">

226
itf/templates/modules/itfprofiles/production.html
View File

@ -10,7 +10,7 @@ $(function() {
</script>
<ul class="tabsInnerRight">
<li><a href="#calendar">Calendar</a></li>
{% if shows %}<li><a href="#calendar">Calendar</a></li>{% endif %}
<li><a href="#about">About</a></li>
<li><a href="#cast">Cast and Crew</a></li>
<li><a href="#gallery">Gallery</a></li>
@ -18,126 +18,156 @@ $(function() {
<li><a href="#notes">Notes</a></li>
</ul>
{% if shows %}
<div id="calendar" class="tab_content">
<h3>{{ name }}</h3>
(to be implemented)
<table width="520" border="1" cellspacing="0" cellpadding="0" class="tableCalendar">
<tr>
<td>Date</td>
<td>Time</td>
<td>Venue, City</td>
<td class="orangeNoBold">Book Now/Full</td>
</tr>
<tr>
<td>Date</td>
<td>Time</td>
<td>Venue, City</td>
<td class="orangeNoBold">Book Now/Full</td>
</tr>
<tr>
<td>Date</td>
<td>Time</td>
<td>Venue, City</td>
<td class="orangeNoBold">Book Now/Full</td>
</tr>
<tr>
<td>Date</td>
<td>Time</td>
<td>Venue, City</td>
<td class="orangeNoBold">Book Now/Full</td>
</tr>
{% for show in shows %}
<tr>
<td>
{{ show.start_date|date:"d M, Y" }}
</td>
<td>
{{ show.start_time|time:"P" }}
</td>
<td>
{{ show.city.name }}
</td>
<td>
{% if show.booking_link %}
<a href="{{ show.booking_link }}" target="_blank">Book now</a>
{% else %}
<a href="{{ show.get_absolute_url }}" target="_blank">More details</a>
{% endif %}
</td>
</tr>
{% endfor %}
</table>
<a href="" class="toggleLink rightFloat">More&gt;&gt;</a>
<!-- <a href="" class="toggleLink rightFloat">More&gt;&gt;</a> -->
</div> <!-- end div calendar -->
{% endif %}
<div id="about" class="tab_content">
<h3 class="borderYellow paddingBottom">{{ name }}</h3>
{% if group %} <div class="paddingTop"><strong>Group: </strong>{{ group.name }}</div> {% endif %}
<div><strong>Languages: </strong>Hindi, English, etc.</div>
<div>From 2011 to 2013</div>
<div><strong>No of Shows: </strong>range/number</div>
{% if languages %}
<div><strong>Languages: </strong>
{% for language in languages %}
{{ language.name }}
{% endfor %}
</div>
{% endif %}
<div>From {{ debut_date|date:"Y" }} {% if last_date %} - {{ last_date|date:"Y" }} {% endif %}</div>
{% comment %}
<div><strong>No of Shows: </strong> </div>
<div class="borderYellow"> <a href="" class="toggleLink rightFloat">Book Now>></a>
<br /><br />
</div>
{% endcomment %}
<br />
<div><strong>Writers: </strong> Name (playwright), name (adaptation), name (translation)</div>
<div><strong>Director: </strong>Hindi, English, etc.</div>
<div><strong>Credits: name (research), name (music)</strong></div>
<div class="borderYellow"> <a href="" class="toggleLink rightFloat">See full credits>></a><br /><br /></div>
{% if playwright %}
<div><strong>Writer: </strong>
<a href="{{ playwright.get_absolute_url }}" target="_blank">
{{ playwright }}
</a>
</div>
{% endif %}
{% if director %}
<div><strong>Director: </strong>
<a href="{{ director.get_absolute_url }}" target="_blank">
{{ director }}
</a>
</div>
{% endif %}
<!-- <div><strong>Credits: name (research), name (music)</strong></div> -->
<div class="borderYellow"> <a href="javascript:$('a[href=#cast]').click();" class="rightFloat">See full credits>></a><br /><br /></div>
<br />
<div>
<p>Some copy here that is a synopsis in a paragraph. Some copy here that is a synopsis in a paragraph.
Some copy here that is a synopsis in a paragraph. Some copy here that is a synopsis in a paragraph.</p>
<p>
{{ synopsis|linebreaksbr }}
</p>
</div>
<div class="borderYellow">
<a href="">Contact</a>
<div>Group website</div>
<!-- <a href="">Contact</a> -->
{% if group.website %}
<div>Group website: <a href="{{ group.website }}" target="_blank">{{ group.website }}</a> </div>
{% endif %}
<br />
</div>
<br />
{% if awards %}
<div class="borderYellow">
<h5 class="orangeInnerRight">Awards</h5>
<div>Name of award, name of awardee, year, link</div>
<div>Name of award, name of awardee, year, link</div>
<div>Name of award, name of awardee, year, link</div>
<div>Name of award, name of awardee, year, link</div>
{% for award in awards %}
<div>
{{ award.title }}
{% if award.year %},
{{ award.year }}
{% endif %}
{% if award.link %},
<a href="{{ award.link }}" target="_blank">link</a>
{% endif %}
</div>
{% endfor %}
<br />
</div>
{% endif %}
<br />
<h5 class="orangeInnerRight">Links</h5>
<a href="">Link to article</a>
<div>One line desc</div>
<br />
<a href="">Link to article</a>
<div>One line desc</div>
<br />
<a href="">Link to article</a>
<div>One line desc</div>
<br />
</div> <!-- end about -->
<div id="cast" class="tab_content">
<h5 class="orangeInnerRight">Cast and Crew</h5>
<br />
{% if people %}
{% for p in people %}
<div class="productionEach">
<div class="productionEachImg">
<img src="{{ p.person.get_main_image.thumb }}" alt="/static/images/150x150.jpg" />
</div>
<div class="productionEachTextA">
{{ p.role }}: <a href="{{ p.person.get_absolute_url }}">{{ p.person.first_name }} {{ p.person.last_name }}</a>
<div>
{{ p.person.about|truncatewords:80 }}
</div>
<!-- <div></div> -->
</div>
<div class="clear"></div>
</div> <!-- end production each -->
{% endfor %}
{% endif %}
</div>
<div id="gallery" class="tab_content">
{% include 'includes/media_gallery.html' %}
<h3 class="orange">Links</h3>
<div><a href="">Link</a></div>
<div><a href="">Link</a></div>
<div><a href="">Link</a></div>
<div><a href="">Link</a></div>
<a href="" class="rightFloat">More>></a>
</div> <!-- end gallery -->
<div id="buzz" class="tab_content">
{% include 'includes/buzzitems.html' %}
<!-- <h3 class="orangeInnerRight">Reviews</h3>
<a href="">Link to article</a>
<div>One line desc</div>
<br />
<a href="">Link to article</a>
<div>One line desc</div>
<br />
<a href="">Link to article</a>
<div>One line desc</div>
<br />
<a href="" class="rightFloat">More>></a> -->
<br />
{% load comments %}
@ -159,21 +189,22 @@ $(function() {
<div class="addComments">
<h4>Your comments</h4>
<div id="comment_form">
{% get_comment_form for obj as form %}
<form action="{% comment_form_target %}" method="post">
{% csrf_token %}
<input type="hidden" name="next" value="{{ obj.get_absolute_url }}#buzz" />
{{ form.as_p }}
<p class="submit">
<input type="submit" name="post" class="submit-post" value="Post" />
</p>
<div id="comment_form">
{% get_comment_form for obj as form %}
<form action="{% comment_form_target %}" method="post">
{% csrf_token %}
<input type="hidden" name="next" value="{{ obj.get_absolute_url }}#buzz" />
{{ form.as_p }}
<p class="submit">
<input type="submit" name="post" class="submit-post" value="Post" />
</p>
</form>
<script>
$('#id_honeypot').closest('p').hide();
</script>
</form>
<script>
$('#id_honeypot').closest('p').hide();
</script>
</div>
</div>
{% else %}
<div class="addComments">
@ -181,30 +212,6 @@ $(function() {
</div>
{% endif %}
<!-- <div class="borderYellow">-->
<!-- <div>Comments Comments Comments Comments Comments Comments</div>-->
<!-- <div class="rightFloat">-Posted by date, time</div>-->
<!-- <br /><br />-->
<!-- </div>-->
<!-- <div class="borderYellow">-->
<!-- <br />-->
<!-- <div>Comments Comments Comments Comments Comments Comments</div>-->
<!-- <div class="rightFloat">-Posted by date, time</div>-->
<!-- <br /><br />-->
<!-- </div>-->
<!-- <div class="borderYellow">-->
<!-- <br />-->
<!-- <div>Comments Comments Comments Comments Comments Comments</div>-->
<!-- <div class="rightFloat">-Posted by date, time</div>-->
<!-- <br /><br />-->
<!-- </div>-->
<!-- <br />-->
<!-- <a href="" class="rightFloat">More>></a>
-->
</div> <!-- end buzz -->
<div id="notes" class="tab_content">
@ -213,6 +220,5 @@ $(function() {
<script type="text/javascript" src="/static/js/innertabs.js"></script>
<br />
<a href="{{ edit_url }}">Edit</a>

10
itf/templates/modules/itfprofiles/theatregroup.html
View File

@ -122,7 +122,7 @@
{% for p in people %}
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ p.person.get_main_image.thumb }}" alt="/static/images/150x150.jpg" />
</div>
<div class="productionEachTextA">
@ -149,7 +149,7 @@
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ p.person.get_main_image.thumb }}" alt="{{ p.person }}" />
</div>
<div class="productionEachTextA">
@ -179,14 +179,14 @@
{% for p in productions %}
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ p.get_main_image }}" alt="{{ p.name }}" />
</div>
<div class="productionEachTextA">
<div class="orangeInnerRight">{{ p.name }} {% if p.debut_date %} {{ debut_date|date:"Y" }} {% endif %}</div>
<!-- <div>Group: Group Name</div> -->
<div><em>Title Credits: (not implemented)</em></div>
<div>No. of shows: (not implemented)</div>
<!-- <div><em>Title Credits: (not implemented)</em></div>
<div>No. of shows: (not implemented)</div> -->
</div>
<div class="clear"></div>

10
itf/templates/modules/scriptbank/script.html
View File

@ -53,7 +53,7 @@ $(function() {
<a href="" class="toggleLink">Adaptation License: {{ license_adapt.name }}</a>
<div class="toggleDiv">
<p>{{ license_adapt.short_description }} <span style="color:red;">Does this need to be an accordion?</span></p>
<p>{{ license_adapt.short_description|linebreaksbr }} <span style="color:red;">Does this need to be an accordion?</span></p>
<a href="{{ license_adapt.legal_file.url }}" target="_blank" class="block">Read legal version</a>
</div>
@ -62,7 +62,7 @@ $(function() {
<a href="" class="toggleLink">Performance License: {{ license_perform.name }}</a>
<div class="toggleDiv">
<p>{{ license_perform.short_description }} </p>
<p>{{ license_perform.short_description|linebreaksbr }} </p>
<a href="{{ license_perform.legal_file.url }}" target="_blank" class="block">Read legal version</a>
</div>
@ -83,7 +83,7 @@ $(function() {
{% for p in sibling_productions %}
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ p.get_main_image.thumb }}" alt="{{ p.name }}" />
</div>
<div class="productionEachTextA">
@ -121,7 +121,7 @@ $(function() {
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ p.get_main_image.thumb }}" alt="{{ p.name }}" />
</div>
<div class="productionEachTextA">
@ -157,7 +157,7 @@ $(function() {
{% for r in related_people %}
<div class="productionEach">
<div class="productionEachImg">
<img src="" alt="/static/images/150x150.jpg" />
<img src="{{ r.person.get_main_image.thumb }}" alt="{{ r.person.first_name }} {{ r.person.last_name }}" />
</div>
<div class="productionEachTextA">

9
itf/templates/noel/base.html
View File

@ -48,13 +48,14 @@
<ul id="loginMenu">
{% if user.is_authenticated %}
<li><a href="/accounts/logout">Logout</a></li>
<li class="usernameDisplay">Hi {{ user.username }}</li>
<li class="loginTab"><a href="/accounts/logout">Logout</a></li>
{% else %}
<li><a href="/accounts/login">Login</a></li>
<li><a href="/accounts/signup">Register</a></li>
<li class="loginTab"><a href="/accounts/login">Login</a></li>
<li class="loginTab"><a href="/accounts/signup">Register</a></li>
{% endif %}
<li><a href="/contact">Contact Us</a></li>
<li class="loginTab"><a href="/contact">Contact Us</a></li>
</ul>
</div>

7
itf/templates/search/search.html
View File

@ -33,8 +33,10 @@
<h2>YOUR RESULTS:</h2>
<p>
{% for result in page.object_list %}
<a href="{{ result.object.get_absolute_url }}&amp;search={{ query }}">{{ result.object.title }}</a>
{{ result.text|truncatewords:60|markdown|safe }}
<a href="{{ result.object.get_absolute_url }}&amp;search={{ query }}">{{ result.object }}</a>
{{ result.text|truncatewords:60|markdown|striptags }}
</p>
@ -42,7 +44,6 @@
{% empty %}
<p class="noResults">No results found.</p>
{% endfor %}
{% else %}
{# Show some example queries to run, maybe query syntax, something else? #}
{% endif %}

2
itf/templates/test/person_form.html
View File

@ -177,7 +177,7 @@ $(function(){
Please correct the errors below and re-submit.
</div>
{% endif %}
<form id="formItf" action="" class="uniForm" method="POST">
<form id="formItf" action="" class="uniForm" method="POST" enctype="multipart/form-data">
{% csrf_token %}
<div>
<!-- <input type="hidden" data-placeholder="Choose Connections" id="id_connections" name="connections" style="width:600px" /> -->