Commit: 37a9151e7b8c3058b2d9fde3958bc98b9a1a1931 - newsfour (git)

news4 - RSS aggrigation system

Commit MetaInfo

• Revision: 37a9151e7b8c3058b2d9fde3958bc98b9a1a1931 (tree)
• Time: 2012-10-05 05:29:59
• Author: hylom <hylom@hylo...>
• Commiter: hylom

Log Message

add trimming filter

Change Summary

• modified: css/gnews.css
• add: filters/itmedia.py
• add: filters/trimming.py
• add: img/sfjp.png
• modified: templates/index.tmpl.html

Incremental Difference

--- a/css/gnews.css
+++ b/css/gnews.css
@@ -1,5 +1,9 @@
 /* gnews.css */
 
+a {
+  color: #1155CC;
+}
+
 .entry-header{}
 .entry-body{}
 .entry-continue {
@@ -11,6 +15,7 @@
 
 header {
   border-bottom: 1px solid gray;
+  margin-bottom: 10px;
 }
 
 .main-contents h3 {
@@ -35,4 +40,26 @@ header {
 .entry-header h3 {
   line-height: 130%;
   margin: 10px auto 1em;
+  color: #11111;
+}
+
+.entry-header h3 a{
+  color: #1155CC;
+}
+
+/* sidebar */
+.sidebar h3 {
+  margin: 0 auto;
+}
+.sidebar li {
+  line-height: 10px;
+  height: 20px;
+}
+
+.sidebar li a {
+  padding-top:0;
+  padding-bottom:0;
+  margin-top:0;
+  margin-bottom:0;
+  line-height:120%;
 }
\ No newline at end of file

--- /dev/null
+++ b/filters/itmedia.py
@@ -0,0 +1,15 @@
+# filter for slashdot.jp
+# -*- coding: utf-8 -*-
+
+import re
+
+re_title = re.compile(r'\[ITmedia.*?\]')
+
+def entry_filter(entry):
+    # すべて読む、関連ストーリーを削除
+    title = entry['title']
+    title = re_title.sub('', title)
+    entry['title'] = title.strip()
+
+    return entry
+

--- /dev/null
+++ b/filters/trimming.py
@@ -0,0 +1,15 @@
+# filter for Trimming
+# -*- coding: utf-8 -*-
+
+import re
+
+re_first_para = re.compile(r'<p>(.*?)</p>')
+
+def entry_filter(entry):
+    body = entry['body']
+    m = re_first_para.search(body)
+    if m:
+        body = "<p>" + m.group(1) + "...</p>"
+    entry['body'] = body
+    return entry
+

Binary files /dev/null and b/img/sfjp.png differ

--- a/templates/index.tmpl.html
+++ b/templates/index.tmpl.html
@@ -15,7 +15,9 @@
       <div class="row">
         <div class="span12">
           <header>
-            <h1><a href="${site.root}">${site.name}</a></h1>
+            <a href="${site.root}">
+              <img src="${site.img_directory}/sfjp.png">
+            </a>
           </header>
         </div>
       </div>
@@ -24,7 +26,7 @@
       <div class="row">
 
         <!-- 左サイドバー -->
-        <div class="span2 sidebar-left">
+        <div class="span2 sidebar sidebar-left">
           <div class="keywords">
             <h3>キーワード：</h3>
             <ul class="nav nav-pills nav-stacked">
@@ -96,7 +98,7 @@
         </div><!-- main-contents -->
         
         <!-- 右サイドバー -->
-        <div class="span3 sidebar-right">
+        <div class="span3 sidebar sidebar-right">
           <div class="feed-provider">
             <h3>情報提供サイト:</h3>
             <ul class="nav nav-pills nav-stacked">