emailer changes

itf/templates/emailer/email.html

@@ -1,44 +1,57 @@
 {% load markup %}
 
-<table width="600" border="0" cellspacing="0" cellpadding="1">
+<table width="600" border="0" cellspacing="0" cellpadding="0">
   
   <tr>
-    	<td style="width:400px;">
+    	<td style="width:280px; padding:10px;">
-    		<img src="logoItfSmall.jpg" width="125" height="34" alt="itf-logo">
+    		<img src="/static/images/emailer/logo-erang.jpg" width="151" height="127" alt="erang-logo">
-    		<p style="font-family:'Century Gothic', Arial, Helvetica, sans-serif; font-size:12px; color:#888; font-weight:bold;">Issue No: {{ issue.issue_no }}</p>
+			
-			<p style="font-family:'Century Gothic', Arial, Helvetica, sans-serif; font-size:12px; color:#888; font-weight:bold;">{{ issue.date|date:"d-M-Y" }}</p>
     	</td>
         
-    	<td style="width:200px;">
+    	<td style="width:280px; padding:10px;" valign="top">
-        	<img src="logo-erang.jpg" width="151" height="127" alt="erang-logo" align="right">
+        	<img src="/static/images/emailer/logoItfSmall.jpg" width="125" height="34" alt="itf-logo" align="right">
         </td>
-  </tr>
 
-  <tr>
-    <td style="width:400px;">
-		<p id="emailerDescription" style="width:430px; background-color:#f7bd00; font-size:12px; font-weight:bold; color:#fff; padding:6px; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">A fortnightly theatre e-journal from the India Theatre Forum<br>Co-Editors: Vikram Iyengar, Joyoti Roy</p>
-        </td>
-    <td style="width:200px;">&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td style="width:400px; font-size:14px; padding-bottom:10px; border-bottom:2px; border-color:#f7bd00; border-bottom-style:solid; font-weight:bold; font-family:'Century Gothic', Arial, Helvetica, sans-serif;"><a href="" style="color:#f7bd00; text-decoration:none;  margin-left:20px;">SUBSCRIBE |</a> <a href="" style="color:#f7bd00; text-decoration:none;">FEEDBACK |</a> <a href="" style="color:#f7bd00; text-decoration:none;">BULLETIN BOARD |</a> <a href="" style="color:#f7bd00; text-decoration:none;">LINKS</a></td>
-    <td style="width:400px; border-bottom:2px; border-color:#f7bd00; border-bottom-style:solid;">
-    	&nbsp;
-    </td>
 
   </tr>
+  
  </table>
   
-<table width="600" border="0" cellspacing="6" cellpadding="1" style="margin-top:6px;">
+<table width="600" border="0" cellspacing="0" cellpadding="0">
+
   <tr>
-    {% for b in bbitems %}
+
-     <td style="width:170px; height:130px; background-color:#f7bd00; color:#fff; padding:8px;">
+	<td style="width:290px; padding:0px 10px 0px 10px;border-bottom:2px solid #f8c92d;">
-    	<p style="font-size:16px; text-align:center; text-transform:uppercase; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">{{ b.title }}</p>
+    		<p style="font-family:'Century Gothic', Arial, Helvetica, sans-serif; font-size:14px; color:#888; padding-bottom:2px; margin-left:8px;">Issue No: {{ issue.issue_no }} <span>&nbsp;&nbsp; {{ issue.date|date:"d-M-Y" }}</span></p>
-    	<p style="font-size:14px;">{{ b.text|truncatewords:25 }}</p>
+			
-    	<p><a href="" style="text-align:right; color:#fff; text-decoration:none; font-size:12px;">More &#187;</a></p>
     	</td>
-    {% endfor %}
+        
+
+    <td style="width:290px; padding:0px 0px 0px 10px; font-size:14px; font-family:'Century Gothic', Arial, Helvetica, sans-serif;border-bottom:2px solid #f8c92d; margin-left:8px">
+    	<p style="text-align:right;"><a href="" style="color:#ffcc00; text-decoration:none;">SUBSCRIBE |</a> <a href="" style="color:#ffcc00; text-decoration:none;">FEEDBACK </a></p> 
+   </td>
+
+  </tr>
+
+</table>
+
+<table width="600" border="0" cellspacing="12" cellpadding="1">
+  <tr>
+    
+     <td style="width:240px; height:170px; background-color:#f7bd00; color:#fff; padding:10px;">
+    	<p style="font-size:16px; text-align:center; text-transform:uppercase; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">Web Links</p>
+		
+    	<p style="font-size:13px; font-family:Arial, Helvetica, sans-serif;  padding-left:6px; padding-right:6px;">Some weblink</p>
+        <p style="font-size:13px; font-family:Arial, Helvetica, sans-serif;  padding-left:6px; padding-right:6px;">Some other weblink</p>
+    	<p style="text-align:right;"><a href="" style="color:#fff; text-decoration:none; font-size:14px;">More &#187;</a></p>
+    </td>
+    <td style="width:240px; height:170px; background-color:#f7bd00; color:#fff; padding:10px;">
+    	<p style="font-size:16px; text-align:center; text-transform:uppercase; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">Bulletin Board</p>
+    	<p style="font-size:13px; font-family:Arial, Helvetica, sans-serif; padding-left:6px; padding-right:6px;">Some bb item</p>
+        <p style="font-size:13px; font-family:Arial, Helvetica, sans-serif;  padding-left:6px; padding-right:6px;">Some other bb item</p>
+    	<p style="text-align:right;"><a href="" style="color:#fff; text-decoration:none; font-size:14px;">More &#187;</a></p>
+    </td>
+        
 <!--
     <td style="width:182px; height:142px; background-color:#f7bd00; color:#fff; padding:8px;">
     	<p style="font-size:16px; text-align:center; text-transform:uppercase; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">{{ box_title }}</p>
