From e745025c6f173bb329ab00cb940aa84930f5defb Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Fri, 14 Nov 2008 22:45:24 -0800 Subject: [PATCH] Hiding some navigation on the main notebook, and moving to the forum displayed on a thread page. --- view/Link_area.py | 14 ++++++++++---- view/Note_tree_area.py | 4 ---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/view/Link_area.py b/view/Link_area.py index 5a6ffc9..38fc36d 100644 --- a/view/Link_area.py +++ b/view/Link_area.py @@ -16,22 +16,28 @@ class Link_area( Div ): if [ tag for tag in notebook.tags if tag.name == u"forum" ]: forum_tag = True + forum_name = tag.value notebook_word = u"discussion" note_word = u"post" else: forum_tag = False + forum_name = None notebook_word = u"notebook" note_word = u"note" Div.__init__( self, toolbar, - Div( - Div( + ( user.username != u"anonymous" ) and Div( + ( notebook_path != u"/" ) and Div( H4( u"this %s" % notebook_word, id = u"this_notebook_area_title", ), + forum_tag and Div( + A( u"%s forum" % forum_name, href = "/forums/%s" % forum_name ), + class_ = u"link_area_item", + ) or None, ( rate_plan.get( u"notebook_sharing" ) and notebook.name == u"Luminotes blog" ) and Div( A( @@ -152,7 +158,7 @@ class Link_area( Div ): ) or None, id = u"this_notebook_area", - ), + ) or None, ( not forum_tag ) and Div( ( len( linked_notebooks ) > 0 ) and H4( @@ -199,6 +205,6 @@ class Link_area( Div ): id = u"storage_usage_area", ), id = u"link_area_holder", - ), + ) or None, id = u"link_area", ) diff --git a/view/Note_tree_area.py b/view/Note_tree_area.py index 1e990a3..268a785 100644 --- a/view/Note_tree_area.py +++ b/view/Note_tree_area.py @@ -40,10 +40,6 @@ class Note_tree_area( Div ): Search_form(), class_ = u"link_area_item", ), - forum_tag and Div( - A( u"%s forum" % forum_name, href = "/forums/%s" % forum_name ), - class_ = u"link_area_item", - ) or None, ( not forum_tag ) and self.make_tree( [ self.make_item( title = note.title,