From dade89cd8a9ad8c00203108afd6829612ea5ecae Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Tue, 14 Feb 2012 12:35:20 +0530
Subject: [PATCH] box_titles, erang images, etc

---
 itf/emailer/models.py                           |  3 ++-
 itf/frontpage/models.py                         |  1 +
 itf/static/css/modules/emailer.css              |  5 ++++-
 itf/static/css/noel/inner-details.css           |  4 ++++
 itf/templates/emailer/email.html                |  6 +++---
 itf/templates/modules/emailer/emailerissue.html |  6 +++---
 itf/templates/noel/index.html                   |  2 +-
 itf/tmp/update.py                               | 16 ++++++++++++++++
 8 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 itf/tmp/update.py

diff --git a/itf/emailer/models.py b/itf/emailer/models.py
index 3ead1d9..009952a 100755
--- a/itf/emailer/models.py
+++ b/itf/emailer/models.py
@@ -76,7 +76,8 @@ class ArticleImage(models.Model):
     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,)
+        return "<p style='text-align:center;margin-top:6px;margin-bottom:6px;'><img title='%s' src='%s' style='border:1px solid #f7c00c' /><br />%s</p>" % (caption, thumb, caption)
+#        return "<img title='%s' src='%s' style='display:block;margin:0 auto;border:1px solid #f7c00c;' />" % (caption, thumb,)
 
 
 class Weblink(models.Model):
diff --git a/itf/frontpage/models.py b/itf/frontpage/models.py
index 418c079..f0b053a 100755
--- a/itf/frontpage/models.py
+++ b/itf/frontpage/models.py
@@ -20,6 +20,7 @@ class SliderBox(models.Model):
     normalText = models.CharField(max_length=256, blank=True)
     url = models.CharField(max_length=128, blank=True)
     order = models.IntegerField(default=1)
+    imageLeft = models.IntegerField(default=0)
     imageTop = models.IntegerField(default=0)
     is_displayed = models.BooleanField(default=True)
 
diff --git a/itf/static/css/modules/emailer.css b/itf/static/css/modules/emailer.css
index b66653f..300a55b 100755
--- a/itf/static/css/modules/emailer.css
+++ b/itf/static/css/modules/emailer.css
@@ -110,6 +110,9 @@ cursor: pointer;
 
 /* CONTENT */
 
+#bottomRight {
+    font-size: 13px !important;
+}
 
 #contentEmailer {
 	width:570px;
@@ -172,7 +175,7 @@ cursor: pointer;
 
 .articleAuthor {
 	font-family:"Century Gothic", Arial, Helvetica, sans-serif;
-	font-size:12px;
+	font-size:13px;
 	padding-right:12px;
 	float:right;    
 }
diff --git a/itf/static/css/noel/inner-details.css b/itf/static/css/noel/inner-details.css
index e47292b..bbcb102 100755
--- a/itf/static/css/noel/inner-details.css
+++ b/itf/static/css/noel/inner-details.css
@@ -74,6 +74,10 @@ display:block;}
 {display:none;}
 
 /* FORMS FOR E-RANG */
+#comment_form {
+    margin-top: 24px;
+}
+
 #commentWrapper 
 {color:#888;}
 
diff --git a/itf/templates/emailer/email.html b/itf/templates/emailer/email.html
index 14c65b6..59ae2e0 100755
--- a/itf/templates/emailer/email.html
+++ b/itf/templates/emailer/email.html
@@ -42,7 +42,7 @@
      <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 %}
-            <p style="font-size:13px; font-family:Arial, Helvetica, sans-serif;  padding-left:6px; padding-right:6px;">{{ weblink.title|truncatewords:6 }}</p>
+            <p style="font-size:13px; font-family:Arial, Helvetica, sans-serif;  padding-left:6px; padding-right:6px;">• {{ weblink.box_title }}</p>
             {% endfor %}
     	<p style="text-align:right;"><a href="#weblinks" style="color:#fff; text-decoration:none; font-size:12px;">More &#187;</a></p>
     </td>
@@ -51,7 +51,7 @@
     <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 %}
-                <p style="font-size:13px; font-family:Arial, Helvetica, sans-serif; padding-left:6px; padding-right:6px;">{{ bbitem.title|truncatewords:6 }}</p>
+                <p style="font-size:13px; font-family:Arial, Helvetica, sans-serif; padding-left:6px; padding-right:6px;">• {{ bbitem.box_title }}</p>
             {% endfor %}
     	<p style="text-align:right;"><a href="#bbitems" style="color:#fff; text-decoration:none; font-size:12px;">More &#187;</a></p>
     </td>
