From 99f60517b97f6ae2bfb9b5f571ba201abd9eda8c Mon Sep 17 00:00:00 2001 From: josch Date: Mon, 26 Nov 2007 14:25:31 +0000 Subject: [PATCH] added video heading, bookmark and edit button, more video data, permalink, iframe copypasta, splitted register, account, added wiki and bug links, added bookmark icons and maybe other things git-svn-id: http://yolanda.mister-muffin.de/svn@187 7eef14d0-6ed0-489d-bf55-20463b2d70db --- trunk/README | 3 +- trunk/daemon.pl | 2 +- trunk/functions.pl | 5 +- .../images/tango/accessories-text-editor.png | Bin 0 -> 1630 bytes trunk/images/tango/bookmark-delete.png | Bin 0 -> 1631 bytes trunk/images/tango/bookmark-delete.svg | 1257 +++++++++++++++++ trunk/images/tango/bookmark-new.png | Bin 0 -> 1423 bytes trunk/images/tango/bookmark.png | Bin 0 -> 1098 bytes trunk/images/tango/bookmark.svg | 470 ++++++ trunk/video.pl | 8 +- trunk/xsl/xhtml.xsl | 78 +- trunk/xsl/xhtml/account.xsl | 99 ++ trunk/xsl/xhtml/register.xsl | 41 + trunk/xsl/xhtml/results.xsl | 8 +- trunk/xsl/xhtml/video.xsl | 82 +- 15 files changed, 1973 insertions(+), 80 deletions(-) create mode 100644 trunk/images/tango/accessories-text-editor.png create mode 100644 trunk/images/tango/bookmark-delete.png create mode 100644 trunk/images/tango/bookmark-delete.svg create mode 100644 trunk/images/tango/bookmark-new.png create mode 100644 trunk/images/tango/bookmark.png create mode 100644 trunk/images/tango/bookmark.svg create mode 100644 trunk/xsl/xhtml/account.xsl create mode 100644 trunk/xsl/xhtml/register.xsl diff --git a/trunk/README b/trunk/README index bce3692..4209a8c 100755 --- a/trunk/README +++ b/trunk/README @@ -40,4 +40,5 @@ Help If you have any questions/bug reports/ideas, you can find help in the following locations: -http://mister-muffin.de/proj - Main project page and wiki +http://yolanda.mister-muffin.de/proj - Main project page and wiki +yolanda@conference.mister-muffin.de - jabber multi user chat diff --git a/trunk/daemon.pl b/trunk/daemon.pl index 6dfba9c..d4a455e 100755 --- a/trunk/daemon.pl +++ b/trunk/daemon.pl @@ -172,7 +172,7 @@ while(1) unlink "$root/tmp/$id"; } - #write status 1 to uploaded table + #delete from uploaded table $dbh->do(qq{delete from uploaded where id = ?}, undef, $id) or interrupt $dbh->errstr; } } diff --git a/trunk/functions.pl b/trunk/functions.pl index d805926..12337ff 100644 --- a/trunk/functions.pl +++ b/trunk/functions.pl @@ -76,6 +76,9 @@ sub get_page_array $page->{'xmlns:rdf'} = $xmlns_rdf; } +# called by video.pl (display ambiguous videos), +# search.pl (display search results) +# and account.pl (display own videos) sub fill_results { #connect to db @@ -132,7 +135,7 @@ sub fill_results 'dc:publisher' => [$publisher], 'dc:contributor' => [$contributor], 'dc:date' => [$timestamp], - 'dc:identifier' => ["$domain/video/$title/$id" . ($duration == 0 ? "/edit=true" : "")], + 'dc:identifier' => ["$domain/video/$title/$id" . ($duration == 0 ? "/action=edit" : "")], 'dc:source' => [$source], 'dc:language' => [$language], 'dc:coverage' => [$coverage], diff --git a/trunk/images/tango/accessories-text-editor.png b/trunk/images/tango/accessories-text-editor.png new file mode 100644 index 0000000000000000000000000000000000000000..f84c37c8542a9dc8c3709478b468ad5a26f4212d GIT binary patch literal 1630 zcmV-k2BG=XkQCe2oI^$Q~^{95h4+x2ob3Qgxd50DG-%N7^Sp!*)JM(?tIp;sK3!lg5u}MfN#eHIBqx{`s!!Q2j zjXxf%SUjg{{1V`9SlV*GZHqmMBHtB?_(v`O^(UTu{=Nm|ayf5vpjnSZ!Xlr~+tFxD z+yho3kuWneGsI$XS<45STbh!|r1@C_)EYQ;?8OHk`Rb!nGx-l*wkx)XCt{3@jEKd> z#e2cT6EQ|cN2$-}FV7r4@TGm<+y9jVXU?5H_sK>AG#7aNM;`y$6S1D|9$q^75^d24 zS7t9GrML^uW7`g%y_^S>YJQd%et3whb05aeoO$yI@XZTP5%O#530aXBD$Vw?yV#;DPQqgo?=0vVw9Ssz;p$eh8a{<6)7cC zmvWe9{qPEWJ|C%Mipkt00I6h}$=n10=~SAD$#M4@uh&aDmBH2vTs{6c-8&!B5}BP^ z@x~m5Wx>L~&)$(`&IL4A07I!vbgx^2F@F+vFeab!`2IY^y*_o zI@^i&Z>M$^GrIk zrsslWf4X`sNF_5HIuCV3N%Z&Ck)PAolDh&dtOtU@AW}+9vrKL(hm`iZvI_xTub)gh z!}!EFrfIm9$)vN4kNgYI8_yE&-Rh9voTFG!x%J+8KBVh~Z=9ZPAYTL<50O>y)!La9BpcXm>o`g@i9 zp9G)$1uL-u?4>1q9mXGCnbeVHo&)eg+2y zxj6PdAn4L>5*hp!N<4*rX`1Z)40us5HjIU)+no$uBfb>)5;k6&d&W{Q$({ zaT19{gKMV^&eE(^VQ^rGciuk3;S+E3@(*^fc<~R&kcPhh5ZyZt5Q(%B4u@!I31FHg z0wsa-`j>T^Bfz%pc1_igQZje#DoabtRoAtFb1E^Ab(}lPPw>jmjxsfKor(N^XzzI# zZ#+$JxRr1?g2$sFrQ_1$@nBV~7~lcy`b`5ct#YfTIRd)7dff74Gg-ISP9%n)F1 zD8MM`K~+;RbiHoE#kx7Duf}E%s(SZQI#^XzblnWDC9eqxeEi9Rw^Ul;`pvnu=RwwA zwR#}yQuR;7)hbG)4T_==jmEis`*w4c&sr;>ZDqMYrBb0IwxxPwS^ccKaBnW9OCr}| zK-#q#SgnL<7!(Qx6$k?jKTZV@JAb%!e!cboee8Sj(=f2SRscW@XN}(TKbrdt8z{5J c{r^S$7o18NbCsAm!vFvP07*qoM6N<$g2ECMjQ{`u literal 0 HcmV?d00001 diff --git a/trunk/images/tango/bookmark-delete.png b/trunk/images/tango/bookmark-delete.png new file mode 100644 index 0000000000000000000000000000000000000000..6c783f2f1cd095ac50cfb183f7fd5fa946011051 GIT binary patch literal 1631 zcmV-l2B7(gP)8wQK~z|U#a3Nx6xS90&b{-uGvnO_+q;Fu6*epZVxmCH18Q2O zz(Yf&Jd{RNs2U|vo=~16ktp#?-cf=As#>XetgKcL@zRI16+do-K*V+$LID$d*N%5> zX4h-4cYbzeZXV3y{qeF(c<7OicJ|JhbH4lC@7#My2!a2nN$p;I^83gyxURl0ORBMP zgjjN&%Eu@FQvS!&0H9_D&YwU3=Ts_nJn%h{xiPAxx0%||@Xsg=yoR_S5V&&jkKw@4 z4~umx{JwFcx~AhjO`$N~Ho3 z`Uu>WjotU)I8KA>x(?1c4Gs?S9Xoa$Nu^SspFVv$(lr1gdh|*Nckbn`0EA)KkgQXeHW&9i z53yJb(P$I{0|V&k=|L)$k_^KbJ$v@7+5G*6ZCFbNAwa}HTmf;VF@`HZEe`8U1wnvJ zCWGneX}GQn-}m8p9;(%gjTe9ni@;0;r)~4<_Vhr(pXkh7P`hU58#p(dL-D zf2$$3-d)$lKmYYP{`U7#fbgW{vH z7=HTd85q6WA%wu#*j3#Bb_&(1ht!W#`0a0wWBkjT7#| zY#YE*sQ|-RyH-@IRmh6^qhrU8shu^@!D@n={O<&MH}xVKi$PHo7`h2rR$v$gT*rm& zR8TIjVtKiQY&MI9eBLun)87z4{XWo*4-M_Wy}S3I>{TEjplKR3O@m|GSglmBv{Xd7 zT!wAiaBLfkiw{sNE!`a*9SxqE0RV{hL?KcsT)KP-n>TGnB%;GG4KQLL68LUz9;KBM z3dJQXmr4*K1b{oW?>A(iS(uO20TCEu7#bQvGMU6|b`FdYZrr#5O;wR!$V1n4Kmf5= z6k!;`Dp+U>APmEn!rd4VAr^~62w-qrjss>4tz_?4gvrG002ovPDHLkV1fXN?#BQC literal 0 HcmV?d00001 diff --git a/trunk/images/tango/bookmark-delete.svg b/trunk/images/tango/bookmark-delete.svg new file mode 100644 index 0000000..b48145a --- /dev/null +++ b/trunk/images/tango/bookmark-delete.svg @@ -0,0 +1,1257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/images/tango/bookmark-new.png b/trunk/images/tango/bookmark-new.png new file mode 100644 index 0000000000000000000000000000000000000000..c67fbb8cc67cc5431144f2920f794e2135f3ef34 GIT binary patch literal 1423 zcmV;A1#tR_P)zE~8g8ob~`@U2f31TV!_s#016+cer@3yo<*$>z36v-jDV z~eLi+FD0R>eQrF+{hoS4N^Pu?f0NmLh5T_Ksg9EwCA7)dQ1+v*h~ zQv(At--9j!agYws31Frv097?@+h%HN3K3y8nM765QUSk|g9>AY6@V0QdqS+NoX0Sd z7{(%or0DG#rK9sTx;hO4<(ENnPVwl|&b+ylBDbPMP(Fq%z|nr#6z znXLc_Fs%Ry1voJi!wKc9RwW$?Q9l; z1{NxB>T#HgVFttocHlUBu|oGEl4yWzm^+C&<3yr4Jnz&<;2+5c{;_!=0VEn2r~+6U z0#!f+F-*iVG0Xrl0}S&zR_Okw&g&VCV%xhVn_1mLxl~=CuW1NWwITjh1|o^AIK3lf z77Rs$Ir8}fK&dSNfMVeTip2{ZpyA3DZ_7aK9R$niBakqjFWB8fH`WBD-zXN|YwNsJ zIzh=h0)p~yK4)73s5-CBfl%iVC%!w(uSXAKMmB*8fv+ewCGUr}0D|Bwuu9;YTJDbG zfh?^%2LL8cA0x5-Vd5i?bK&f9)EB(Gg1Q(+Pg?+J5$K}m*$P~z(jA)uXm&nKUz}ih zkcqiW;(XYfnkQYsxqhya3N-h*X5hH4mOkZg9@ z2bl#q<+zi@mVKZ~z3aLphIg{#kvHgwZ@vMne{hu0gZr7k^d&HW@6VFUjv=Ig2r30Y z2)wg+-en+xVGNT_`#vxMOhfatppJ#Et}gcM`??_~EX$^U>k|xYA4R!}5JuGnNdOs8 zuVTdp?Ep!j^s%s*_CQWM?j$V%)b@d9E&1PfHmW0tbfa8G=mJ)O9NQLumjeVgiGdJ8KHnB}7sc045Lv;y^#(G}vAjfL2luCIYe<*j#Bd zevNr;ak#Ys&}!GMnW%q;`U-Cq&Xzf_5orcyy|SSYY?O(ry>@^$l!P~vc9qj=V;lG& z*_iXSEVPoQt@u_dq1{|Ndu@;7|3hx857g?n+VRcowPj!aQKw=oumssgCOy z5Rve~g9n3Bsbs|C@pU=Anbb0q%jNKWUx6VJSya{KwIPVk&CMMc8ynkC6L$Us@lKvR z`3cYo)oNox2pk-=@WuTHow{4-o9S1*MsyvVWA1eJRt3(%zTtTuMn*<3Iy%Z~wc30>pTC_N zplAF9fD$O80J7OER8@tp>nN2IOmw1oyGqCK7)u@`S{}qsJ>ZAPWHOkXoCIU1;nOq?ySuxgatr}<`@($y z089bPaAf%eR=@oMjx8{E^?7*CF+gDt^gsLOJTKgnB9k!qB7~d^D+qG3Wys30v?G4I6Zy$WWe6tztFaIT)g}OX6A0-&}7)YvmVe*3(+qLNhtAm z^A2nWn0xsahzOh;n7#fse){AMnEx~qUGHBTDg;CXBg>)laXk6rdx3;2l}dQx#!ckM zE~NGX5FLWpDgc0dv4|_LeHuC?5ur3%##66<9MC_D2NJ3v`BeSS!%AW!8YEFLgLH=i z7&f~HW%{6N-?=;x1?!*l8&2(kDB82sdfI#l0r)d@kXz#}eHlh=5Vf9^6Tsm3 zM*?&&BuU28z@?GMPI#V=m0`p7zf^%=hJ`;9fWKQN0dzf@x(r>{Ws0IeO4-ZWsD=~Q zfZ{GA0ASm;N<>8|<-d^tL}V;3F8&~;oM((dN=b2>#u@DYe{y>1I1XD|TU!J05D~Sd zlr9kQX+}i3nVFff@$qq!bMD4k9zxpfwz9LcQ`+3zJOXeer8Il?9`xt=e|@%gwiPy+ Q(*OVf07*qoM6N<$f|CyPQ~&?~ literal 0 HcmV?d00001 diff --git a/trunk/images/tango/bookmark.svg b/trunk/images/tango/bookmark.svg new file mode 100644 index 0000000..efc5e18 --- /dev/null +++ b/trunk/images/tango/bookmark.svg @@ -0,0 +1,470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/video.pl b/trunk/video.pl index afd85a3..148f21f 100644 --- a/trunk/video.pl +++ b/trunk/video.pl @@ -10,7 +10,11 @@ $session = new CGI::Session; @page = get_page_array(@userinfo); -if($query->url_param('edit') eq 'true' and $query->url_param('id')) +if($query->url_param('action') eq 'edit' and $query->url_param('id')) +{ + $page->{'message'}->{'type'} = "information"; +} +if($query->url_param('action') eq 'bookmark' and $query->url_param('id')) { $page->{'message'}->{'type'} = "information"; } @@ -131,6 +135,7 @@ elsif($query->url_param('title') or $query->url_param('id')) 'fps' => $fps, 'viewcount' => $viewcount, 'downloadcount' => $downloadcount, + 'edit' => $userinfo->{'username'} eq $publisher ? "true" : "false", 'rdf:RDF' => { 'cc:Work' => @@ -187,7 +192,6 @@ elsif($query->url_param('title') or $query->url_param('id')) { #when an ambigous title was passed there may me many results - display them like search.pl does - $page->{'search'} = ['']; $page->{'results'}->{'scriptname'} = 'video.pl'; $page->{'results'}->{'argument'} = 'title'; $page->{'results'}->{'value'} = $query->param('title'); diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl index 875768e..0515adb 100755 --- a/trunk/xsl/xhtml.xsl +++ b/trunk/xsl/xhtml.xsl @@ -22,6 +22,8 @@ + + @@ -221,6 +223,10 @@ + + wiki + + report bug @@ -254,7 +260,9 @@ : - + + + @@ -318,73 +326,5 @@ - -
- -
- - - -
- : -
- -
- : -
- -
- : -
- -
- - - - - -
-
- -
- - - - - - - - - - - - settings - - - bookmarks - - - diff --git a/trunk/xsl/xhtml/account.xsl b/trunk/xsl/xhtml/account.xsl new file mode 100644 index 0000000..d40d638 --- /dev/null +++ b/trunk/xsl/xhtml/account.xsl @@ -0,0 +1,99 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +

