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
This commit is contained in:
josch 2007-11-26 14:25:31 +00:00
parent 9302dd6cbe
commit 99f60517b9
15 changed files with 1973 additions and 80 deletions

View file

@ -40,4 +40,5 @@ Help
If you have any questions/bug reports/ideas, you can find help in the following If you have any questions/bug reports/ideas, you can find help in the following
locations: 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

View file

@ -172,7 +172,7 @@ while(1)
unlink "$root/tmp/$id"; 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; $dbh->do(qq{delete from uploaded where id = ?}, undef, $id) or interrupt $dbh->errstr;
} }
} }

View file

@ -76,6 +76,9 @@ sub get_page_array
$page->{'xmlns:rdf'} = $xmlns_rdf; $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 sub fill_results
{ {
#connect to db #connect to db
@ -132,7 +135,7 @@ sub fill_results
'dc:publisher' => [$publisher], 'dc:publisher' => [$publisher],
'dc:contributor' => [$contributor], 'dc:contributor' => [$contributor],
'dc:date' => [$timestamp], '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:source' => [$source],
'dc:language' => [$language], 'dc:language' => [$language],
'dc:coverage' => [$coverage], 'dc:coverage' => [$coverage],

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -0,0 +1,470 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/andreas/project/gnome-icon-theme/scalable/actions/bookmark-new.png"
sodipodi:docname="bookmark.svg"
sodipodi:docbase="/var/www/yolanda/images/tango"
inkscape:version="0.45.1"
sodipodi:version="0.32"
id="svg249"
height="48"
width="48"
version="1.0"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs3">
<linearGradient
inkscape:collect="always"
id="linearGradient2833">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop2835" />
<stop
style="stop-color:white;stop-opacity:0.56273764"
offset="1"
id="stop2837" />
</linearGradient>
<linearGradient
id="linearGradient3702">
<stop
style="stop-color:black;stop-opacity:0;"
offset="0"
id="stop3704" />
<stop
id="stop3710"
offset="0.5"
style="stop-color:black;stop-opacity:1;" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop3706" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3702"
id="linearGradient2098"
gradientUnits="userSpaceOnUse"
x1="25.058096"
y1="47.027729"
x2="25.058096"
y2="39.999443" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3688"
id="radialGradient2096"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
cx="4.9929786"
cy="43.5"
fx="4.9929786"
fy="43.5"
r="2.5" />
<linearGradient
inkscape:collect="always"
id="linearGradient3688">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop3690" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop3692" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3688"
id="radialGradient2094"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
cx="4.9929786"
cy="43.5"
fx="4.9929786"
fy="43.5"
r="2.5" />
<linearGradient
id="linearGradient5345">
<stop
style="stop-color:#e5c184;stop-opacity:1;"
offset="0"
id="stop5347" />
<stop
id="stop1936"
offset="0.42469135"
style="stop-color:#d9a752;stop-opacity:1;" />
<stop
id="stop7129"
offset="0.9041152"
style="stop-color:#d9a752;stop-opacity:1;" />
<stop
style="stop-color:#e5c184;stop-opacity:1"
offset="1"
id="stop5349" />
</linearGradient>
<linearGradient
id="linearGradient2378">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2380" />
<stop
id="stop4146"
offset="0.25"
style="stop-color:#fefede;stop-opacity:0.91836733;" />
<stop
id="stop2386"
offset="0.5"
style="stop-color:#f5f328;stop-opacity:1;" />
<stop
style="stop-color:#f5f32d;stop-opacity:0.12234043;"
offset="1"
id="stop2382" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4790">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop4792" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop4794" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2251">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2253" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2255" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2251"
id="linearGradient8166"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
x1="33.396004"
y1="36.921333"
x2="34.170048"
y2="38.070381" />
<linearGradient
id="linearGradient15662">
<stop
id="stop15664"
offset="0.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
<stop
id="stop15666"
offset="1.0000000"
style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient269">
<stop
id="stop270"
offset="0.0000000"
style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
<stop
id="stop271"
offset="1"
style="stop-color:#8a8a8a;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient259">
<stop
id="stop260"
offset="0.0000000"
style="stop-color:#fafafa;stop-opacity:1.0000000;" />
<stop
id="stop261"
offset="1.0000000"
style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient269"
id="radialGradient15656"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9717435,0,0,1.0360674,3.2383519,0.5060885)"
cx="8.824419"
cy="3.7561285"
fx="8.824419"
fy="3.7561285"
r="37.751713" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient259"
id="radialGradient15658"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9639356,0,0,1.0444591,-0.127221,-0.1424244)"
cx="33.966679"
cy="35.736916"
fx="33.966679"
fy="35.736916"
r="86.70845" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient15662"
id="radialGradient15668"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9731786,0,0,1.034993,3.1656505,0.5540137)"
cx="8.1435566"
cy="7.2678967"
fx="8.1435566"
fy="7.2678967"
r="38.158695" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient269"
id="radialGradient5350"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.331735,0,0,0.3585438,20.10526,9.5269319)"
cx="31.863327"
cy="2.3667307"
fx="31.863327"
fy="2.3667307"
r="37.751713" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient259"
id="radialGradient5352"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.148355,1.022578e-2,-1.104438e-2,0.1645276,25.06011,12.804777)"
cx="30.653816"
cy="14.9373"
fx="30.653816"
fy="14.9373"
r="86.70845" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4790"
id="radialGradient4796"
cx="37.030354"
cy="12.98915"
fx="37.030354"
fy="12.98915"
r="4.2929163"
gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient2378"
id="radialGradient3271"
cx="38.658855"
cy="9.3411446"
fx="38.658855"
fy="9.3411446"
r="8.341651"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5345"
id="linearGradient5351"
x1="17.948223"
y1="17.797228"
x2="17.948223"
y2="4.361907"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9309477,0,0,1,0.6917802,-4.41941e-2)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2833"
id="linearGradient2839"
x1="13.46875"
y1="3.0304594"
x2="13.46875"
y2="5.5014644"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
inkscape:window-y="25"
inkscape:window-x="0"
inkscape:window-height="970"
inkscape:window-width="1672"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="false"
inkscape:current-layer="layer5"
inkscape:cy="35.458068"
inkscape:cx="31.004735"
inkscape:zoom="11.313709"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.3254902"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:showpageshadow="false"
showborder="true" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>New Bookmark</dc:title>
<dc:subject>
<rdf:Bag>
<rdf:li>text</rdf:li>
<rdf:li>plaintext</rdf:li>
<rdf:li>regular</rdf:li>
<rdf:li>document</rdf:li>
</rdf:Bag>
</dc:subject>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:creator>
<cc:Agent>
<dc:title>Andreas Nilsson</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://www.gnome.org</dc:source>
<dc:contributor>
<cc:Agent>
<dc:title>Luca Ferretti
Jakub Steiner
Lapo Calamandrei</dc:title>
</cc:Agent>
</dc:contributor>
<dc:date>December 2006</dc:date>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer6"
inkscape:label="Shadow">
<g
id="g2043"
inkscape:label="Shadow"
transform="matrix(1,0,0,0.555556,-1.8e-5,19.888883)">
<g
style="display:inline"
id="g2036"
inkscape:label="Shadow">
<g
id="g3712"
style="opacity:0.4"
transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
<rect
y="40"
x="38"
height="7"
width="5"
id="rect2801"
style="opacity:1;fill:url(#radialGradient2094);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
transform="scale(-1,-1)"
y="-47"
x="-10"
height="7"
width="5"
id="rect3696"
style="opacity:1;fill:url(#radialGradient2096);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
y="40"
x="10"
height="7.0000005"
width="28"
id="rect3700"
style="opacity:1;fill:url(#linearGradient2098);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
</g>
</g>
<g
style="display:inline"
inkscape:groupmode="layer"
inkscape:label="Base"
id="layer1">
<path
style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
d="M 7.6531674,3.5156747 L 31.184222,3.4999998 C 31.184222,3.4999998 41.5,13.07421 41.5,13.712818 L 41.5,43.414218 C 41.5,44.052825 40.985687,44.566938 40.346833,44.566938 L 7.6531674,44.566938 C 7.0143129,44.566938 6.5000004,44.052825 6.5000004,43.414218 L 6.5000004,4.6683954 C 6.5000004,4.0297882 7.0143129,3.5156747 7.6531674,3.5156747 z "
id="rect15391"
sodipodi:nodetypes="ccccccccc" />
<path
style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
d="M 7.6498034,4.4999998 L 32.652226,4.4999998 C 32.652226,4.4999998 40.441938,12.538716 40.441938,12.621467 L 40.441938,43.380959 C 40.441938,43.46371 40.375127,43.53033 40.292135,43.53033 L 7.6498034,43.53033 C 7.5668121,43.53033 7.4999997,43.46371 7.4999997,43.380959 L 7.4999997,4.6493697 C 7.4999997,4.5666188 7.5668121,4.4999998 7.6498034,4.4999998 z "
id="rect15660"
sodipodi:nodetypes="ccccccccc" />
</g>
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="Text"
style="display:inline">
<path
inkscape:r_cy="true"
inkscape:r_cx="true"
style="opacity:0.35714285;color:#000000;fill:url(#radialGradient4796);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 40.985189,13.861445 C 40.256827,12.514817 34.882221,10.130934 32.084635,9.3314083 C 32.254143,10.904354 31.961856,15.649439 31.961856,15.649439 C 34.024356,14.274439 40.204485,13.699331 40.985189,13.861445 z "
id="path5348"
sodipodi:nodetypes="cccc" />
<path
style="opacity:1;color:#000000;fill:url(#radialGradient5352);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5350);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
d="M 41.410559,13.739267 C 41.423724,12.305276 35.058025,3.3960606 31.175441,3.500918 C 32.148479,3.7370164 32.925796,9.7511015 31.536076,12.601062 C 34.286076,12.601062 40.446694,11.856343 41.410559,13.739267 z "
id="path2210"
sodipodi:nodetypes="cccc"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
sodipodi:nodetypes="cccc"
id="path2247"
d="M 39.121563,11.586207 C 38.393201,10.239579 34.963027,6.5166576 33.040441,5.2796316 C 33.279381,6.7054805 33.577496,8.9620596 32.961856,11.524439 C 32.961856,11.524439 38.340859,11.424093 39.121563,11.586207 z "
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
style="fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline;opacity:0.15"
d="M 8.518214,2.986098 L 22,2.986098 L 22,23.928002 L 16.515644,17.234797 L 10.96121,24 L 10.96121,3.9419039 C 10.96121,3.404299 9.435316,2.986098 8.518214,2.986098 z "
id="path7273"
sodipodi:nodetypes="ccccccc" />
<path
style="fill:url(#linearGradient5351);fill-opacity:1;fill-rule:evenodd;stroke:#8f5902;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
d="M 10.018213,2.5 L 21.422873,2.5 C 22.994417,2.5 23.499999,3.0073903 23.499999,4.470952 L 23.499999,23.441904 L 18.015643,16.748699 L 12.461209,23.513902 L 12.508084,4.4558059 C 12.508084,2.8706328 10.935315,2.5 10.018213,2.5 z "
id="path4386"
sodipodi:nodetypes="cccccccc" />
<path
sodipodi:type="inkscape:offset"
inkscape:radius="-1.03125"
inkscape:original="M 10.03125 2.5 C 10.948352 2.5 12.5 2.883577 12.5 4.46875 L 12.46875 23.5 L 18.03125 16.75 L 23.5 23.4375 L 23.5 4.46875 C 23.5 3.0051883 23.009044 2.5 21.4375 2.5 L 10.03125 2.5 z "
style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2839);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;opacity:0.6"
id="path1934"
d="M 13.25,3.53125 C 13.362221,3.8338001 13.53125,4.1151264 13.53125,4.46875 L 13.5,20.625 L 17.25,16.09375 C 17.445904,15.855316 17.738283,15.717133 18.046875,15.717133 C 18.355467,15.717133 18.647846,15.855316 18.84375,16.09375 L 22.46875,20.53125 L 22.46875,4.46875 C 22.46875,3.8522811 22.365083,3.7081684 22.34375,3.6875 C 22.322417,3.6668316 22.11277,3.53125 21.4375,3.53125 L 13.25,3.53125 z " />
</g>
</svg>

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -10,7 +10,11 @@ $session = new CGI::Session;
@page = get_page_array(@userinfo); @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"; $page->{'message'}->{'type'} = "information";
} }
@ -131,6 +135,7 @@ elsif($query->url_param('title') or $query->url_param('id'))
'fps' => $fps, 'fps' => $fps,
'viewcount' => $viewcount, 'viewcount' => $viewcount,
'downloadcount' => $downloadcount, 'downloadcount' => $downloadcount,
'edit' => $userinfo->{'username'} eq $publisher ? "true" : "false",
'rdf:RDF' => 'rdf:RDF' =>
{ {
'cc:Work' => '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 #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'}->{'scriptname'} = 'video.pl';
$page->{'results'}->{'argument'} = 'title'; $page->{'results'}->{'argument'} = 'title';
$page->{'results'}->{'value'} = $query->param('title'); $page->{'results'}->{'value'} = $query->param('title');

View file

@ -22,6 +22,8 @@
<xsl:include href="./xhtml/results.xsl"/> <xsl:include href="./xhtml/results.xsl"/>
<xsl:include href="./xhtml/upload.xsl"/> <xsl:include href="./xhtml/upload.xsl"/>
<xsl:include href="./xhtml/video.xsl"/> <xsl:include href="./xhtml/video.xsl"/>
<xsl:include href="./xhtml/register.xsl"/>
<xsl:include href="./xhtml/account.xsl"/>
<xsl:variable name="locale"> <xsl:variable name="locale">
<xsl:choose> <xsl:choose>
@ -221,6 +223,10 @@
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='source_code']" /> <xsl:value-of select="$locale_strings[@id='source_code']" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" />
wiki
<xsl:value-of select="$locale_strings[@id='separator']" />
report bug
</div> </div>
</xsl:if> </xsl:if>
@ -254,7 +260,9 @@
<xsl:value-of select="$locale_strings[@id='search']" />: <xsl:value-of select="$locale_strings[@id='search']" />:
<input type="text" name="query" size="20"> <input type="text" name="query" size="20">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//results/@value" /> <xsl:if test="//results/@argument='query'">
<xsl:value-of select="//results/@value" />
</xsl:if>
</xsl:attribute> </xsl:attribute>
</input> </input>
</fieldset> </fieldset>
@ -318,73 +326,5 @@
</xsl:template> </xsl:template>
<xsl:template name="registerform">
<div class="registerform">
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_register']" />
</xsl:attribute>
<fieldset>
<xsl:value-of select="$locale_strings[@id='username']" />:
<br />
<input name="user" type="text" size="30" maxlength="30" />
<br />
<xsl:value-of select="$locale_strings[@id='password']" />:
<br />
<input name="pass" type="password" size="30" maxlength="30" />
<br />
<xsl:value-of select="$locale_strings[@id='password_repeat']" />:
<br />
<input name="pass_repeat" type="password" size="30" maxlength="30" />
<br />
<input type="submit" name="register" >
<xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_register']" />
</xsl:attribute>
</input>
</fieldset>
</form>
</div>
</xsl:template>
<xsl:template name="account">
<div>
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_uploads']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_uploads']" />
</a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_settings']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_settings']" />
</a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_bookmarks']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
</a>
</div>
<xsl:choose>
<xsl:when test="//account/@show='uploads'">
<xsl:call-template name="results"/>
</xsl:when>
<xsl:when test="//account/@show='settings'">
settings
</xsl:when>
<xsl:when test="//account/@show='bookmarks'">
bookmarks
</xsl:when>
</xsl:choose>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

