improve timeside player color and layout integration

diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css
index 96f6be30f1e1c87cefcaa6fb699047b30edb74a2..2731182b44234a755b867a4b9926eea8ec2c44ae 100644 (file)
--- a/telemeta/htdocs/css/player.css
+++ b/telemeta/htdocs/css/player.css
@@ -1,17 +1,67 @@
-.ts-player {
-    padding-bottom: 0;
+.ts-skin-lab .ts-player {
+    padding: 0;
     clear: both;
-    padding-top: 16px !important;
+    background: white;
+    border: solid 1px #ADADAD;
+    margin-top: 10px;
 }
 
-.ts-player .ts-wave {
+.ts-skin-lab .ts-player .ts-wave {
     height: 200px;
 }
-.ts-player .ts-image {
-    width: 334px;
+.ts-skin-lab .ts-player .ts-image {
+    width: 360px;
     height: 200px;
 }
 
+.ts-skin-lab .ts-player .ts-viewer {
+    margin: 0;
+    border: 0;
+}
+.ts-skin-lab .ts-player .ts-viewer a.ts-marker, .ts-skin-lab .ts-player .ts-viewer a.ts-pointer {
+    line-height: 12px;
+    margin-bottom: 1px;
+}
+.ts-skin-lab .ts-player .ts-viewer .ts-pointer {
+    background: #BB0000;
+    color: #DDD;
+}
+.ts-skin-lab .ts-player .ts-viewer a.ts-pointer {
+    color: #BB0000;
+    /*background: transparent;*/
+    background: white;
+
+}
+
+.ts-skin-lab .ts-player .ts-viewer .ts-marker {
+    background: #0C1A70;
+    color: #DDD;
+}
+.ts-skin-lab .ts-player .ts-ruler .ts-section .ts-label {
+    background: white;
+    color: #555;
+}
+
+.ts-skin-lab .ts-player .ts-ruler .ts-section .ts-lines {
+    background: #F2F2F2;
+    color: #ADADAD;
+    border-bottom: #adadad;
+}
+
+.ts-skin-lab .ts-player .ts-control {
+    background: url('../images/player_controlbg.png');
+}
+
+.ts-skin-lab .ts-player .ts-control .ts-playback a {
+    padding: 20px 0 0 0;
+    height /**/:20px; /* for IE5/Win only */
+    margin-right: 4px;
+}
+
+.ts-skin-lab .ts-player .ts-control .ts-layout {
+    margin-left: 3px;
+}
+
 #player_maximized, #player_minimized {
     position: relative;
 }
@@ -21,8 +71,8 @@
     display: block;
     overflow: hidden;
     position: absolute;
-    right: 12px;
-    top: 4px;
+    right: 0px;
+    top: -12px;
     width: 18px;
     padding: 10px 0 0 0;
     height: 0px !important; 
@@ -31,6 +81,10 @@
     text-decoration: none;
     border: 0;
 }
+#player_maximized .toggle:hover, #player_minimized .toggle:hover {
+    background-position: 0 -10px;
+}
+
 #player_maximized {
     margin: 10px 0 15px 0;
     display: none;

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 9e63f824a56624e342419b910c1612a8756927f2..9aa2604fffa3d4e027833047ead18298ffafe296 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -88,6 +88,7 @@ class WebView(Component):
         
         item = MediaItem.objects.get(pk=item_id)
 
+        visualizer.set_colors((255,255,255), 'purple')
         stream = visualizer.render(item, width=1500, height=200)
         response = HttpResponse(stream, mimetype = 'image/png')
         return response