small changes

This commit is contained in:
sanj 2010-10-31 16:30:26 +02:00
parent 7fc26b6e55
commit e719fee06e
2 changed files with 15 additions and 5 deletions

View File

@ -18,7 +18,7 @@ class Location(models.Model):
objects = models.GeoManager() objects = models.GeoManager()
def __unicode__(self): def __unicode__(self):
return self.name return self.id + ": " + self.name
def geojson_as_dict(self): def geojson_as_dict(self):
return { return {
@ -93,6 +93,15 @@ class Image(models.Model):
self.save() self.save()
return ret return ret
@classmethod
def getPhotoSet(kls, id):
ps = flickr.Photoset(id, 'foo', False)
for p in ps:
pass
return
class Event(models.Model): class Event(models.Model):
name = models.CharField(max_length=255) name = models.CharField(max_length=255)
description = models.TextField(blank=True) description = models.TextField(blank=True)
@ -100,7 +109,7 @@ class Event(models.Model):
end_time = models.DateField() end_time = models.DateField()
def __unicode__(self): def __unicode__(self):
return self.name return self.id + ": " + self.name
def get_dict(self): def get_dict(self):
return { return {

View File

@ -6,7 +6,7 @@
<meta name="title" content="Vertical Urbanism" /> <meta name="title" content="Vertical Urbanism" />
<meta name="description" content="This site maps the landscapes of elevated road highways flyovers and elevated pedestrian walkways skywalks across the Mumbai Metropolitan Region in Western India." /> --> <meta name="description" content="This site maps the landscapes of elevated road highways flyovers and elevated pedestrian walkways skywalks across the Mumbai Metropolitan Region in Western India." /> -->
<link rel="stylesheet" type="text/css" href="/static/css/rizk.css" /> <link rel="stylesheet" type="text/css" href="/static/css/rizk.css" />
<title>Placeholder for Title</title> <title>Intifadat</title>
<link rel="stylesheet" type="text/css" href="/static/css/colorbox.css" /> <link rel="stylesheet" type="text/css" href="/static/css/colorbox.css" />
<link rel="stylesheet" type="text/css" href="/static/css/jquery.tooltip.css" /> <link rel="stylesheet" type="text/css" href="/static/css/jquery.tooltip.css" />
<script type="text/javascript" src="/static/js/jquery.js"></script> <script type="text/javascript" src="/static/js/jquery.js"></script>
@ -42,7 +42,7 @@
<% for (var i=0; i<videos.length;i++) { var vid = videos[i]; %> <% for (var i=0; i<videos.length;i++) { var vid = videos[i]; %>
<div class="videoWrapper"> <div class="videoWrapper">
<a href="<%= vid.url %>" target="_blank" class="youtubeVideo mediaThumb" title="<%= vid.info.description %>" data-id="<%= vid.id %>" data-event="<%= vid.event.id %>" data-location="<%= vid.location.id %>" rel="group_<%= vid.id %>"> <a href="<%= vid.url %>" target="_blank" class="youtubeVideo mediaThumb" title="<%= vid.info.description %>" data-id="<%= vid.id %>" data-event="<%= vid.event.id %>" data-location="<%= vid.location.id %>" rel="group_<%= vid.id %>">
<img src="<%= vid.info.thumbnail %>" alt="<%= vid.info.description %>" /> <img width="100" height="100" src="<%= vid.info.thumbnail %>" alt="<%= vid.info.description %>" />
</a> </a>
</div> </div>
<% } %> <% } %>
@ -83,12 +83,13 @@
{% for e in events %} {% for e in events %}
<div class="event" data-id="{{ e.id }}" id="event_{{ e.id }}"> <div class="event" data-id="{{ e.id }}" id="event_{{ e.id }}">
<div class="eventName">{{ e.name }}</div> <div class="eventName">{{ e.name }}</div>
<div class="eventDate">{{ e.start_time }} <!-- <div class="eventDate">{{ e.start_time }}
{% ifnotequal e.start_time e.end_time %} - {{ e.end_time }} {% endifnotequal %} {% ifnotequal e.start_time e.end_time %} - {{ e.end_time }} {% endifnotequal %}
</div> </div>
<div class="eventDescription"> <div class="eventDescription">
{{ e.description }} {{ e.description }}
</div> </div>
-->
</div> </div>
{% endfor %} {% endfor %}
</div> </div>