@@ -58,29 +71,53 @@
 {% for article in articles %}
 <table width="600" border="0" cellspacing="6" cellpadding="1">
   <tr>
-    <td style="width:600px;"><p style="font-size:24px; font-weight:normal; color:#f7bd00; text-transform:uppercase; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">{{ article.title }}</p></td>
+    <td style="width:350px;"><p style="font-size:24px; font-weight:normal; color:#ffcc00; text-transform:uppercase; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">{{ article.title }}</p></td>
+    <td style="width:250px;"><p style="font-size:12px; font-weight:normal; color:#888; font-family:'Century Gothic', Arial, Helvetica, sans-serif; text-align:right;">by: {{ article.author }}</p></td>
   </tr>
+</table>
+
+<table>
   <tr>
     <td style="width:600px;">
-	    <img src="logo-erang.jpg" width="151" height="127" alt="theatre-image"  style="display:block; border:1px solid #f7bd00; margin:0 auto;">
+	    <img src="/static/images/emailer/logo-erang.jpg" width="151" height="127" alt="theatre-image"  style="display:block; border:2px solid #f7c00c; margin:0 auto;">
-   	 	<p style="text-align:center; margin-top:10px; margin-bottom:10px; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:14px;">{{ article.subtitle }}</p>
+   	 	<p style="text-align:center; margin-top:10px; margin-bottom:10px; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:12px;">{{ article.subtitle }}</p>
+        
     </td>
   </tr>
   <tr>
-    <td style="width:600px; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:14px;">{{ article.text|markdown }}</td>
+    <td style="width:580px; padding:10px; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:14px;"><p>{{ article.text|markdown }}</p></td>
   </tr>
+  
+  <tr>
+  
+  <td style="width:580px; margin:10px 0 10px 0;">
+  <p style="padding:8px; background-color:#f7bd00; color:#fff; font-size:24px; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">WEB LINKS</p>
+  <p style="color:#888; font-family:Arial, Helvetica, sans-serif; font-size:14px; padding:8px;">{{ weblinks.text|markdown }}</p>
+  </td>
+  
+  </tr>
+
+  <tr>
+  <td style="width:580px; margin:10px 0 10px 0;">
+  <p style="padding:8px; background-color:#f7bd00; color:#fff; font-size:24px; font-family:'Century Gothic', Arial, Helvetica, sans-serif;">BULLETIN BOARD</p>
+  <p style="color:#888; font-family:Arial, Helvetica, sans-serif; font-size:14px; padding:8px;">{{ bulletinboard.text|markdown }}</p>
+  </td>
+  </tr>
+  
+
+  
 </table>
+
 {% endfor %}
 
 <table width="600" border="0" cellspacing="6" cellpadding="1">
   <tr>
-    <td style="width:600px; border-bottom:2px solid #f7bd00; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:12px; text-align:center;">
+    <td style="width:600px; border-bottom:2px solid #f8c92d; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:12px; text-align:center;">
-    	<p>Contribute your articles to e-Rang and become part of this theatre community! Email us at <a href="" style="color:#0066ff; text-decoration:none;">erang@theatreforum.in</a> to know more about how to contribute..</p>
+    	<p style="border-bottom:2px solid #f8c92d; border-top:2px solid #f8c92d; padding-top:6px; padding-bottom:6px; padding-top:6px;">A fortnightly theatre e-journal from the India Theatre Forum<br>
-	</td>
+		   Co-Editors: Vikram Iyengar, Joyoti Roy</p>
-  </tr>
+        <p>Views expressed in the articles in e-Rang are personal.<br>e-Rang does not hold copyright of any piece.<br>Any enquiry for re-use of articles should be addressed to the authors.</p>
-  <tr>
+        <p>Contribute your articles to e-Rang and become part of this theatre community! Email us at <a href="" style="color:#0066ff; text-decoration:none;">erang@theatreforum.in</a> to know more about how to contribute.</p>
-    <td style="width:600px; border-bottom:2px solid #f7bd00; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:12px; text-align:center;">
+        <p style="padding-bottom:6px;">The India Theatre Forum (ITF), a Prithvi Theatre initiative, was formed in 2006 as a loose association of theatre people coming together in the larger interests of theatre. For more on the ITF, please visit <a href="" style="color:#0066ff; text-decoration:none;">www.theatreforum.in</a>. The ITF is currently supported by HIVOS.</p>
-    	<p>The India Theatre Forum (ITF), a Prithvi Theatre initiative, was formed in 2006 as a loose association of theatre people coming together in the larger interests of theatre. For more on the ITF, please visit <a href="" style="color:#0066ff; text-decoration:none;">www.theatreforum.in</a>. The ITF is currently supported by HIVOS.</p>
 	</td>
   </tr>
   <tr>