From: yomguy <yomguy@parisson.com>
Date: Mon, 14 Feb 2011 16:13:51 +0000 (+0100)
Subject: update player skin and main theme
X-Git-Tag: 1.1~448
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=35434711c4803d3f541cdd9f51f766163d5ddd54;p=telemeta.git

update player skin and main theme
---

diff --git a/telemeta/admin.py b/telemeta/admin.py
index 73d511fd..d72b1dae 100644
--- a/telemeta/admin.py
+++ b/telemeta/admin.py
@@ -4,5 +4,4 @@ from django.contrib import admin
 
 admin.site.register(MediaCollection)
 admin.site.register(MediaItem)
-admin.site.register(User)
 
diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css
index 24fe57f6..c555ea5b 100644
--- a/telemeta/htdocs/css/player.css
+++ b/telemeta/htdocs/css/player.css
@@ -26,6 +26,7 @@
 .ts-skin-lab .ts-player .ts-viewer .ts-pointer {
     background: #BB0000;
     color: #DDD;
+    border: solid 1px #BB0000;
 }
 .ts-skin-lab .ts-player .ts-viewer a.ts-pointer {
     color: #BB0000;
@@ -34,16 +35,16 @@
 }
 
 .ts-skin-lab .ts-player .ts-viewer .ts-marker {
-    background: #0C1A70;
-    color: #DDD;
+    background: #e65911;
+    color: #FFF;
 }
 .ts-skin-lab .ts-player .ts-ruler .ts-section .ts-label {
-    background: white;
-    color: #555;
+    background: #595959;
+    color: white;
 }
 
 .ts-skin-lab .ts-player .ts-ruler .ts-section .ts-lines {
-    background: #F2F2F2;
+    background: #2e2e2e;
     color: #ADADAD;
     border-bottom: solid 1px #adadad;
 }
@@ -53,13 +54,13 @@
 }
 
 .ts-skin-lab .ts-player .ts-control .ts-playback a {
-    padding: 20px 0 0 0;
+    padding: 28px 0 0 0;
     height /**/:20px; /* for IE5/Win only */
-    margin-right: 4px;
+    margin-right: 0px;
 }
 
 .ts-skin-lab .ts-player .ts-control .ts-layout {
-    margin-left: 3px;
+    margin-left: 0px;
 }
 
 #player_maximized, #player_minimized {
diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index e3be051e..cc0b97d9 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -346,7 +346,7 @@ form.login .submit {
 
 /* Navigation (borrowed from Trac) */
 .nav h2, .nav hr { display: none }
-.nav ul { font-size: 10px; list-style: none; margin: 0; text-align: left }
+.nav ul { font-size: 13px; list-style: none; margin: 0; text-align: left }
 .nav li {
  border-right: 1px solid #d7d7d7;
  display: inline;
@@ -357,20 +357,20 @@ form.login .submit {
 
 /* Main navigation bar  (borrowed from Trac) */
 #menu {
- background: #f7f7f7 url(../images/topbar_gradient.png) 0 0;
+ background: #6a0307 ;
  border: 1px solid #000;
  font: normal 10px verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif;
  margin: .66em 0 .33em;
- padding: .2em 0;
+ padding: 1em 0;
 }
 #menu li { border-right: none; padding: .25em 0 }
 #menu li.last { border-right: 1px solid #000 }
 #menu :link, #menu :visited {
- background: url(../images/dots.gif) 0 0 no-repeat;
  border-right: 1px solid #fff;
  border-bottom: none;
  border-left: 1px solid #555;
- color: #000;
+ color: #FFF;
+ font-weight: bold;
  padding: .2em 20px;
 }
 * html #menu :link, * html #menu :visited { background-position: 1px 0 }
diff --git a/telemeta/htdocs/images/player_controlbg.png b/telemeta/htdocs/images/player_controlbg.png
index c2b7f47d..edaf9fc9 100755
Binary files a/telemeta/htdocs/images/player_controlbg.png and b/telemeta/htdocs/images/player_controlbg.png differ
diff --git a/telemeta/htdocs/timeside/skins/lab/img/controlbg.png b/telemeta/htdocs/timeside/skins/lab/img/controlbg.png
index 57840d01..edaf9fc9 100755
Binary files a/telemeta/htdocs/timeside/skins/lab/img/controlbg.png and b/telemeta/htdocs/timeside/skins/lab/img/controlbg.png differ
diff --git a/telemeta/htdocs/timeside/skins/lab/img/forward.png b/telemeta/htdocs/timeside/skins/lab/img/forward.png
index 86485d0d..66f62327 100755
Binary files a/telemeta/htdocs/timeside/skins/lab/img/forward.png and b/telemeta/htdocs/timeside/skins/lab/img/forward.png differ
diff --git a/telemeta/htdocs/timeside/skins/lab/img/pause.png b/telemeta/htdocs/timeside/skins/lab/img/pause.png
index d09ad51c..103357f0 100755
Binary files a/telemeta/htdocs/timeside/skins/lab/img/pause.png and b/telemeta/htdocs/timeside/skins/lab/img/pause.png differ
diff --git a/telemeta/htdocs/timeside/skins/lab/img/play.png b/telemeta/htdocs/timeside/skins/lab/img/play.png
index ccb87e87..9a89b4f1 100755
Binary files a/telemeta/htdocs/timeside/skins/lab/img/play.png and b/telemeta/htdocs/timeside/skins/lab/img/play.png differ
diff --git a/telemeta/htdocs/timeside/skins/lab/img/rewind.png b/telemeta/htdocs/timeside/skins/lab/img/rewind.png
index ec45b385..550263fd 100755
Binary files a/telemeta/htdocs/timeside/skins/lab/img/rewind.png and b/telemeta/htdocs/timeside/skins/lab/img/rewind.png differ
diff --git a/telemeta/htdocs/timeside/skins/lab/img/setmarker.png b/telemeta/htdocs/timeside/skins/lab/img/setmarker.png
index b642e824..af79be53 100644
Binary files a/telemeta/htdocs/timeside/skins/lab/img/setmarker.png and b/telemeta/htdocs/timeside/skins/lab/img/setmarker.png differ
diff --git a/telemeta/htdocs/timeside/skins/lab/style.css b/telemeta/htdocs/timeside/skins/lab/style.css
index a8626c54..f34eb9e2 100755
--- a/telemeta/htdocs/timeside/skins/lab/style.css
+++ b/telemeta/htdocs/timeside/skins/lab/style.css
@@ -53,22 +53,22 @@
 .ts-skin-lab .ts-player .ts-control .ts-layout {
     margin-left: 12px;
     margin-right: 12px;
-    padding-top: 4px;
+    padding-top: 0px;
 }
 
 .ts-skin-lab .ts-player .ts-control .ts-playback a {
     display: block;
     float: left;
-    width: 21px;
-    padding: 21px 0 0 0;
+    width: 30px;
+    padding: 28px 0 0 0;
     overflow: hidden;
     height: 0px !important; 
-    height /**/:21px; /* for IE5/Win only */
-    margin-right: 1px;
+    height /**/:28px; /* for IE5/Win only */
+    margin-right: 0px;
 }
 
 .ts-skin-lab .ts-player .ts-control .ts-playback a:hover {
-    background-position: 0 -21px;
+    background-position: 0 -28px;
 }
 
 .ts-skin-lab .ts-player .ts-control .ts-playback .ts-play {
@@ -95,10 +95,10 @@
 .ts-skin-lab .ts-player .ts-marker-control .ts-set-marker {
     display: block;
     width: 89px;
-    padding: 21px 0 0 0;
+    padding: 28px 0 0 0;
     overflow: hidden;
     height: 0px !important; 
-    height /**/:21px; /* for IE5/Win only */
+    height /**/:28px; /* for IE5/Win only */
     background-image: url('img/setmarker.gif');
     margin: 5px auto 0 auto;
 }
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 5ed93fb6..aad13496 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -32,7 +32,9 @@
 {% if item %}
 {% block submenu %}
 <div>
+    {% if user.is_authenticated %} 
     <a href="{% url telemeta-item-detail-edit item.public_id %}"><button>EDIT</button></a>
+    {% endif %}
     <a href="{% url telemeta-item-dublincore item.public_id %}">Dublin Core</a>
 </div>
 {% endblock %}
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 95a7ce8b..bf42b7bc 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -417,7 +417,7 @@ class WebView(object):
     
     def __get_admin_context_vars(self):
         return {"enumerations": self.__get_enumerations_list()}
-
+        
     @login_required
     def admin_index(self, request):
         return render(request, 'telemeta/admin.html', self. __get_admin_context_vars())