|
Check-in Number:
|
448 | |
| Date: |
2009-Oct-29 10:25:39 (local)
2009-Oct-29 17:25:39 (UTC) |
| User: | majid |
| Branch: | |
| Comment: |
added little arrow after feed to go to that feed's articles |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
temboz/pages/temboz_css.tmpl 1.27 -> 1.28
--- /tmp/T0r5aq_1 Mon Sep 6 18:11:18 2010
+++ /tmp/T1s5aq_1 Mon Sep 6 18:11:18 2010
@@ -134,6 +134,9 @@
a.callout, div.popup li a {
text-decoration: none;
}
+a.ff {
+ text-decoration: none;
+}
form.inline select {
width: 4em;
}
temboz/pages/view.tmpl 1.80 -> 1.81
--- /tmp/T0I5a4_1 Mon Sep 6 18:11:18 2010
+++ /tmp/T1J5a4_1 Mon Sep 6 18:11:18 2010
@@ -341,7 +341,7 @@
##
########################################################################
#set tag_dict = update.view_sql(c, $where, $order_by, $params, $overload_threshold)
-#for uid, creator, title, link, content, loaded, created, delta_created, rating, filtered_by, feed_uid, feed_title, feed_html, feed_xml in c
+#for uid, creator, title, link, content, loaded, created, delta_created, rating, filtered_by, feed_uid, feed_title, feed_html, feed_xml, feed_snr in c
########################################################################
##
## URL to use for the article title link
@@ -368,9 +368,9 @@
#set content = content + '<br><p>Filtered by feed-specific Python rule</p>'
#end if
#end if
-#if $uid in tag_dict or ($creator and $creator != 'Unknown')
+#if $uid in $tag_dict or ($creator and ($creator != 'Unknown'))
## XXX should probably escape the Unicode here
-#set $tag_info = ' '.join('<span class="item tag">%s</span>' % t for t in tag_dict.get($uid, []))
+#set $tag_info = ' '.join('<span class="item tag">%s</span>' % t for t in sorted($tag_dict.get($uid, [])))
#if $creator and $creator != 'Unknown'
#set $tag_info = '%s<span class="author tag">%s</span>' % ($tag_info, $creator)
#end if
@@ -387,6 +387,9 @@
onclick="highlight('$uid')" /></span><span class="ctarrow" id="ctarrow$uid" onclick="collapseToggle('$uid')"><img width="14" height="14" alt="hidden" src="${img_prefix}a_dn.gif" /> </span><a href="<%=redirect%>" class="headline"
target="_blank" title="by $creator, cached at $loaded">$title</a><br><a
href="feed_info?feed_uid=$feed_uid" title="" class="source screen" id="feed$uid">$feed_title</a><a href="$feed_html" title="" class="source print" id="feedprint$uid">$feed_title</a>
+#if not $getVar('feed_uid', None)
+<a href="view?feed_uid=$feed_uid&show=$show" class="ff" target="_blank">►</a>
+#end if
$since_when
$tag_call
#def ITEM_CONTENT(uid, tag_info, content)
temboz/update.py 1.72 -> 1.73
--- /tmp/T0f6aGa2 Mon Sep 6 18:11:18 2010
+++ /tmp/T1g6aGa2 Mon Sep 6 18:11:18 2010
@@ -825,7 +825,7 @@
item_uid, item_creator, item_title, item_link, item_content,
datetime(item_loaded), date(item_created) as item_created,
julianday('now') - julianday(item_created) as delta_created, item_rating,
- item_rule_uid, item_feed_uid, feed_title, feed_html, feed_xml
+ item_rule_uid, item_feed_uid, feed_title, feed_html, feed_xml, snr
from fm_items, v_feeds_snr
where item_feed_uid=feed_uid and """ + where + """
order by """ + sort + """ limit ?""",