From 35434711c4803d3f541cdd9f51f766163d5ddd54 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 14 Feb 2011 17:13:51 +0100 Subject: [PATCH] update player skin and main theme --- telemeta/admin.py | 1 - telemeta/htdocs/css/player.css | 17 +++++++++-------- telemeta/htdocs/css/telemeta.css | 10 +++++----- telemeta/htdocs/images/player_controlbg.png | Bin 227 -> 172 bytes .../timeside/skins/lab/img/controlbg.png | Bin 234 -> 172 bytes .../htdocs/timeside/skins/lab/img/forward.png | Bin 922 -> 622 bytes .../htdocs/timeside/skins/lab/img/pause.png | Bin 635 -> 446 bytes .../htdocs/timeside/skins/lab/img/play.png | Bin 794 -> 584 bytes .../htdocs/timeside/skins/lab/img/rewind.png | Bin 945 -> 628 bytes .../timeside/skins/lab/img/setmarker.png | Bin 932 -> 668 bytes telemeta/htdocs/timeside/skins/lab/style.css | 16 ++++++++-------- .../telemeta_default/mediaitem_detail.html | 2 ++ telemeta/web/base.py | 2 +- 13 files changed, 25 insertions(+), 23 deletions(-) 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 c2b7f47d7fc7f247a44eb94597c8ba1ca551be30..edaf9fc9a90964d3dbbff9f90318c6206892d7a4 100755 GIT binary patch delta 85 zcmV-b0IL7v0jvR#UQXKr4h}B`M%sh-0000iNkl)Dy rU6AoWy4zB70Vzg-{Q-Yi(RZmih?i2j8i_3a00000NkvXXu0mjfnf@W> delta 141 zcmZ3(_?U4*T>T9m2|-Ri&#IrZ7#J8NOI#yLobz*YQ}ap~oQqNuOHxx5$}>wc6x=<1 z1Hv2m#DR+JJY5_^IIjEloaAjV5MXwHw?9Nc^uftw=Of2Ioh`LzQ)FQ5^axQ4@O0m$ tUC){6AJF-2_SWOo=F%IEl*MO8GCg!$@i63b70@IGPggcSmvv4FO#p+bGS2`2 diff --git a/telemeta/htdocs/timeside/skins/lab/img/controlbg.png b/telemeta/htdocs/timeside/skins/lab/img/controlbg.png index 57840d01af9af5dd81c31fc711483239d13d6580..edaf9fc9a90964d3dbbff9f90318c6206892d7a4 100755 GIT binary patch delta 85 zcmV-b0IL7$0jvR#UQXKr4h}B`M%sh-0000iNkl)Dy rU6AoWy4zB70Vzg-{Q-Yi(RZmih?i2j8i_3a00000NkvXXu0mjfoKYd| delta 148 zcmV;F0BirO0qOyeUVqpN1OYl2{S3am0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbNMM*?KR0!8ajKK-RKmfyp_usLBt`W<9Bu76&SYSTaciBb&9{Yny zbfk`KzFR$Y8)=VeiTdJhi7jbMYDsTNy-(2R;0My_PC?x)`wbKT0000S;72krzRiBL{Q4GJ0x0000DNk~Le0000U0000S2nGNE0CxBfsgWT)f7=2M z4k{ME6E zh#ZUu#dz^xT56%(P(z4`a3iQ!MNhQp1`;UQ_dL)xvfZ6sC9H{)OeUH4=KbIQ{ohQc zuTUr`DGp-{wOS2VHC0@UF#zcUe|LtfBB=tZ2&#%JDKpkCE|47>!1q_wUw2vk#t$iy5nNC-Z*SWn%Icp69W>fAz`APGW$i zovb4wM9y|#Q6*yxcc<@hWpF6c=M+@2#q2P)1B;%SSu?=&%q)XLS0jCr00VYl744bX zOqSy9JBSFrAMRr(Bgr)mHpkoLayP)AYMijSdJnBs%B-zcf77@3OdN3Rbqd-(Zf@}E z<#SF>T3vh4Cu}dQtKB5oe*x_7?(ppCBFD!^JwYzu9-pp1f9$b1|A_kjejxjZm+QR1 zD$3!(0gvY%viJR4_`4fG?sWCJH1a=9GUYSqs8LVqCt;_DOJT>mHIw1Jz=CIG(x6i;=Yin1(v`~Uy| M07*qoM6N<$f)VKt!~g&Q delta 876 zcmV-y1C#vj1eymSiBL{Q4GJ0x0000DNk~Le0000L0000g2nGNE09-o|?vWuqf7lEd z4KNci#6s-=000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008@NklqzFoB0Ew6)rNDur9(n-LBt@#)e-8EBCPCuFk^Tru zB_tq+B9TNS$W(2C1PK(c^TU2`f2N1jPS(4|iE&TuNOO7fov&u*&3j*OX}P3vTw#5E z9czV7%@2I~qF(y?B1{}tu-5U>iDMXJIwrN&@#kN!Sc_x)aye#baDX5PP}Pn-2z)*m zI!vV;W2|+UFhqHO3yi^9!Ke!84&}|8-?6g#ns2}PnlookXC}|g+~e+#e?M{Mv&&q& zb~O=G75wHlUahRMvAMzbKTI+|zmVDL&%ewds@$9Xm1?z?iuQ{8UA?oGtg)6*<0EVRVXlRBB6#D!!;7f1(XYncK~>rk z-uP;QQ>TVg*zLA=&P4uM{@vAjo}>sT#>XfYM>1zFLgHLiwks8p1ZX$m_}F!d#gPOi zS*dHv7mRb#^47<`yiT!LOvOzQV4X{hpl;3y{`O3FR$^dafZm>7e{M{SH(GA?OBXK? z8pDOrQNl1x#6$#da_Y8zI{FFSvPW~jVL;j3+$5LFzc-<^H9+wT`5dLv?^s(!)phLF zR(bZUL>PvcFlVS#Hh47mn7uxPEb}~%LLo;K_2B(4eE+`i-Ffg>`>0A9SU>`(Yql?TsPSt@Hv_>!OZ zK83GNyj<4q3SWabrn|ydC;nqA=&taoD$B3S-4#B7WBpP0gb(2SU?0cxwTye(gYae9 zxub^|j$G%$mr2-DqZMS|!gucIAwDitX*c$^!WZR3jPG+gLaK2xzm@q+uM7_YFw`Gq z3ZHQLC+*bbydBD+}QH=dd2C$E~OAu@hiYjjP1x(6`1YCYo``>T4eMiKlx+Tue&MAhE4(T$>V8Tui9uXmt=oZ&6#ZEUs7x zkr=UfG10CLf`p(`)U?`<`K{GVuzF_3iOmK7b#gMsvR2#bzRy^ewc2-&VqL3mc8?Kk zuAf*PSM2FndvZ}^R#&HGoHV(({N#FgTsy>pJU8psFggZ5vj6 q(-+8JJbj|g^*_CX>@2HM@dakSAh-}0005jNklbgVeL%Q!jo8X;bT=J?J%-D5&)&&29{v z_hvjq1^afbZh{BRz=Qq4{)d@2e{cA=25*Lz=LO^O81I#)k)#RTY?W>|L-M@9`@pS@ z8;D5bq}~VKfB3{%o|BA5Ilc9(q-lzoH9l#YaJ_epVw5A^2gEsy`6CsqY4y5oZ*3uxvblK&=Ul{98datB z1>oc7g0h@O+{pNT z+G!0DFO6?$eE+QR{b}{TWqc2AuLICq%W%#`TxWbz*9O29J>&7lAu2F?KIggan*MX+ Z`wE_Jdyj>k{6_!)002ovPDHLkV1hLT7~B8= diff --git a/telemeta/htdocs/timeside/skins/lab/img/play.png b/telemeta/htdocs/timeside/skins/lab/img/play.png index ccb87e877c2bd90bf0d3cd8cbe205d7171be559c..9a89b4f1ac0bd62d36689a5dbbdae06170d9dad1 100755 GIT binary patch delta 535 zcmV+y0_gpk2FL^E8 zKh5#+AJ07wnpl)UeSHHXuU^yI)=nT0Ft+-iV$IL#x-%uEW%LgW^020sf0d<09LLeS z=hAAA#F={3)=o`b9gFjE_I7vjpK7HfE2^rhdHy0o@3THap^#RpwH1rX9l}DZkjEWQ zC@-&I;?3yoTYa^DC4aK|d5K(idI(qU=bIbr#6Eq*bua$gVJ$s_g&(002ovPDHLkV1kP2^0oi~ delta 747 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 M07*qoM6N<$g2Y0!!2kdN 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 %}
+ {% if user.is_authenticated %} + {% endif %} Dublin Core
{% 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()) -- 2.39.5