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

merged

Browse Source
This commit is contained in:
Johnson Chetty 2014-01-22 09:14:20 +01:00
commit 033f5a8ea4
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
itf/frontpage/views.py
View File

@ -9,6 +9,7 @@ from django.forms.widgets import Textarea
from django.utils.html import urlize from django.utils.html import urlize
from django.core.mail import send_mail from django.core.mail import send_mail
from django.views.decorators.cache import cache_page from django.views.decorators.cache import cache_page
from utils import get_latest_tweets
class ContactForm(forms.Form): class ContactForm(forms.Form):
name = forms.CharField(max_length=255) name = forms.CharField(max_length=255)
@ -36,14 +37,13 @@ class ContactForm(forms.Form):
#@cache_page(60 * 30) #@cache_page(60 * 30)
def index(request): def index(request):
try: try:
tApi = twitter.Api() statuses = get_latest_tweets()
statuses = tApi.GetUserTimeline(TWITTER_ID)[0:3]
except: except:
statuses = [] statuses = []
boxes = SliderBox.objects.filter(is_displayed=True) boxes = SliderBox.objects.filter(is_displayed=True)
front_images = FrontImage.objects.filter(is_active=True)[0:3] front_images = FrontImage.objects.filter(is_active=True)[0:3]
return render_to_response("noel/index.html", RequestContext(request, { return render_to_response("noel/index.html", RequestContext(request, {
'tweets': [urlize(s.text) for s in statuses], 'tweets': [urlize(s['text']) for s in statuses],
'boxes': boxes, 'boxes': boxes,
'front_images': front_images 'front_images': front_images
})) }))

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

@ -148,7 +148,7 @@ $(function() {
</div> </div>
<div class="productionEachTextA"> <div class="productionEachTextA">
{{ p.role }}: <a href="{{ p.person.get_absolute_url }}">{{ p.person.first_name }} {{ p.person.last_name }}</a> <b>{{ p.role|title }}:</b> <a href="{{ p.person.get_absolute_url }}">{{ p.person.first_name }} {{ p.person.last_name }}</a>
<div> <div>
{{ p.person.about|truncatewords:80 }} {{ p.person.about|truncatewords:80 }}
</div> </div>
@ -204,6 +204,7 @@ $(function() {
</form> </form>
<script> <script>
$('#id_honeypot').closest('p').hide(); $('#id_honeypot').closest('p').hide();
$('#id_url').closest('p').hide();
</script> </script>
</div> </div>

5
itf/templates/noel/index.html
View File

@ -66,11 +66,12 @@
</div> </div>
</div> </div>
</div> </div>
<a href="/m/events">
<div id="events" class="tab"> <div id="events" class="tab">
<h3 class="tabHeader">EVENTS</h3> <h3 class="tabHeader">EVENTS</h3>
<a href="/page/events-coming-soon/" class="buttonTab"> Coming Soon </a> <!-- <a href="/page/events-coming-soon/" class="buttonTab"> Coming Soon </a> -->
</div> </div>
</a>
<div id="slider"> <div id="slider">
<img src="/static/images/noel/arrow-lft.png" width="27" height="39" alt="arrow-left" id="arrowLeft"> <img src="/static/images/noel/arrow-lft.png" width="27" height="39" alt="arrow-left" id="arrowLeft">