put a * next to state when locked.

CarlFK · Feb 6, 2016 · e85ccfe · e85ccfe
1 parent 2fb05ef
commit e85ccfe
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/dj/main/templates/episodes_table.html b/dj/main/templates/episodes_table.html
@@ -26,7 +26,7 @@
  <td> <a href="/databrowse/main/episode/fields/start/{{episode.start|date:"Y-m-d H:i:s"}}"> {{episode.start|date:"D d H:i"}} </a> </td>
  <td>{{episode.end|date:"H:i"}}</td>
         <td>{{episode.duration}}</td>
-        <td>{{episode.state}}</td>
+        <td>{{episode.state}}{{episode.locked|yesno:"*, "}}</td>
         <td style="white-space:normal"><a href="E/{{episode.id}}/">{{ episode.name }}</a></td>
         <td style="white-space:normal">{{episode.authors}}</td>
         <td>{{episode.released}}</td>

diff --git a/dj/main/templates/show.html b/dj/main/templates/show.html
@@ -58,7 +58,7 @@
  <td> <a href="/databrowse/main/episode/fields/start/{{episode.start|date:"Y-m-d H:i:s"}}"> {{episode.start|date:"D d H:i"}} </a> </td>
  <td>{{episode.end|date:"H:i"}}</td>
         <td>{{episode.duration}}</td>
-        <td>{{episode.state}}</td>
+        <td>{{episode.state}}{{episode.locked|yesno:"*, "}}</td>
         <td style="white-space:normal"><a href="E/{{episode.id}}/#ep-sm">{{ episode.name }}</a></td>
         <td style="white-space:normal">{{episode.authors}}</td>
         <td>{{episode.emails|yesno:"y,"}}</td>

diff --git a/dj/scripts/email_url.py b/dj/scripts/email_url.py
@@ -27,6 +27,29 @@ class email_url(email_ab):
 Re-tweet it, blog it, whatever it.  No point in making videos if no one watches them.
     {% endif %}
     """ 
+
+    body_ryan = """
+Your LCA2016 talk has been published on Youtube:
+    {{url}}
+
+    The video will shortly also be available as WebM on the LA mirror at http://mirror.linux.org.au/linux.conf.au/2016/
+    
+    Please retweet, blog, share the video!
+
+    {% if ep.twitter.url %}
+    Your video has already been tweeted at: {{ ep.twitter_url }}
+    {% endif %}
+
+    If there are any issues with the video, please reply to this email.
+
+    Thanks,
+
+    LCA2016 AV Video Team
+    
+    """
+
+    body_body = body_ryan
+
     py_name = "email_url.py"
 
     def more_context(self, ep):

diff --git a/dj/scripts/ia_uploader.py b/dj/scripts/ia_uploader.py
@@ -98,6 +98,8 @@ def get_metadata(self):
                 meta['description'].replace(u'\u2014','-')
         meta['description'] = \
                 meta['description'].replace(u'\u201c','"')
+        meta['description'] = \
+                meta['description'].replace(u'\u201d','"')
         meta['description'] = \
                 meta['description'].replace(u'\u2022',"o")