yaz/commit
UPDATE interface layout
author | Michiel Hildebrand |
---|---|
Mon Nov 7 17:43:30 2011 +0100 | |
committer | Michiel Hildebrand |
Mon Nov 7 17:43:30 2011 +0100 | |
commit | f585e2b76d4c4dec77a6906b20cf44e55ba481d5 |
tree | f8c019e850da259088a5da2184f6ba4c702d838a |
parent | 18f1fac6c52f576adf6c146864d9fa72b0305c33 |
Diff style: patch stat
diff --git a/applications/yaz_shot_annotation.pl b/applications/yaz_shot_annotation.pl index e80360e..db1a6c8 100644 --- a/applications/yaz_shot_annotation.pl +++ b/applications/yaz_shot_annotation.pl @@ -155,7 +155,7 @@ html_video_page_yui(Video, Shots, Sources) --> ], [node,event,widget,anim, 'json','jsonp','querystring-stringify-simple',io, - 'video-player','video-frames',timeline, + 'video-player','video-frames',%timeline, 'tag-list','tag-linker','annotation-form' ], [ \js_new(videoPlayer, @@ -167,12 +167,13 @@ html_video_page_yui(Video, Shots, Sources) --> controls:symbol(true), duration:Duration })), - \js_new(timeline, + /*\js_new(timeline, 'Y.mazzle.Timeline'({height:20, width:540, duration:Duration, items:[] })), + */ \js_new(videoFrames, 'Y.mazzle.VideoFrames'({frameServer:FrameServer, video:Src, @@ -193,14 +194,15 @@ html_video_page_yui(Video, Shots, Sources) --> })), \js_new(tagLinker, 'Y.mazzle.TagLinker'({sources:Sources, - height:562 + height:562, + limit:10 })), \js_new(annotationForm, 'Y.mazzle.AnnotationForm'({ width:540 })), \js_yui3_render(videoPlayer, #(videoplayer)), - \js_yui3_render(timeline, #(timeline)), + %\js_yui3_render(timeline, #(timeline)), \js_yui3_render(videoFrames, #(videoframes)), \js_yui3_render(tagList, #(taglist)), \js_yui3_render(tagLinker, #(taglinker)), diff --git a/web/css/shotgarden.css b/web/css/shotgarden.css index 0c6491e..f94b417 100644 --- a/web/css/shotgarden.css +++ b/web/css/shotgarden.css @@ -21,7 +21,7 @@ border-width: 1px 1px 0 1px; border-style: solid; border-color: #CCC; - background-color: #EEE; + background-color: #E2E2E2; } @@ -160,27 +160,35 @@ padding: 4px; } .yui3-tag-linker .sources { - height: 510px; - overflow: auto; } .yui3-tag-linker .controls { - height: 25px; + height: 20px; + border-top: 1px solid #DDD; + padding: 2px 0; } .yui3-tag-linker .controls button { width: 100%; - height: 25px; - border: none; } .yui3-tag-linker .source-hd { - border-bottom: 1px solid #CCC; + border-bottom: 1px solid #DDD; font-weight: bold; - padding: 4px 4px 0; - background-color: #EEE; + padding: 4px 4px 2px; + background-color: #F2F2F2; +} +.yui3-tag-linker .source-bd { + height: 120px; + overflow: auto; +} +.yui3-tag-linker #subject .source-bd { + height: 208px; } .yui3-tag-linker ul { margin: 0; padding: 0; } +.yui3-tag-linker ul.hidden { + display: none; +} .yui3-tag-linker li { list-style: none; padding: 4px; diff --git a/web/js/tagplayer/tagLinker.js b/web/js/tagplayer/tagLinker.js index 9f4e68d..e2ebe67 100644 --- a/web/js/tagplayer/tagLinker.js +++ b/web/js/tagplayer/tagLinker.js @@ -101,7 +101,7 @@ YUI.add('tag-linker', function(Y) { label = source.label; //img = source.img; - var box = node.appendChild(Node.create('<div class="source"></div>')); + var box = node.appendChild(Node.create('<div id="'+key+'" class="source"></div>')); //box.appendChild('<div class="source-hd"><img src="'+img+'" alt="'+label+'"></div>'); box.appendChild('<div class="source-hd">'+label+'</div>'); var bd = box.appendChild(Node.create('<div class="source-bd"></div>')); @@ -140,6 +140,7 @@ YUI.add('tag-linker', function(Y) { + "?callback={callback}" + source.parameters + "&query="+Y.JSON.stringify(query); + source._list.addClass("hidden"); Y.log('reconcile against '+source.label); this.fire("reconcileStart", {"source":source}); this.reconcile(url, source); @@ -160,6 +161,7 @@ YUI.add('tag-linker', function(Y) { node.addClass("hidden"); } }) + source._list.removeClass("hidden"); }) },