update player skin and main theme

diff --git a/telemeta/admin.py b/telemeta/admin.py
index 73d511fd74f216e70e83eef1bb9e8dc9801fbb33..d72b1daebeb7b1bf3f851d91f133145d80e7e85a 100644 (file)
--- 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 24fe57f640c37b847930384dc769122989461d2b..c555ea5bc3cee941b3958283fe3a44f34cbc6c5c 100644 (file)
--- 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 e3be051ebed6b41f69b12dcfc19c8f65b22e5704..cc0b97d9df0c545f423a89910e37abee48cabfa8 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -346,7 +346,7 @@ form.login .submit {
 \r
 /* Navigation (borrowed from Trac) */\r
 .nav h2, .nav hr { display: none }\r
-.nav ul { font-size: 10px; list-style: none; margin: 0; text-align: left }\r
+.nav ul { font-size: 13px; list-style: none; margin: 0; text-align: left }\r
 .nav li {\r
  border-right: 1px solid #d7d7d7;\r
  display: inline;\r
@@ -357,20 +357,20 @@ form.login .submit {
 \r
 /* Main navigation bar  (borrowed from Trac) */\r
 #menu {\r
- background: #f7f7f7 url(../images/topbar_gradient.png) 0 0;\r
+ background: #6a0307 ;\r
  border: 1px solid #000;\r
  font: normal 10px verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif;\r
  margin: .66em 0 .33em;\r
- padding: .2em 0;\r
+ padding: 1em 0;\r
 }\r
 #menu li { border-right: none; padding: .25em 0 }\r
 #menu li.last { border-right: 1px solid #000 }\r
 #menu :link, #menu :visited {\r
- background: url(../images/dots.gif) 0 0 no-repeat;\r
  border-right: 1px solid #fff;\r
  border-bottom: none;\r
  border-left: 1px solid #555;\r
- color: #000;\r
+ color: #FFF;\r
+ font-weight: bold;\r
  padding: .2em 20px;\r
 }\r
 * html #menu :link, * html #menu :visited { background-position: 1px 0 }\r

diff --git a/telemeta/htdocs/images/player_controlbg.png b/telemeta/htdocs/images/player_controlbg.png
index c2b7f47d7fc7f247a44eb94597c8ba1ca551be30..edaf9fc9a90964d3dbbff9f90318c6206892d7a4 100755 (executable)
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 57840d01af9af5dd81c31fc711483239d13d6580..edaf9fc9a90964d3dbbff9f90318c6206892d7a4 100755 (executable)
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 86485d0d222533ed1f5f25a9c796eeeed14a3dd3..66f623273efdc2568362bd4546c691dcd4cc4e46 100755 (executable)
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 d09ad51cf397949151fa48d656b82e96de1375f1..103357f00a8c821343bb9f0d7dbec0070db2e6cf 100755 (executable)
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 ccb87e877c2bd90bf0d3cd8cbe205d7171be559c..9a89b4f1ac0bd62d36689a5dbbdae06170d9dad1 100755 (executable)
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 ec45b3852a6ef7409015ce54eb4bb689af4af9be..550263fda609c58edd016c1110147b8a1f5116a5 100755 (executable)
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 b642e824e9cdcfccf9eeccb5facdecd3643770df..af79be53914a4ea08abfa20cbb8550a43f81177b 100644 (file)
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 a8626c54a5587fc0cd52fa86c0948fd800cd96e3..f34eb9e294dd44ea6162f9eed6767ee908a9797b 100755 (executable)
--- 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 5ed93fb6bd584eb05ff79d500aee1641e0fb5202..aad134968dced7747ce5c0b63a03411cf392825c 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -32,7 +32,9 @@
 {% if item %}\r
 {% block submenu %}\r
 <div>\r
+    {% if user.is_authenticated %} \r
     <a href="{% url telemeta-item-detail-edit item.public_id %}"><button>EDIT</button></a>\r
+    {% endif %}\r
     <a href="{% url telemeta-item-dublincore item.public_id %}">Dublin Core</a>\r
 </div>\r
 {% endblock %}\r

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 95a7ce8b9ab7674f577751a512cae4364b7c8224..bf42b7bcf831174fbc3207ee4b2641a1cc3ad54a 100644 (file)
--- 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())