From e719fee06e86aa764d250009f8053274fc02d68e Mon Sep 17 00:00:00 2001
From: sanj <sanj@sanj>
Date: Sun, 31 Oct 2010 16:30:26 +0200
Subject: [PATCH] small changes

---
 rizk/egypt/models.py     | 13 +++++++++++--
 rizk/templates/rizk.html |  7 ++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/rizk/egypt/models.py b/rizk/egypt/models.py
index 651dfc4..6f52e96 100644
--- a/rizk/egypt/models.py
+++ b/rizk/egypt/models.py
@@ -18,7 +18,7 @@ class Location(models.Model):
   objects = models.GeoManager()
 
   def __unicode__(self):
-    return self.name
+    return self.id + ": " + self.name
 
   def geojson_as_dict(self):
     return {
@@ -92,6 +92,15 @@ class Image(models.Model):
       self.flickrData = json.dumps(ret)
       self.save()
       return ret
+
+  @classmethod
+  def getPhotoSet(kls, id):
+    ps = flickr.Photoset(id, 'foo', False)
+    for p in ps:
+      pass
+    return
+      
+
       
 class Event(models.Model):
   name = models.CharField(max_length=255)
@@ -100,7 +109,7 @@ class Event(models.Model):
   end_time = models.DateField()
 
   def __unicode__(self):
-    return self.name
+    return self.id + ": " + self.name
 
   def get_dict(self):
     return {
diff --git a/rizk/templates/rizk.html b/rizk/templates/rizk.html
index 36918cb..bdb768a 100644
--- a/rizk/templates/rizk.html
+++ b/rizk/templates/rizk.html
@@ -6,7 +6,7 @@
   <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." /> -->
   <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/jquery.tooltip.css" />
   <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]; %>
     <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 %>">
-        <img src="<%= vid.info.thumbnail %>" alt="<%= vid.info.description %>" />
+        <img width="100" height="100" src="<%= vid.info.thumbnail %>" alt="<%= vid.info.description %>" />
       </a> 
     </div>
   <% } %>
@@ -83,12 +83,13 @@
         {% for e in events %}
           <div class="event" data-id="{{ e.id }}" id="event_{{ e.id }}">
             <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 %}
             </div>
             <div class="eventDescription">
               {{ e.description }}
             </div>
+-->
           </div>
         {% endfor %}
       </div>