Commit: 31b5cb717dfa55fa8c830f0cc73fa91842575337 - newsfour (git)

news4 - RSS aggrigation system

Commit MetaInfo

• Revision: 31b5cb717dfa55fa8c830f0cc73fa91842575337 (tree)
• Zeit: 2012-10-26 19:54:16
• Autor: hylom <hylom@user...>
• Commiter: hylom

Log Message

Merge branch 'master' into live

Ändern Zusammenfassung

• modified: css/gnews.css
• add: filters/remove_tracker.py
• modified: templates/index.tmpl.html

Diff

--- a/css/gnews.css
+++ b/css/gnews.css
@@ -10,6 +10,14 @@ a {
   margin-bottom: 1em;
 }
 
+.entry-header .thumbnail {
+    width: 100px;
+    float: right;
+    margin-left: 10px;
+    margin-bottom: 10px;
+    pagging: 1px;
+}
+
 .entry-continue {
   margin-bottom: 1em;
 }

--- /dev/null
+++ b/filters/remove_tracker.py
@@ -0,0 +1,15 @@
+# remove images for tracking
+# -*- coding: utf-8 -*-
+
+import re
+
+re_rssad_url = re.compile(r'^http://rss.rssad.jp/')
+
+def entry_filter(entry):
+    if "images" in entry:
+        for i in range(len(entry["images"])):
+            if re_rssad_url.search(entry["images"][i]):
+                entry["images"].pop(i)
+
+    return entry
+

--- a/templates/index.tmpl.html
+++ b/templates/index.tmpl.html
@@ -59,6 +59,9 @@ s.parentNode.insertBefore(ga, s);
           <div class="entry">
             <!-- ヘッダ -->
             <div class="entry-header">
+              % if 'images' in entry and len(entry.images) > 0:
+              <img class="thumbnail" src="${entry.images[0]}">
+              % endif
               <h3>
                 <a href='${entry.link}'  target="_blank_">${entry.title}</a>
               </h3>
@@ -66,7 +69,9 @@ s.parentNode.insertBefore(ga, s);
 
 
             <!-- 本文テキスト -->
-            <div class="entry-body">${entry.body}</div>
+            <div class="entry-body">
+              ${entry.body}
+            </div>
 
             <!-- フッタ -->
             <div class="entry-footer">
@@ -80,12 +85,6 @@ s.parentNode.insertBefore(ga, s);
                 % for tag in entry.tags:
                 <span>${tag} </span>
                 % endfor
-                % if 'images' in entry:
-                <span>画像：</span>
-                % for imgurl in entry.images:
-                <span><a href="${imgurl}">*</a></span>
-                % endfor
-                % endif
               </div>
             </div>
           </div>