View file

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>
<xsl:template name="account">
<div>
<xsl:choose>
<xsl:when test="//account/@show='uploads'">
<xsl:value-of select="$locale_strings[@id='account_uploads']" />
</xsl:when>
<xsl:otherwise>
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_uploads']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_uploads']" />
</a>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:choose>
<xsl:when test="//account/@show='settings'">
<xsl:value-of select="$locale_strings[@id='account_settings']" />
</xsl:when>
<xsl:otherwise>
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_settings']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_settings']" />
</a>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:choose>
<xsl:when test="//account/@show='bookmarks'">
<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
</xsl:when>
<xsl:otherwise>
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_bookmarks']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
</a>
</xsl:otherwise>
</xsl:choose>
</div>
<xsl:choose>
<xsl:when test="//account/@show='uploads'">
<h2>results</h2>
<xsl:call-template name="results"/>
</xsl:when>
<xsl:when test="//account/@show='settings'">
<h2>settings</h2>
<form>
<div>
locale
<br />
<select name="DC.Language">
<option>English</option>
<option>German</option>
</select>
</div>
<div>
pagesize
<br />
<select>
<option>1</option>
<option>2</option>
<option>5</option>
<option>10</option>
<option>20</option>
<option>50</option>
<option>100</option>
</select>
</div>
<div>
<input type="radio" name="cortado" value="true" />cortado
<input type="radio" name="cortado" value="false" />video plugin
</div>
<div>
<input type="submit" />
</div>
</form>
</xsl:when>
<xsl:when test="//account/@show='bookmarks'">
<h2>bookmarks</h2>
</xsl:when>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

