Replace "+" buttons in left and right areas with textual buttons that should be a little clearer.
This commit is contained in:
parent
0c9c3844bd
commit
b1d3ebe2f9
|
@ -464,6 +464,16 @@ h1 {
|
||||||
-webkit-border-radius: 3px;
|
-webkit-border-radius: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#new_notebook_button {
|
||||||
|
-moz-border-radius: 3px;
|
||||||
|
-webkit-border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#new_note_tree_link_button {
|
||||||
|
-moz-border-radius: 3px;
|
||||||
|
-webkit-border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
.note_frame {
|
.note_frame {
|
||||||
-moz-border-radius: 5px;
|
-moz-border-radius: 5px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
@ -448,17 +448,15 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
var new_notebook_button = getElement( "new_notebook" );
|
var new_notebook_button = getElement( "new_notebook_button" );
|
||||||
if ( new_notebook_button ) {
|
if ( new_notebook_button ) {
|
||||||
connect( new_notebook_button, "onclick", function ( event ) {
|
connect( new_notebook_button, "onclick", function ( event ) {
|
||||||
self.invoker.invoke( "/notebooks/create", "POST" );
|
self.invoker.invoke( "/notebooks/create", "POST" );
|
||||||
event.stop();
|
event.stop();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
this.make_image_button( "new_notebook", true );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var new_note_tree_link_button = getElement( "new_note_tree_link" );
|
var new_note_tree_link_button = getElement( "new_note_tree_link_button" );
|
||||||
if ( new_note_tree_link_button ) {
|
if ( new_note_tree_link_button ) {
|
||||||
connect( new_note_tree_link_button, "onclick", function ( event ) {
|
connect( new_note_tree_link_button, "onclick", function ( event ) {
|
||||||
self.clear_pulldowns();
|
self.clear_pulldowns();
|
||||||
|
@ -466,8 +464,6 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
|
||||||
self.note_tree.start_link_add();
|
self.note_tree.start_link_add();
|
||||||
event.stop();
|
event.stop();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
this.make_image_button( "new_note_tree_link", true );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1352,7 +1348,7 @@ Wiki.prototype.connect_image_button = function ( button ) {
|
||||||
|
|
||||||
|
|
||||||
function stateless_button( button ) {
|
function stateless_button( button ) {
|
||||||
return ( button.name == "newNote" || button.name == "new_notebook" || button.name == "new_note_tree_link" );
|
return ( button.name == "newNote" );
|
||||||
}
|
}
|
||||||
|
|
||||||
connect( button, "onmousedown", function ( event ) {
|
connect( button, "onmousedown", function ( event ) {
|
||||||
|
@ -4827,6 +4823,8 @@ Note_tree.prototype.start_link_add = function () {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addElementClass( "new_note_tree_link_button", "undisplayed" );
|
||||||
|
|
||||||
link_field = createDOM(
|
link_field = createDOM(
|
||||||
"input", {
|
"input", {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
|
@ -4881,6 +4879,8 @@ Note_tree.prototype.start_link_add = function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
Note_tree.prototype.end_link_add = function ( note ) {
|
Note_tree.prototype.end_link_add = function ( note ) {
|
||||||
|
removeElementClass( "new_note_tree_link_button", "undisplayed" );
|
||||||
|
|
||||||
// if no note is provided, load it based on the title
|
// if no note is provided, load it based on the title
|
||||||
if ( !note ) {
|
if ( !note ) {
|
||||||
var note_name = getElement( "new_note_tree_link_field" ).value;
|
var note_name = getElement( "new_note_tree_link_field" ).value;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from Tags import Div, P, Span, H4, A, Strong, Img, Br
|
from Tags import Div, P, Span, H4, A, Strong, Img, Br, Input
|
||||||
from Rounded_div import Rounded_div
|
from Rounded_div import Rounded_div
|
||||||
from model.Notebook import Notebook
|
from model.Notebook import Notebook
|
||||||
|
|
||||||
|
@ -209,12 +209,12 @@ class Link_area( Div ):
|
||||||
id = u"notebooks_area"
|
id = u"notebooks_area"
|
||||||
) or None,
|
) or None,
|
||||||
( not forum_tag ) and Div(
|
( not forum_tag ) and Div(
|
||||||
Img(
|
Input(
|
||||||
src = u"/static/images/toolbar/small/new_note_button.png",
|
type = u"button",
|
||||||
width = u"20", height = u"20",
|
class_ = u"note_button",
|
||||||
id = "new_notebook",
|
id = u"new_notebook_button",
|
||||||
class_ = u"middle_image",
|
value = u"add notebook",
|
||||||
title = u"Create a new wiki notebook."
|
title = u"Create a new wiki notebook.",
|
||||||
),
|
),
|
||||||
class_ = u"link_area_item",
|
class_ = u"link_area_item",
|
||||||
) or None,
|
) or None,
|
||||||
|
|
|
@ -58,6 +58,13 @@ class Note_tree_area( Div ):
|
||||||
class_ = u"middle_image",
|
class_ = u"middle_image",
|
||||||
title = u"Add one of your notes to this note tree."
|
title = u"Add one of your notes to this note tree."
|
||||||
),
|
),
|
||||||
|
Input(
|
||||||
|
type = u"button",
|
||||||
|
class_ = u"note_button",
|
||||||
|
id = u"new_note_tree_link_button",
|
||||||
|
value = u"add quick link",
|
||||||
|
title = u"Add one of your notes to this note tree.",
|
||||||
|
),
|
||||||
Span( id = u"new_note_tree_link_area" ),
|
Span( id = u"new_note_tree_link_area" ),
|
||||||
) or None,
|
) or None,
|
||||||
id = u"new_note_tree_link_row",
|
id = u"new_note_tree_link_row",
|
||||||
|
|
Reference in New Issue