results

+ + + +

settings

+
+
+ locale +
+ +
+
+ pagesize +
+ +
+
+ cortado + video plugin +
+
+ +
+
+ + +

bookmarks

+ + + + + diff --git a/trunk/xsl/xhtml/register.xsl b/trunk/xsl/xhtml/register.xsl new file mode 100644 index 0000000..5e1611a --- /dev/null +++ b/trunk/xsl/xhtml/register.xsl @@ -0,0 +1,41 @@ + + + + +
+ +
+ + + +
+ : +
+ +
+ : +
+ +
+ : +
+ +
+ + + + + +
+
+ +
+ + + diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl index 883d8cf..f37e7c9 100644 --- a/trunk/xsl/xhtml/results.xsl +++ b/trunk/xsl/xhtml/results.xsl @@ -59,7 +59,7 @@ - + @@ -76,8 +76,10 @@
- -
+ + +
+ diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl index 637308d..8d9980c 100644 --- a/trunk/xsl/xhtml/video.xsl +++ b/trunk/xsl/xhtml/video.xsl @@ -8,6 +8,7 @@ > +

@@ -88,22 +89,97 @@
-
+ - + + + + + + + + + + + + + + + + + + + + +
+ Filesize + + MB +
+ Duration + + + + + +
+ Viewcount + + +
+ Downloadcount + + +
+ + Permalink: +
+