witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Vertically compacted the link area on the left somewhat. "rename" hover link no longer showing up on read-only/trash notebooks.

This commit is contained in:
Dan Helfman 2008-12-13 00:32:19 -08:00
parent 799e0c12b0
commit d687d2b1c8
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
static/js/Wiki.js
View File

@ -391,17 +391,16 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
self.start_notebook_rename(); self.start_notebook_rename();
event.stop(); event.stop();
} ); } );
}
// FIXME: don't do this (hide and show the links on hover) if this is the trash var notebook_header_area = getElement( "notebook_header_area" );
var notebook_header_area = getElement( "notebook_header_area" ); if ( notebook_header_area ) {
if ( notebook_header_area ) { connect( notebook_header_area, "onmouseover", function ( event ) {
connect( notebook_header_area, "onmouseover", function ( event ) { removeElementClass( "notebook_header_links", "invisible" );
removeElementClass( "notebook_header_links", "invisible" ); } );
} ); connect( notebook_header_area, "onmouseout", function ( event ) {
connect( notebook_header_area, "onmouseout", function ( event ) { setTimeout( function () { addElementClass( "notebook_header_links", "invisible" ); }, 1000 );
setTimeout( function () { addElementClass( "notebook_header_links", "invisible" ); }, 1000 ); } );
} ); }
} }
var delete_notebook_link = getElement( "delete_notebook_link" ); var delete_notebook_link = getElement( "delete_notebook_link" );

29
view/Link_area.py
View File

@ -39,7 +39,7 @@ class Link_area( Div ):
( rate_plan.get( u"notebook_sharing" ) and notebook.name == u"Luminotes blog" ) and Div( ( rate_plan.get( u"notebook_sharing" ) and notebook.name == u"Luminotes blog" ) and Div(
A( A(
u"subscribe to rss", u"follow",
href = u"%s?rss" % notebook_path, href = u"%s?rss" % notebook_path,
id = u"blog_rss_link", id = u"blog_rss_link",
title = u"Subscribe to the RSS feed for the Luminotes blog.", title = u"Subscribe to the RSS feed for the Luminotes blog.",
@ -52,7 +52,7 @@ class Link_area( Div ):
class_ = u"link_area_item", class_ = u"link_area_item",
) or ( updates_path and rate_plan.get( u"notebook_sharing" ) and ( not forum_tag ) and Div( ) or ( updates_path and rate_plan.get( u"notebook_sharing" ) and ( not forum_tag ) and Div(
A( A(
u"subscribe to rss", u"follow",
href = updates_path, href = updates_path,
id = u"notebook_rss_link", id = u"notebook_rss_link",
title = u"Subscribe to the RSS feed for this %s." % notebook_word, title = u"Subscribe to the RSS feed for this %s." % notebook_word,
@ -103,15 +103,22 @@ class Link_area( Div ):
class_ = u"link_area_item", class_ = u"link_area_item",
) or None, ) or None,
( notebook.owner and notebook.name != u"trash" ) and Div( Div(
A( notebook.trash_id and A(
u"trash",
href = u"/notebooks/%s?parent_id=%s" % ( notebook.trash_id, notebook.object_id ),
id = u"trash_link",
title = u"Look here for %ss you've deleted." % note_word,
) or None,
( notebook.owner and notebook.name != u"trash" and notebook.trash_id ) and u"|" or None,
( notebook.owner and notebook.name != u"trash" ) and A(
u"delete", u"delete",
href = u"#", href = u"#",
id = u"delete_notebook_link", id = u"delete_notebook_link",
title = u"Move this %s to the trash." % notebook_word, title = u"Move this %s to the trash." % notebook_word,
), ) or None,
class_ = u"link_area_item", class_ = u"link_area_item",
) or None, ),
( notebook.owner and user.username and rate_plan.get( u"notebook_sharing" ) ) and Div( ( notebook.owner and user.username and rate_plan.get( u"notebook_sharing" ) ) and Div(
A( A(
@ -123,16 +130,6 @@ class Link_area( Div ):
class_ = u"link_area_item", class_ = u"link_area_item",
) or None, ) or None,
notebook.trash_id and Div(
A(
u"trash",
href = u"/notebooks/%s?parent_id=%s" % ( notebook.trash_id, notebook.object_id ),
id = u"trash_link",
title = u"Look here for %ss you've deleted." % note_word,
),
class_ = u"link_area_item",
) or None,
( notebook.name == u"trash" ) and Rounded_div( ( notebook.name == u"trash" ) and Rounded_div(
u"trash_notebook", u"trash_notebook",
A( A(