@@ -115,7 +115,7 @@
   <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>
     {% for bbitem in bbitems %}
-    <h2 style="font-family:Arial;font-size:16px;padding-left:10px;color:#888;margin-top:4px;margin-bottom:4px;font-weight:normal;">{{ bbitem.title }}</h2>
+    <h2 style="font-family:Arial;font-size:16px;padding-left:10px;color:#F7BD00;;margin-top:4px;margin-bottom:4px;font-weight:bold;">{{ bbitem.title }}</h2>
     <div style="color:#888; font-family:Arial, Helvetica, sans-serif; font-size:13px; padding-left: 10px;margin-bottom:16px;line-height:17px;">{{ bbitem.text|markdown }}</div>
     {% endfor %}
 
diff --git a/itf/templates/modules/emailer/emailerissue.html b/itf/templates/modules/emailer/emailerissue.html
index 0e96468..f7aa298 100755
--- a/itf/templates/modules/emailer/emailerissue.html
+++ b/itf/templates/modules/emailer/emailerissue.html
@@ -36,7 +36,7 @@
 		<div class="contentBoxes">
 			<h1>WEB LINKS</h1>
             {% for weblink in weblinks %}
-            <p>{{ weblink.title|truncatewords:6 }}</p>
+            <p>• {{ weblink.box_title }}</p>
             {% endfor %}
             <p class="contentBoxesMore"><a href="#weblinks">More &#187;</a></p>
 		</div><!-- CONTENT BOXES CLOSING -->
@@ -44,7 +44,7 @@
 		<div class="contentBoxes">
 			<h1>BULLETIN BOARD</h1>
             {% for bbitem in bbitems %}
-                <p>{{ bbitem.title|truncatewords:6 }}</p>
+                <p>• {{ bbitem.box_title }}</p>
             {% endfor %}
             <p class="contentBoxesMore"><a href="#bbitems">More &#187;</a></p>
 		</div><!-- CONTENT BOXES CLOSING -->
@@ -85,7 +85,7 @@
 		<div class="contentLinks">
         	<a name="bbitems"></a><h1>BULLETIN BOARD</h1>
             {% for bbitem in bbitems %}
-            <h2>{{ bbitem.title }}</h2>
+            <h2 class="orange">{{ bbitem.title }}</h2>
             {{ bbitem.text|markdown }}
             {% endfor %}
         </div><!-- WEB LINKS CLOSING -->
diff --git a/itf/templates/noel/index.html b/itf/templates/noel/index.html
index ce98169..fbce1fc 100755
--- a/itf/templates/noel/index.html
+++ b/itf/templates/noel/index.html
@@ -77,7 +77,7 @@
  		<img src="/static/images/noel/arrow-rt.png" width="27" height="39" alt="arrow-right" id="arrowRight">     
   <ul id="sliderTabs">
     {% for b in boxes %}
-        <li class="tab" style="background-image:url('{{b.image.url}}');background-position:0px {{b.imageTop}}px;">
+        <li class="tab" style="background-image:url('{{b.image.url}}');background-position:{{b.imageLeft}}px {{b.imageTop}}px;">
             <h4 class="tabHeader">{% autoescape off %} {{ b.title|format_title }} {% endautoescape %}</h4>
             <div class="textTab">
                 <p><span class="boldText">{{ b.boldText }}</span> {{ b.normalText }} <a href="{{ b.url }}" class="moreTab"> More<img src="/static/images/noel/more-next.jpg" width="16" height="9" class="imageMore" /></a>
diff --git a/itf/tmp/update.py b/itf/tmp/update.py
new file mode 100644
index 0000000..badbca4
--- /dev/null
+++ b/itf/tmp/update.py
@@ -0,0 +1,16 @@
+from emailer.models import *
+from frontpage.models import *
+
+def box_titles():
+    for w in Weblink.objects.all():
+        w.box_title = w.title
+        w.save()
+    for b in BulletinBoardItem.objects.all():
+        b.box_title = b.title
+        b.save()
+
+
+def imagelefts():
+    for s in SliderBox.objects.all():
+        s.imageLeft = 0
+        s.save()