View file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>
<xsl:template name="registerform">
<div class="registerform">
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_register']" />
</xsl:attribute>
<fieldset>
<xsl:value-of select="$locale_strings[@id='username']" />:
<br />
<input name="user" type="text" size="30" maxlength="30" />
<br />
<xsl:value-of select="$locale_strings[@id='password']" />:
<br />
<input name="pass" type="password" size="30" maxlength="30" />
<br />
<xsl:value-of select="$locale_strings[@id='password_repeat']" />:
<br />
<input name="pass_repeat" type="password" size="30" maxlength="30" />
<br />
<input type="submit" name="register" >
<xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_register']" />
</xsl:attribute>
</input>
</fieldset>
</form>
</div>
</xsl:template>
</xsl:stylesheet>

View file

@ -59,7 +59,7 @@
<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" /> <xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="concat(rdf:RDF/cc:Work/dc:identifier, '/edit=true')" /> <xsl:value-of select="concat(rdf:RDF/cc:Work/dc:identifier, '/action=edit')" />
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:attribute> </xsl:attribute>
@ -76,8 +76,10 @@
<div> <div>
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@value!=''"> <xsl:when test="//results/@value!=''">
<!-- <xsl:value-of select="$locale_strings[@id='results_for_query']" /> --> <xsl:if test="//results/@argument='query'">
<i><xsl:value-of select="//results/@value" /></i><br /> <!-- <xsl:value-of select="$locale_strings[@id='results_for_query']" /> -->
<i><xsl:value-of select="//results/@value" /></i><br />
</xsl:if>
<xsl:if test="//results/@orderby!=''"> <xsl:if test="//results/@orderby!=''">
<xsl:value-of select="$locale_strings[@id='ordered_by']" /> <xsl:value-of select="$locale_strings[@id='ordered_by']" />
<xsl:choose> <xsl:choose>

