witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Disabling RSS feed for the main notebook.

This commit is contained in:
Dan Helfman 2008-04-23 00:00:30 +00:00
parent e6d237ffab
commit 37ee01fab8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/Link_area.py
View File

@ -44,7 +44,7 @@ class Link_area( Div ):
title = u"Subscribe to the RSS feed for the Luminotes blog.", title = u"Subscribe to the RSS feed for the Luminotes blog.",
), ),
class_ = u"link_area_item", class_ = u"link_area_item",
) or Div( ) or ( updates_path and Div(
A( A(
u"subscribe to rss", u"subscribe to rss",
href = updates_path, href = updates_path,
@ -57,7 +57,7 @@ class Link_area( Div ):
title = u"Subscribe to the RSS feed for this notebook.", title = u"Subscribe to the RSS feed for this notebook.",
), ),
class_ = u"link_area_item", class_ = u"link_area_item",
) or None, ) or None ),
notebook.read_write and Span( notebook.read_write and Span(
( notebook.owner and notebook.name != u"trash" ) and Div( ( notebook.owner and notebook.name != u"trash" ) and Div(

13
view/Main_page.py
View File

@ -74,8 +74,14 @@ class Main_page( Page ):
else: else:
title = None title = None
updates_path = u"/notebooks/updates/%s?rss&%s" % (
notebook.object_id,
urlencode( [ ( u"notebook_name", notebook.name ) ] ),
)
if notebook.name == u"Luminotes": if notebook.name == u"Luminotes":
notebook_path = u"/" notebook_path = u"/"
updates_path = None # no RSS feed for the main notebook
elif notebook.name == u"Luminotes user guide": elif notebook.name == u"Luminotes user guide":
notebook_path = u"/guide" notebook_path = u"/guide"
elif notebook.name == u"Luminotes blog": elif notebook.name == u"Luminotes blog":
@ -83,10 +89,6 @@ class Main_page( Page ):
else: else:
notebook_path = u"/notebooks/%s" % notebook.object_id notebook_path = u"/notebooks/%s" % notebook.object_id
updates_path = u"/notebooks/updates/%s?rss&%s" % (
notebook.object_id,
urlencode( [ ( u"notebook_name", notebook.name ) ] ),
)
conversion_html = None conversion_html = None
if conversion: if conversion:
@ -117,7 +119,8 @@ class Main_page( Page ):
Link( rel = u"stylesheet", type = u"text/css", href = u"/static/css/header.css" ), Link( rel = u"stylesheet", type = u"text/css", href = u"/static/css/header.css" ),
( notebook.name == u"Luminotes blog" ) \ ( notebook.name == u"Luminotes blog" ) \
and Link( rel = u"alternate", type = u"application/rss+xml", title = u"Luminotes blog", href = "/blog?rss" ) \ and Link( rel = u"alternate", type = u"application/rss+xml", title = u"Luminotes blog", href = "/blog?rss" ) \
or Link( rel = u"alternate", type = u"application/rss+xml", title = notebook.name, href = updates_path ), or ( updates_path and \
Link( rel = u"alternate", type = u"application/rss+xml", title = notebook.name, href = updates_path ) or None ),
Script( type = u"text/javascript", src = u"/static/js/MochiKit.js" ) or None, Script( type = u"text/javascript", src = u"/static/js/MochiKit.js" ) or None,
Script( type = u"text/javascript", src = u"/static/js/Invoker.js" ) or None, Script( type = u"text/javascript", src = u"/static/js/Invoker.js" ) or None,
Script( type = u"text/javascript", src = u"/static/js/Editor.js" ) or None, Script( type = u"text/javascript", src = u"/static/js/Editor.js" ) or None,