yaz/commit

UPDATE improve interface labels

diff --git a/applications/yaz_shot_annotation.pl b/applications/yaz_shot_annotation.pl
index db1a6c8..ffe3c96 100644
--- a/applications/yaz_shot_annotation.pl
+++ b/applications/yaz_shot_annotation.pl
@@ -109,23 +109,26 @@ html_page(Video, Process, Shots, Sources) :-
 			  \yaz_video_header(Video),
 			  div(class('yui3-g'),
 			      [ div([class('yui3-u'), id(nav)],
-				    [ div(class(hd), '1. Select shot'),
+				    [ div(class(hd), '1. Select shot to annotate'),
 				      div(id(videoframes), []),
 				      div(a(href(Update),
 					    'Finish moderation'))
 				    ]),
 				div([class('yui3-u'), id(main)],
-				    [ div(class(hd), '2. View content'),
+				    [ div(class(hd), '2a. Selected shot: video'),
 				      div(id(timeline), []),
 				      div(id(videoplayer), []),
-				      div(id(annotationform), [])
+				      div(id(annotations),
+					  [ div(class(hd), '2b. Selected shot: annotations'),
+					    div(id(annotationform), [])
+					  ])
 				    ]),
 				div([class('yui3-u'), id('select-tag')],
-				    [ div(class(hd), '3A. Select relevant tags'),
+				    [ div(class(hd), '3. Select	tags to annotate shot'),
 				      div(id(taglist), [])
 				    ]),
 				div([class('yui3-u hidden'), id('select-concept')],
-				    [ div(class(hd), '3B. Select concept'),
+				    [ div(class(hd), '4. Specify the intended meaning'),
 				      div(id(taglinker), [])
 				    ])
 			      ]),
diff --git a/web/css/shotgarden.css b/web/css/shotgarden.css
index f94b417..da9c2e8 100644
--- a/web/css/shotgarden.css
+++ b/web/css/shotgarden.css
@@ -45,7 +45,7 @@
 #select-concept.hidden {
 	display:none;
 }
-#annotationform {
+#annotations {
 	margin-top: 10px;
 }
 
@@ -167,7 +167,7 @@
 	padding: 2px 0;
 }
 .yui3-tag-linker .controls button {
-	width: 100%;
+	width: 50%;
 }
 .yui3-tag-linker .source-hd {
 	border-bottom: 1px solid #DDD;
diff --git a/web/js/tagplayer/tagLinker.js b/web/js/tagplayer/tagLinker.js
index e2ebe67..90bec6a 100644
--- a/web/js/tagplayer/tagLinker.js
+++ b/web/js/tagplayer/tagLinker.js
@@ -51,7 +51,8 @@ YUI.add('tag-linker', function(Y) {
 			var tagNode = content.appendChild(Node.create('<div class="tag"></div>'));
 			var linkBox = content.appendChild(Node.create('<div class="sources"></div>'));
 			var controls = content.appendChild('<div class="controls"></div>');
-			this.cancelButton = controls.appendChild('<button>cancel</button>');
+			this.submitButton = controls.appendChild('<button>Submit</button>');
+			this.cancelButton = controls.appendChild('<button>Cancel</button>');
 			this._renderSources(linkBox);
 			this.tagNode = tagNode;
 		},
@@ -60,9 +61,10 @@ YUI.add('tag-linker', function(Y) {
 			var sources = this.get("sources");
 			this.after("tagChange", this.syncUI);
 			this.cancelButton.on("click", this._cancel, this);
-			for(var key in sources) {	
+			this.submitButton.on("click", this._submit, this);
+			/*for(var key in sources) {	
 				Y.delegate("click", this._itemSelect, sources[key]._list, "li input", this, key);
-			}	
+			}*/	
 		},
 
 		syncUI : function() {
@@ -80,6 +82,10 @@ YUI.add('tag-linker', function(Y) {
 			var tag = this.get("tag");
 			this.fire("cancel", {"tag":tag});
 		},
+		_submit: function() {
+			var tag = this.get("tag");
+			this.fire("cancel", {"tag":tag});
+		},
 		
 		_itemSelect: function(e, type) {
 			var tag = this.get("tag"),
@@ -172,7 +178,7 @@ YUI.add('tag-linker', function(Y) {
 			
 			var url = (id.substr(0,1)=='/') ? 'http://www.freebase.com'+id : id;
 			
-			var html = "<input type=radio name='reconcileItem' value='"+id+"'>";
+			var html = "<input type=checkbox name='reconcileItem' value='"+id+"'>";
 			html += "<span class='name'><a target='info' href='"+url+"'>"+name+"</a></span>";
 			if(types&&!item.desc) {
 				html += "<div class='types'>";