View file

@ -8,6 +8,7 @@
> >
<xsl:template name="video"> <xsl:template name="video">
<h2><xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" /></h2>
<div class="video"> <div class="video">
<xsl:choose> <xsl:choose>
<xsl:when test="//video/@cortado='true'"> <xsl:when test="//video/@cortado='true'">
@ -88,22 +89,97 @@
</div> </div>
<xsl:if test="not(//@embed='true')"> <xsl:if test="not(//@embed='true')">
<div class="videodownload"> <div style="display:table-cell">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" /> <xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
</xsl:attribute> </xsl:attribute>
<img src="/images/tango/document-save.png" /> <img src="/images/tango/document-save.png" />
</a> </a>
<br />
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" /> <xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
</xsl:attribute> </xsl:attribute>
<br />
<xsl:value-of select="$locale_strings[@id='download_video']" /> <xsl:value-of select="$locale_strings[@id='download_video']" />
</a> </a>
</div> </div>
<div style="display:table-cell">
<xsl:if test="//@edit='true'">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/action=edit')" />
</xsl:attribute>
<img src="/images/tango/accessories-text-editor.png" style="border:0;vertical-align:bottom;" />
</a>
<br />
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/action=edit')" />
</xsl:attribute>
Edit
</a>
</xsl:if>
</div>
<div style="display:table-cell">
<xsl:if test="//@edit='true'">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/action=bookmark')" />
</xsl:attribute>
<img src="/images/tango/bookmark-new.png" style="border:0;vertical-align:bottom;" />
</a>
<br />
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/action=bookmark')" />
</xsl:attribute>
Bookmark
</a>
</xsl:if>
</div>
<table class="videometadata">
<tr>
<td class="leftcell">
Filesize
</td>
<td class="rightcell">
<xsl:value-of select="format-number(number(//video/@filesize) div 1048576, '0.0#')" /> MB
</td>
</tr>
<tr>
<td class="leftcell">
Duration
</td>
<td class="rightcell">
<xsl:variable name="minutes" select="floor(//video/@duration div 60)" />
<xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
<xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />
</td>
</tr>
<tr>
<td class="leftcell">
Viewcount
</td>
<td class="rightcell">
<xsl:value-of select="//video/@viewcount" />
</td>
</tr>
<tr>
<td class="leftcell">
Downloadcount
</td>
<td class="rightcell">
<xsl:value-of select="//video/@downloadcount" />
</td>
</tr>
</table>
Permalink: <xsl:value-of select="//rdf:RDF/cc:Work/dc:identifier" />
<br />
<textarea>&lt;iframe src="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/embed=true')" />"&gt;&lt;/iframe&gt;</textarea>
<div class="videoccdata"> <div class="videoccdata">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">