make video optional, fix css, fix settings

diff --git a/README.rst b/README.rst
index ef673f0da8b0e8f5a3e9ccda406cd04042dcdd34..e66e7451531f1a35ee901100cc063ca6558dc29d 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,7 @@
 README - TELECASTER
 ===================
 
-TeleCaster is a web controlled audio/video recording and braodcasting system.
-
+Video LIVE recording and streaming system based on Gstreamer, JACK, VncServer, Fluxbox
 
 LICENCE
 =======

diff --git a/example/settings.py b/example/settings.py
index a1f0fb37ed5869bff42cc076043a971c5aea6bab..4c25f3f33e8d6e70d70994db7cf093098457c78c 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -99,5 +99,6 @@ INSTALLED_APPS = (
     'south',
 )
 
-TELECASTER_CONF = '../conf/etc/telecaster/telecaster.xml'
+TELECASTER_CONF = '/etc/telecaster/telecaster.xml'
+TELECASTER_DISPLAY_VIDEO = False
 

diff --git a/telecaster/htdocs/css/telecaster.css b/telecaster/htdocs/css/telecaster.css
index 666cf28f56b8bff96648f037ccf3607f92e85f7e..6dc3936896bfdafb4201ef4fbd775a75dace836f 100644 (file)
--- a/telecaster/htdocs/css/telecaster.css
+++ b/telecaster/htdocs/css/telecaster.css
@@ -5,8 +5,8 @@ body {
 div.header {
     background-color: #030250;
     color: #FFFFFF;
-         padding: 0.5em;
-         height: 42px;
+      padding: 0.5em;
+      height: 42px;
     font: 0.8125em/1em Verdana, sans-serif;
     -moz-border-radius: 25px 25px 5px 5px;
     -webkit-border-radius: 25px 25px 5px 5px;
@@ -32,7 +32,7 @@ div.main {
        display: block;
        background-color: transparent;
        color: #000033;
-          padding: 1em;
+       padding: 1em;
        position: relative;
        font: 1em/1em Verdana, sans-serif;
 }
@@ -49,7 +49,7 @@ div.tools { background-color: #030250;
 
 div.colophon { background-color: transparent;
      color: #000000;
-        font-size: 80%;
+     font-size: 80%;
      float: right;
      padding: 0.5em 0px 0px 1em;
      font: 0.8125em/1em Verdana, sans-serif;

diff --git a/telecaster/templates/telecaster/base.html b/telecaster/templates/telecaster/base.html
index 3c0fe233ea399f00ab8f2f37e463ce29907d5849..d92ea2eb8785806646ad187ce0e29a4182df6db8 100644 (file)
--- a/telecaster/templates/telecaster/base.html
+++ b/telecaster/templates/telecaster/base.html
@@ -43,11 +43,13 @@ _V_("my_video_1").ready(function(){
 <div class="title">Status</div>
 
 {% block video %}
+{% if settings.TELECASTER_DISPLAY_VIDEO %}
 <div class="video">
 <video id="my_video_1" class="video-js vjs-default-skin" controls autoplay preload="auto" width="360" height="240" data-setup="{}">
 <source src="http://{{ host }}:8080/consume/safe" type="video/webm">
 </video>
 </div>
+{% endif %}
 {% endblock video %}
 
 <div class="status" id="server_status_table_wrapper">