diff --git a/NEWS b/NEWS index 4bab68c..6017cd6 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ * Now if you try to load a page where access is required, and you're not logged in, you'll be redirected to a login page. After you login, you'll be redirected to the page you were originally trying to access. + * Fixed bug where recent notes were ordered by creation time instead of + revision time. + * Added RSS subscription link to all notebooks. 1.3.0: April 16, 2008 * Created a new hierarchical note tree area for browsing notes. diff --git a/controller/Notebooks.py b/controller/Notebooks.py index cbd2e7c..4834ad3 100644 --- a/controller/Notebooks.py +++ b/controller/Notebooks.py @@ -17,6 +17,7 @@ from view.Main_page import Main_page from view.Json import Json from view.Html_file import Html_file from view.Note_tree_area import Note_tree_area +from view.Notebook_rss import Notebook_rss class Notebooks( object ): @@ -44,7 +45,7 @@ class Notebooks( object ): self.__users = users self.__files = files - @expose( view = Main_page ) + @expose( view = Main_page, rss = Notebook_rss ) @strongly_expire @end_transaction @grab_user_id diff --git a/static/images/rss.png b/static/images/rss.png index d64c669..b3c949d 100755 Binary files a/static/images/rss.png and b/static/images/rss.png differ diff --git a/view/Link_area.py b/view/Link_area.py index 56f4180..16de0f4 100644 --- a/view/Link_area.py +++ b/view/Link_area.py @@ -31,20 +31,22 @@ class Link_area( Div ): class_ = u"link_area_item", ) or None, - ( notebook.name == u"Luminotes blog" ) and Div( + Div( A( u"subscribe to rss", href = u"%s?rss" % notebook_path, id = u"rss link", - title = u"Subscribe to the RSS feed for the Luminotes blog.", + title = u"Subscribe to the RSS feed for " + \ + ( ( notebook.name == u"Luminotes blog" ) and u"the Luminotes blog." or u"this notebook." ), ), A( - Img( src = u"/static/images/rss.png", width = u"28", height = u"28", class_ = u"rss_image" ), + Img( src = u"/static/images/rss.png", width = u"14", height = u"14", class_ = u"rss_image" ), href = u"%s?rss" % notebook_path, - title = u"Subscribe to the RSS feed for the Luminotes blog.", + title = u"Subscribe to the RSS feed for " + \ + ( ( notebook.name == u"Luminotes blog" ) and u"the Luminotes blog." or u"this notebook." ), ), class_ = u"link_area_item", - ) or None, + ), notebook.read_write and Span( ( notebook.owner and notebook.name != u"trash" ) and Div(