erang changes - box title, insert images

itf/emailer/models.py

@@ -54,10 +54,10 @@ class EmailerArticle(models.Model):
     def get_images(self):
         return self.articleimage_set.all()
 
-    def getImageHTML(self, short_name):
+    def getImageHTML(self, short_name, typ):
         img = ArticleImage.objects.filter(article=self).filter(short_name=short_name)
         if len(img) > 0:
-            return img[0].getHTML()
+            return img[0].getHTML(typ)
         else:
             return ''
 
@@ -73,7 +73,7 @@ class ArticleImage(models.Model):
     def getThumbPath(self, size):
         return get_thumbnail(self.image, size).url
 
-    def getHTML(self):
+    def getHTML(self, typ):
         thumb = self.getThumbPath("x380")
         caption = self.caption
         return "<img title='%s' src='%s' style='display:block;margin:0 auto;border:1px solid #f7c00c;' />" % (caption, thumb,)
@@ -82,6 +82,7 @@ class ArticleImage(models.Model):
 class Weblink(models.Model):
     url = models.URLField()
     title = models.CharField(max_length=512)
+    box_title = models.CharField(max_length=512, blank=True)
     text = models.TextField(blank=True)
     issue = models.ForeignKey(EmailerIssue)
 
@@ -92,6 +93,7 @@ class Weblink(models.Model):
 class BulletinBoardItem(models.Model):
     issue = models.ForeignKey(EmailerIssue)
     title = models.CharField(max_length=512)
+    box_title = models.CharField(max_length=512, blank=True)
     text = models.TextField()
     position = models.IntegerField(default=1)
 

itf/emailer/templatetags/emailer.py

@@ -4,13 +4,22 @@ from itf.emailer.models import *
 
 register = template.Library()
 
-def insert_images(value, article_id):
+def insert_images_mailer(value, article_id):
+    return insert_images(value, article_id, "mailer")
+
+def insert_images_web(value, article_id):
+    return insert_images(value, article_id, "web")
+
+def insert_images(value, article_id, typ):
     regex = 'img\:(.*?)\r?\n'
     article = EmailerArticle.objects.get(id=article_id)
     matches = re.findall(regex, value)
     for m in matches:
-        imgHTML = article.getImageHTML(m)
+        imgHTML = article.getImageHTML(m.strip(), typ)
         value = value.replace("img:" + m, imgHTML)
     return value
 
-register.filter('insert_images', insert_images)
+    
+
+register.filter('insert_images_mailer', insert_images_mailer)
+register.filter('insert_images_web', insert_images_web)

itf/templates/emailer/email.html

@@ -38,7 +38,7 @@
 
 <table width="600" border="0" cellspacing="12" cellpadding="1">
   <tr style="vertical-align:top;">
-    
+     {% if weblinks %}    
      <td style="width:250px; 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>
             {% for weblink in weblinks %}
@@ -46,6 +46,8 @@
             {% endfor %}
     	<p style="text-align:right;"><a href="#weblinks" style="color:#fff; text-decoration:none; font-size:12px;">More &#187;</a></p>
     </td>
+    {% endif %}
+    {% if bbitems %}
     <td style="width:250px; 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>
             {% for bbitem in bbitems %}
@@ -53,6 +55,7 @@
             {% endfor %}
     	<p style="text-align:right;"><a href="#bbitems" style="color:#fff; text-decoration:none; font-size:12px;">More &#187;</a></p>
     </td>
+    {% endif %}
           </tr>
 </table>
 
@@ -82,7 +85,7 @@
   <tr>
     <td style="width:580px; padding:10px 16px; color:#888; font-family:Arial, Helvetica, sans-serif; font-size:13px; line-height:17px;">
 
-<p>{{ article.text|insert_images:article.id|markdown }}</p></td>
+<p>{{ article.text|insert_images_mailer:article.id|markdown }}</p></td>
   </tr>
   <tr>
     <td style="width:580px; padding: 10px 16px; color:#888; font-family: Arial, Helvetica, sans-serif; font-size:12px; font-style:italic;">
@@ -90,7 +93,7 @@
     </td>
   </tr>
 {% endfor %}  
-  
+  {% if weblinks %}  
   <tr>
 
   <td style="width:580px; margin:10px 0 10px 0;">
@@ -103,8 +106,11 @@
 <!--  <p style="color:#888; font-family:Arial, Helvetica, sans-serif; font-size:12px; padding:8px;">{{ weblinks.text|markdown }}</p> -->
   </td>
 
-  </tr>
 
+  </tr>
+  {% endif %}
+
+  {% if bbitems %}
   <tr>
   <td style="width:580px; margin:10px 0 10px 0;">
   <p style="padding:8px; margin-left:10px; margin-top: 4px;background-color:#f7bd00; color:#fff; font-size:24px; font-family:'Century Gothic', Arial, Helvetica, sans-serif;"><a name="bbitems"></a>BULLETIN BOARD</p>
@@ -116,7 +122,7 @@
 <!--  <p style="color:#888; font-family:Arial, Helvetica, sans-serif; font-size:12px; padding:8px;">{{ bulletinboard.text|markdown }}</p> -->
   </td>
   </tr>
-  
+  {% endif %}
 
   
 </table>

itf/templates/modules/emailer/emailerissue.html

@@ -69,7 +69,7 @@
             </div><!-- ARTICLE IMAGE CLOSING -->
             {% endif %}
 			<div class="articleCaption">{{ article.subtitle }}</div><!-- ARTICLE CAPTION CLOSING -->
-			<div class="articleText">{{ article.text|insert_images:article.id|markdown }}</div>
+			<div class="articleText">{{ article.text|insert_images_web:article.id|markdown }}</div>
             <div class="authorBio">{{ article.author_bio|markdown }}</div>
             {% endfor %}
         </div><!-- ARTICLE EMAILER CLOSING -->