merged

itf/app/models.py

@@ -88,6 +88,8 @@ class ItfModel(models.Model):
 
 
   def get_main_image(self):
+    if not hasattr(self, 'main_image'):
+        return {'thumb': None} #FIXME
     main_image = self.main_image
     if type(main_image).__name__ == 'function':
         main_image = main_image()

itf/templates/modules/emailer/emailerissue.html

@@ -1,11 +1,13 @@
+{% load markup %}
+<link rel="stylesheet" href="/static/css/modules/emailer.css" />
 <div id="wrapperEmailer">
 
 	<div id="headerEmailer">
 
 		<img src="logoItfSmall.jpg" width="125" height="34" alt="logo-itf-small" id="logoItfSmall"><!-- LOGO ITF SMALL -->		
         
-        <p id="issueNo">Issue No: {{ issue_no }}</p><!-- ISSUE NO CLOSING -->
+        <p id="issueNo">Issue No: {{ issue.issue_no }}</p><!-- ISSUE NO CLOSING -->
-		<p id="issueDate">{{ issue_date }}</p><!-- ISSUE DATE CLOSING -->
+		<p id="issueDate">{{ issue.issue_date }}</p><!-- ISSUE DATE CLOSING -->
 		<p id="emailerDescription">A fortnightly theatre e-journal from the India Theatre Forum<br>Co-Editors: Vikram Iyengar, Joyoti Roy</p><!-- EMAILER DESCRIPTION CLOSING -->
         
 		<img src="logo-erang.jpg" width="151" height="127" alt="logo-erang" id="logoImg"><!-- LOGO IMG -->
@@ -43,10 +45,12 @@
 	    <div class="clear"></div>
         
 		<div class="articleEmailer">
-			<div class="articleTitle">{{ article_title }}</div><!-- ARTICLE TITLE CLOSING -->
+            {% for article in articles %}
+			<div class="articleTitle">{{ article.title }}</div><!-- ARTICLE TITLE CLOSING -->
 			<div class="articleImg"><img src="logo-erang.jpg" width="151" height="127"></div><!-- ARTICLE IMAGE CLOSING -->
-			<div class="articleCaption">{{ article_caption }}</div><!-- ARTICLE CAPTION CLOSING -->
+			<div class="articleCaption">{{ article.subtitle }}</div><!-- ARTICLE CAPTION CLOSING -->
-			<div class="articleText">{{ article_text|markdown }}</div>
+			<div class="articleText">{{ article.text|markdown }}</div>
+            {% endfor %}
         </div><!-- ARTICLE EMAILER CLOSING -->
 
 	</div><!-- CONTENT EMAILER CLOSING -->

itf/templates/modules/festival/documentsubject.html

@@ -1,6 +1,5 @@
 {% for d in documents %}
-    <div class="orange"> {{ d.title }}</div>
+    <div class="orange"><a href="{{ d.file }} target="_blank"> {{ d.title }}</a></div>
     {{ d.intro|safe }}
-    <div class="orange"><a href="{{ d.file }}" title="Download">Download</a></div>
     <br />
 {% endfor %}

itf/templates/modules/festival/meeting.html

@@ -10,7 +10,7 @@
     <li><a href="#tab5">Tab5</a></li>
     <li><a href="#tab6">Tab6</a></li>    
 -->
-    <li><a href="#synopsis">Synopsis</a></li>
+    <li><a href="#synopsis">About</a></li>
     {% ifnotequal sessions|length 0%}
     <li><a href="#talks">Talks</a></li>
     {% endifnotequal %}
@@ -35,7 +35,7 @@
 
     {% ifnotequal sessions|length 0 %}
      <div id="talks" class="tab_content">
-        <h4 class="tabTitle">Programme</h4>
+        <!-- <h4 class="tabTitle">Programme</h4> -->
         <div>
           {% for s in sessions %}
           <div class="session">
@@ -87,7 +87,7 @@
 
       {% ifnotequal documents|length 0%}
       <div id="prereading" class="tab_content">
-        <h4 class="tabTitle">Reading Materials</h4>
+        <!-- <h4 class="tabTitle">Reading Materials</h4> -->
         <div>
           {% for d in documents %}
             <div class="objWrapper">
@@ -105,15 +105,19 @@
 
       {% ifnotequal imagegallery|length 0 %}
       <div id="gallery" class="tab_content">
-       <h4 class="tabTitle">Gallery</h4>
+       <!-- <h4 class="tabTitle">Gallery</h4> -->
-        <div>
+        <div class="thumbsGallery">
           {% load thumbnail %}
           {% for i in imagegallery %}
           {% thumbnail i.file "600x500" crop="center" as big %}
-          {% thumbnail i.file "100x100" crop="center" as thumb %}
+          {% thumbnail i.file "164x114" crop="center" as thumb %}
+          <img title="" src="{{ thumb.url }}" class="thumbsDetails" data-bigimage="{{ big.url }}" />
+
+<!--
           <a href="{{ big.url }}" title="{{i.title}}" class="thickbox" rel="gall">
             <img src="{{ thumb.url }}" />
           </a>
+-->
           {% endthumbnail %}
           {% endthumbnail %}
           {% endfor %}
@@ -123,12 +127,12 @@
 
       {% ifnotequal participants|length 0 %}
       <div id="participants" class="tab_content">
-        <h4 class="tabTitle">Participant List</h4>
+        <!-- <h4 class="tabTitle">Participant List</h4> -->
         <div>
         {% for p in participants %}
         <div class="pWrapper">
           <div class="pName toggleNext">
-            <a href="Javascript:return false;">{{ p.name }}</a>
+            <a href="Javascript:return false;">{{ p.name }}</a> <br />{{ p.title }}
           </div>
           <div class="pBio">
             {{ p.short_bio|markdown }}

itf/templates/modules/festival/participant.html

@@ -1,3 +1,3 @@
-
+{% load markup %}
 <div class="orange">{{ name }}:</div> {{ short_bio|markdown }}
 

itf/templates/modules/festival/project.html

@@ -1,2 +1,3 @@
+{% load markup %}
 <div class="orange">{{ title }}</div>
 <div>{{ intro|markdown }}</div>