rightcol radius, remove wrong dotted borders

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 2826611ae9329c1f2768450fc5fe50e6a891fd63..f73b3663052f9fdbf0a7aa9a59a7a311b13dfa69 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -100,9 +100,12 @@ a img { border: none; }
     z-index: 1;\r
     float: right;\r
     width: 362px;\r
-    border: 1px dotted #999;\r
+    border: 1px solid #999;\r
     padding: 6px;\r
     background-color: #eee;\r
+    -moz-border-radius: 5px 5px 5px 5px;\r
+    -webkit-border-radius: 5px 5px 5px 5px;\r
+    border-radius: 5px 5px 5px 5px;\r
 }\r
 #rightcol .analyzer, #rightcol .exporter {\r
     text-align: left;\r
@@ -701,10 +704,13 @@ table.listing tbody tr:hover { background: #f7f8fa !important }
 }\r
 \r
 .module {\r
-    border: 1px dotted #999;\r
+    border: 1px solid #999;\r
     background: #EEE;\r
     padding: 1em;\r
     margin: 0 0 1.5em 1.5em;\r
+    -moz-border-radius: 5px 5px 5px 5px;\r
+    -webkit-border-radius: 5px 5px 5px 5px;\r
+    border-radius: 5px 5px 5px 5px;\r
 }\r
 \r
 .module h3 {\r

diff --git a/telemeta/htdocs/timeside/skins/lab/style.css b/telemeta/htdocs/timeside/skins/lab/style.css
index f34eb9e294dd44ea6162f9eed6767ee908a9797b..003f5a66e179b7e6d1c41f84f0661c675dc522b1 100755 (executable)
--- a/telemeta/htdocs/timeside/skins/lab/style.css
+++ b/telemeta/htdocs/timeside/skins/lab/style.css
@@ -2,7 +2,7 @@
   background: #3c4251;
   padding-top: 10px;
   padding-bottom: 10px;
-  border: dotted #b2b2b2 1px;
+  border: solid #b2b2b2 1px;
 }
 
 .ts-skin-lab .ts-player .ts-viewer {
@@ -47,7 +47,7 @@
 .ts-skin-lab .ts-player .ts-control {
     background: url('img/controlbg.png');
     height: 28px;
-    border-top: dotted #b2b2b2 1px;
+/*     border-top: dotted #b2b2b2 1px; */
 }
 
 .ts-skin-lab .ts-player .ts-control .ts-layout {

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index f3ffbe57cc93eca77289267e4e54156a8d9e669f..fcd7a6f7681d405a2e545af62d57ec3807ea592a 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -89,13 +89,14 @@
                         {% endfor %}\r
                     </select>\r
                     -->\r
+                    &nbsp;Visualization :\r
                     <select id="visualizer_id" name="visualizer_id">\r
                         {% for v in visualizers %}\r
                         <option value="{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}">\r
                                 {{v.name}}</option>\r
                         {% endfor %}\r
                     </select>\r
-                    <input type="submit" value="Set" />\r
+<!--                     <input type="submit" value="Set" /> -->\r
                 </form>\r
 \r
                 <div class="markers_div" id="markers_div_id"></div>\r

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 5218ed5f3a28557a42ed883357bbfe33d63dc32e..390095c3d7065c993f99fa9ecd0539f10fb22360 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -164,7 +164,8 @@ class WebView(object):
         # Get TimeSide processors
         formats = []
         for encoder in self.encoders:
-            formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
+            if 'stream' in encoder.id():
+                formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
 
         graphers = []
         for grapher in self.graphers:
@@ -190,7 +191,8 @@ class WebView(object):
         
         formats = []
         for encoder in self.encoders:
-            formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
+            if 'stream' in encoder.id():
+                formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
 
         graphers = []
         for grapher in self.graphers: