From d886ffdde2c0243fdcc7303ba18d9ced219f7e05 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Sun, 18 Mar 2012 12:39:11 +0000
Subject: [PATCH] in manage places, resurrect place name (top right), fixes
 #670

---
 demos/videotimelineplayer/js/demo.js        | 16 +++++++++++-----
 source/Ox.UI/js/Calendar/Ox.ListCalendar.js |  4 ++--
 source/Ox.UI/js/Map/Ox.ListMap.js           |  3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/demos/videotimelineplayer/js/demo.js b/demos/videotimelineplayer/js/demo.js
index 5eafafab..e6dae991 100644
--- a/demos/videotimelineplayer/js/demo.js
+++ b/demos/videotimelineplayer/js/demo.js
@@ -33,21 +33,27 @@ Ox.load('UI', function() {
 
     Ox.get('srt/0097514.srt', function(srt) {
 
-        var $videoTimelinePlayer = Ox.VideoTimelinePlayer({
+        var id = '0097514',
+        // var id = '0318034',
+
+            $videoTimelinePlayer = Ox.VideoTimelinePlayer({
                 duration: 3029.96,
+                //duration: 5956.24,
                 getFrameURL: function(position) {
-                    return 'http://0xdb.org/0097514/64p' + position + '.jpg'
+                    return 'http://0xdb.org/' + id + '/64p' + position + '.jpg'
                 },
                 getImageURL: function(i) {
-                    return 'http://0xdb.org/0097514/timeline64p' + i + '.png'
+                    return 'http://0xdb.org/' + id + '/timeline64p' + i + '.png'
+                    //return 'png/timelinecenter64p' + i + '.png'
                 },
                 height: window.innerHeight - 65,
                 paused: true,
                 position: 1000,
                 subtitles: Ox.parseSRT(srt),
-                timelineURL: 'http://0xdb.org/0097514/timeline16p.png',
+                timelineURL: 'http://0xdb.org/' + id + '/timeline16p.png',
                 videoRatio: 1.291667,
-                videoURL: 'http://0xdb.org/0097514/96p.webm',
+                //videoRatio: 1.833333,
+                videoURL: 'http://0xdb.org/' + id + '/96p.webm',
                 width: window.innerWidth - 129
             })
             .bindEvent({
diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
index 3917ec99..7a36670b 100644
--- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
@@ -297,7 +297,6 @@ Ox.ListCalendar = function(options, self) {
             width: 228
         })
         .css({float: 'left', margin: '4px'})
-        .appendTo(self.$eventTitle)
         .bindEvent({
             singleclick: function() {
                 self.$calendar.panToEvent();
@@ -305,7 +304,8 @@ Ox.ListCalendar = function(options, self) {
             doubleclick: function() {
                 self.$calendar.zoomToEvent();
             }
-        });
+        })
+        .appendTo(self.$eventTitle);
     self.$deselectEventButton = Ox.Button({
             title: 'close',
             tooltip: 'Done',
diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index 9ace9cd4..e8a03291 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -455,7 +455,8 @@ Ox.ListMap = function(options, self) {
             doubleclick: function() {
                 self.$map.zoomToPlace();
             }
-        });
+        })
+        .appendTo(self.$placeTitle);
     self.$deselectPlaceButton = Ox.Button({
             title: 'close',
             tooltip: 'Done',