From c4a313bf08c2e5dc3b0a804ef689105f419ab14a Mon Sep 17 00:00:00 2001
From: Dan Helfman <dan@luminotes.com>
Date: Sat, 26 Jan 2008 19:32:22 +0000
Subject: [PATCH] Completed conversion of checkbox and radio button text to use
 HTML <label> tag.

---
 NEWS                 |  1 +
 static/css/style.css |  9 +++++++++
 static/js/Wiki.js    | 12 ++++--------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 3f7638a..8f99aa1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 1.1.3: January ??, 2008
  * Now, if you delete a notebook and the only remaining notebook is read-only,
    then a new read-write notebook is created for you automatically.
+ * Made use of HTML <label> tag for UI checkboxes and radio buttons.
 
 1.1.2: January 22, 2008
  * You can no longer edit notes in the trash. You have to undelete them first.
diff --git a/static/css/style.css b/static/css/style.css
index ade5623..02b6ebf 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -411,6 +411,15 @@ img {
   text-decoration: none;
 }
 
+.pulldown_label {
+  color: #000000;
+}
+
+.pulldown_label:hover {
+  color: #ff6600;
+  cursor: pointer;
+}
+
 .message {
   padding: 0.5em;
   margin-bottom: 0.5em;
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 160d4a1..eee490a 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -332,7 +332,7 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
 }
 
 Wiki.prototype.background_clicked = function ( event ) {
-  if ( !hasElementClass( event.target(), "pulldown_checkbox" ) )
+  if ( !hasElementClass( event.target(), "pulldown_checkbox" ) && !hasElementClass( event.target(), "pulldown_label" ) )
     this.clear_pulldowns();
 }
 
@@ -1937,26 +1937,23 @@ function Options_pulldown( wiki, notebook_id, invoker, editor ) {
 
   this.invoker = invoker;
   this.editor = editor;
-  this.startup_checkbox = createDOM( "input", { "type": "checkbox", "class": "pulldown_checkbox" } );
-  this.startup_toggle = createDOM( "a", { "href": "#", "class": "pulldown_link", "title": "Display this note whenever the notebook is loaded." },
+  this.startup_checkbox = createDOM( "input", { "type": "checkbox", "class": "pulldown_checkbox", "id": "startup_checkbox" } );
+  this.startup_label = createDOM( "label", { "for": "startup_checkbox", "class": "pulldown_label", "title": "Display this note whenever the notebook is loaded." },
     "show on startup"
   );
 
   appendChildNodes( this.div, this.startup_checkbox );
-  appendChildNodes( this.div, this.startup_toggle );
+  appendChildNodes( this.div, this.startup_label );
   this.startup_checkbox.checked = editor.startup;
 
   var self = this;
   connect( this.startup_checkbox, "onclick", function ( event ) { self.startup_clicked( event ); } );
-  connect( this.startup_toggle, "onclick", function ( event ) { self.startup_clicked( event ); event.stop(); } );
 }
 
 Options_pulldown.prototype = new function () { this.prototype = Pulldown.prototype; };
 Options_pulldown.prototype.constructor = Options_pulldown;
 
 Options_pulldown.prototype.startup_clicked = function ( event ) {
-  if ( event.target() != this.startup_checkbox )
-    this.startup_checkbox.checked = this.startup_checkbox.checked ? false : true;
   this.editor.startup = this.startup_checkbox.checked;
 
   // save this note along with its toggled startup state
@@ -1967,7 +1964,6 @@ Options_pulldown.prototype.shutdown = function () {
   Pulldown.prototype.shutdown.call( this );
 
   disconnectAll( this.startup_checkbox );
-  disconnectAll( this.startup_toggle );
 }