witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Renamed "options" tab to "tools" tab.

This commit is contained in:
Dan Helfman 2009-03-02 19:39:02 -08:00
parent 50cc2ff19b
commit e9414117ce
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,8 +1,8 @@
1.6.8: ?
* You can now print your entire notebook. Just click the "print" link on the
left side of the page.
* You can now print an individual note. Just click the "options" tab on a
note and then "print this note".
* You can now print an individual note. Just click the "tools" tab on a note
and then "print this note".
* Changed the order of exported HTML and CSV notebooks so that after all the
"startup" notes are included, the remaining notes are included in
alphabetical order (instead of reverse chronological order).

22
static/js/Editor.js
View File

@ -181,12 +181,12 @@ Editor.prototype.create_note_controls = function () {
"title": "previous revisions"
} );
this.options_button = createDOM( "input", {
this.tools_button = createDOM( "input", {
"type": "button",
"class": "note_button",
"id": "options_" + iframe_id,
"value": "options",
"title": "note options"
"id": "tools_" + iframe_id,
"value": "tools",
"title": "note tools"
} );
}
}
@ -207,8 +207,8 @@ Editor.prototype.create_note_controls = function () {
this.delete_button ? " " : null,
this.changes_button ? this.changes_button : null,
this.changes_button ? " " : null,
this.options_button ? this.options_button : null,
this.options_button ? " " : null,
this.tools_button ? this.tools_button : null,
this.tools_button ? " " : null,
this.undelete_button ? this.undelete_button : null,
this.undelete_button ? " " : null,
this.hide_button ? this.hide_button : null
@ -221,7 +221,7 @@ Editor.prototype.connect_note_controls = function ( store_control_buttons ) {
this.delete_button = getElement( "delete_" + iframe_id );
this.undelete_button = getElement( "undelete_" + iframe_id );
this.changes_button = getElement( "changes_" + iframe_id );
this.options_button = getElement( "options_" + iframe_id );
this.tools_button = getElement( "tools_" + iframe_id );
this.hide_button = getElement( "hide_" + iframe_id );
}
@ -238,9 +238,9 @@ Editor.prototype.connect_note_controls = function ( store_control_buttons ) {
disconnectAll( this.changes_button );
connect( this.changes_button, "onclick", function ( event ) { signal( self, "changes_clicked", event ); } );
}
if ( this.options_button ) {
disconnectAll( this.options_button );
connect( this.options_button, "onclick", function ( event ) { signal( self, "options_clicked", event ); } );
if ( this.tools_button ) {
disconnectAll( this.tools_button );
connect( this.tools_button, "onclick", function ( event ) { signal( self, "tools_clicked", event ); } );
}
if ( this.hide_button ) {
disconnectAll( this.hide_button );
@ -1435,7 +1435,7 @@ Editor.prototype.shutdown = function( event ) {
disconnectAll( this );
disconnectAll( this.delete_button );
disconnectAll( this.changes_button );
disconnectAll( this.options_button );
disconnectAll( this.tools_button );
disconnectAll( this.hide_button );
disconnectAll( this.grabber );
disconnectAll( iframe );

20
static/js/Wiki.js
View File

@ -845,7 +845,7 @@ Wiki.prototype.create_editor = function ( id, note_text, deleted_from_id, revisi
connect( editor, "delete_clicked", function ( event ) { self.delete_editor( event, editor ) } );
connect( editor, "undelete_clicked", function ( event ) { self.undelete_editor_via_trash( event, editor ) } );
connect( editor, "changes_clicked", function ( event ) { self.toggle_editor_changes( event, editor ) } );
connect( editor, "options_clicked", function ( event ) { self.toggle_editor_options( event, editor ) } );
connect( editor, "tools_clicked", function ( event ) { self.toggle_editor_tools( event, editor ) } );
connect( editor, "focused", this, "editor_focused" );
connect( editor, "mouse_hovered", function ( target ) { self.editor_mouse_hovered( editor, target ) } );
connect( editor, "grabber_pressed", function ( event ) { self.editor_focused( null, false, false ); } );
@ -3076,9 +3076,9 @@ Wiki.prototype.toggle_editor_changes = function ( event, editor ) {
);
}
Wiki.prototype.toggle_editor_options = function ( event, editor ) {
Wiki.prototype.toggle_editor_tools = function ( event, editor ) {
// if the pulldown is already open, then just close it
var pulldown_id = "options_" + editor.id;
var pulldown_id = "tools_" + editor.id;
var existing_div = getElement( pulldown_id );
if ( existing_div ) {
existing_div.pulldown.shutdown();
@ -3086,7 +3086,7 @@ Wiki.prototype.toggle_editor_options = function ( event, editor ) {
return;
}
new Options_pulldown( this, this.notebook.object_id, this.invoker, editor );
new Tools_pulldown( this, this.notebook.object_id, this.invoker, editor );
event.stop();
}
@ -3208,8 +3208,8 @@ Pulldown.prototype.shutdown = function () {
}
function Options_pulldown( wiki, notebook_id, invoker, editor ) {
Pulldown.call( this, wiki, notebook_id, "options_" + editor.id, editor.options_button );
function Tools_pulldown( wiki, notebook_id, invoker, editor ) {
Pulldown.call( this, wiki, notebook_id, "tools_" + editor.id, editor.tools_button );
this.invoker = invoker;
this.editor = editor;
@ -3238,10 +3238,10 @@ function Options_pulldown( wiki, notebook_id, invoker, editor ) {
Pulldown.prototype.finish_init.call( this );
}
Options_pulldown.prototype = new function () { this.prototype = Pulldown.prototype; };
Options_pulldown.prototype.constructor = Options_pulldown;
Tools_pulldown.prototype = new function () { this.prototype = Pulldown.prototype; };
Tools_pulldown.prototype.constructor = Tools_pulldown;
Options_pulldown.prototype.startup_clicked = function ( event ) {
Tools_pulldown.prototype.startup_clicked = function ( event ) {
this.editor.startup = this.startup_checkbox.checked;
this.editor.mark_dirty();
@ -3249,7 +3249,7 @@ Options_pulldown.prototype.startup_clicked = function ( event ) {
this.wiki.save_editor( this.editor );
}
Options_pulldown.prototype.shutdown = function () {
Tools_pulldown.prototype.shutdown = function () {
Pulldown.prototype.shutdown.call( this );
disconnectAll( this.startup_checkbox );

6
view/Main_page.py
View File

@ -72,9 +72,9 @@ class Main_page( Page ):
( read_write == Notebook.READ_WRITE ) and not note.deleted_from_id and Input(
type = "button",
class_ = "note_button",
id = "options_note_%s" % note.object_id,
value = "options",
title = "note options",
id = "tools_note_%s" % note.object_id,
value = "tools",
title = "note tools",
) or None,
( read_write != Notebook.READ_ONLY or not note.startup ) and not note.deleted_from_id and \
( read_write != Notebook.READ_WRITE_FOR_OWN_NOTES ) and Input(