merged

itf/events/models.py

@@ -105,7 +105,8 @@ class Event(ItfModel):
         if self.groups.all():
             groups= {
             'venue': [ obj.group for obj in self.groupevent_set.filter(typ='venue')],           
-            'performing':  [ obj.group for obj in self.groupevent_set.filter(typ='performing')]
+            'performing':  [ obj.group for obj in self.groupevent_set.filter(typ='performing')],
+            'organizers':  [ obj.group for obj in self.groupevent_set.filter(typ='organizers')]
             }
             rdict['groups']= groups
             rdict['has_people_tab'] = True
@@ -137,6 +138,7 @@ class PersonEvent(models.Model):
 GROUP_EVENT_CHOICES = (
     ('venue', 'Venue'),
     ('performing', 'Performing'),
+    ('organizers', 'Organizers'),
 )
 
 class GroupEvent(models.Model):

itf/templates/modules/events/event.html

@@ -29,26 +29,23 @@ $(function() {
 </ul>    
 
 <div id="about" class="tab_content">
-    <h3>{{ title }}</h3>
+    <h3>{{ title }}</h3>    
-    
+    <div><i> {{ oneliner }}</i></div>
-    <div><strong>Tag-line: </strong> {{ oneliner }}</div>
+    <br/>
-    <div><strong>Description: </strong> {{ description }} </div>
+    <div>Type of Event: {{ event_type }}</div> <br/>
-    <div><strong>Event Type: </strong> {{ event_type }}</div>
+    <div> {{ description }} </div>
-    <div><strong>Address:</strong> {{ address }}</div>
+    <br />
-    <div><strong>City:</strong> {{ city }}</div>
+    <div> {{ start_date|date:"jS M, Y" }} - {{ start_date|date:"jS M, Y" }} </div>
-    <div><strong>Start date:</strong> {{ start_date|date:"jS M, Y" }}</div>
     {% if start_time %}
-    <div><strong>Start time:</strong> {{ start_time|time:"P" }}</div>
+    <div> {{ start_time|time:"P" }} - {{ end_time|time:"P" }}</div>
     {% endif %}
-    {% if end_date %}
+    <br/>
-    <div><strong>End date:</strong> {{ end_date|date:"jS M, Y" }}</div>
+    <div> {{ address }} </div>
-    {% endif %}
+    <br/>
-    {% if end_time %}
+    <div> {{ city }}</div>
-    <div><strong>End time:</strong> {{ end_time|time:"P" }}</div>
+    <br/>
-    {% endif %}
-
     {% if booking_link %}
-    <div><strong>Booking Link: </strong><a href="{{ booking_link }}" target="_blank">{{ booking_link }}</a></div>
+    <div>For bookings, please visit: <a href="{{ booking_link }}" target="_blank">{{ booking_link }}</a></div>
     {% endif %}
 
 </div> <!-- end div about  -->
@@ -136,6 +133,28 @@ $(function() {
         {% endfor %}
     {% endif %}
 
+    {% if groups.organizers %}
+    <h5>Organizing Groups</h5>
+
+    {% for group in groups.organizers %}
+
+    <div class="productionEach">
+        <div class="productionEachImg">
+            <img src="{{ group.get_image }}" alt="{{ group.name }}" />
+        </div>
+	
+	    <div class="productionEachTextA">
+	        <a href="{{ group.get_absolute_url }}">{{ group.name }}</a>
+	        <div>{{ group.locations.0.city.name }}</div>
+	    </div>
+        <div class="clear"></div> 
+  
+    </div> <!-- end production each -->
+
+    {% endfor %}    
+
+    {% endif %}
+
     {% if groups.performing %}
     <h5>Groups Performing</h5>
     
@@ -157,6 +176,28 @@ $(function() {
     {% endfor %}    
     {% endif %}
 
+    {% if groups.venue %}
+    <h5>Groups Venue</h5>
+
+    {% for group in groups.venue %}
+
+    <div class="productionEach">
+        <div class="productionEachImg">
+            <img src="{{ group.get_image }}" alt="{{ group.name }}" />
+        </div>
+	
+	    <div class="productionEachTextA">
+	        <a href="{{ group.get_absolute_url }}">{{ group.name }}</a>
+	        <div>{{ group.locations.0.city.name }}</div>
+	    </div>
+        <div class="clear"></div> 
+  
+    </div> <!-- end production each -->
+
+    {% endfor %}    
+
+    {% endif %}
+
 
 </div>
 

itf/templates/noel/base.html

@@ -73,9 +73,9 @@
     </ul>
     {% endfor %}
   <div style="clear:both;"></div>
-  <p id="supportedBy" style="text-align:center;font-size:10px;">
+  <p id="supportedBy" style="text-align:center;font-size:11px;">
-    Supported by Ministry of Culture (Government of India) under the Cultural Functions Grant Scheme <br />
+    <b>Supported by Ministry of Culture (Government of India) under the Cultural Functions Grant Scheme</b> <br />
-    <img width="180" src="/static/images/moc_logo.gif" />
+    <img width="150" src="/static/images/moc_logo.gif" />
   </p>
   <p id="copyright">&copy; 2011 India Theatre Forum. All Rights Reserved.</p>
 </div>