big change

git-svn-id: http://yolanda.mister-muffin.de/svn@220 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2007-12-27 01:54:22 +00:00
parent f49b878f31
commit 24f536e1e8
14 changed files with 256 additions and 1884 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -1,470 +0,0 @@
<?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>

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

View file

@ -15,7 +15,7 @@
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.45.1" inkscape:version="0.45.1"
version="1.0" version="1.0"
sodipodi:docbase="/var/www/yolanda/images" sodipodi:docbase="/home/nils/src/yolanda/images"
sodipodi:docname="yolanda.svg" sodipodi:docname="yolanda.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:export-filename="/var/www/yolanda/images/yolanda-big.png" inkscape:export-filename="/var/www/yolanda/images/yolanda-big.png"
@ -117,18 +117,18 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="2.8" inkscape:zoom="2.8"
inkscape:cx="289.32894" inkscape:cx="127.90037"
inkscape:cy="34.298445" inkscape:cy="36.977016"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
inkscape:object-bbox="false" inkscape:object-bbox="false"
inkscape:object-points="false" inkscape:object-points="false"
inkscape:object-paths="false" inkscape:object-paths="false"
inkscape:object-nodes="false" inkscape:object-nodes="false"
inkscape:window-width="1920" inkscape:window-width="1157"
inkscape:window-height="1130" inkscape:window-height="638"
inkscape:window-x="0" inkscape:window-x="69"
inkscape:window-y="25" inkscape:window-y="75"
width="320px" width="320px"
height="100px" /> height="100px" />
<metadata <metadata

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View file

@ -13,7 +13,6 @@
<string id="login_openid">login with OpenID</string> <string id="login_openid">login with OpenID</string>
<string id="upload_video">upload video</string> <string id="upload_video">upload video</string>
<string id="bookmarks">bookmarks</string>
<string id="settings_details">settings details</string> <string id="settings_details">settings details</string>
<string id="logged_in_as">logged in as&#160;</string> <string id="logged_in_as">logged in as&#160;</string>
@ -150,11 +149,11 @@
<!-- video page --> <!-- video page -->
<string id="download_video">download</string> <string id="download_video">download</string>
<string id="junk_video">mark as junk</string>
<string id="edit_video">edit</string>
<string id="megabytes">MB</string> <string id="megabytes">MB</string>
<string id="watch_browserplugin">use browser plugin</string> <string id="watch_browserplugin">use browser plugin</string>
<string id="watch_cortadoapplet">use java applet</string> <string id="watch_cortadoapplet">use java applet</string>
<string id="edit_video">edit</string>
<string id="bookmark_video">bookmark</string>
<string id="license_conditions">license conditions</string> <string id="license_conditions">license conditions</string>
<string id="protip_embed">To embed the video on another web page, use the following HTML code:</string> <string id="protip_embed">To embed the video on another web page, use the following HTML code:</string>
<string id="comment_on_video">Flamewar area below. Proceed with caution.</string> <string id="comment_on_video">Flamewar area below. Proceed with caution.</string>
@ -166,15 +165,15 @@
<!-- dublin core entities --> <!-- dublin core entities -->
<string id="DC.Title">title</string> <string id="DC.Title">title</string>
<string id="DC.Creator">author</string> <string id="DC.Creator">author</string>
<string id="DC.Subject">subject</string> <string id="DC.Subject">keywords</string>
<string id="DC.Description">description</string> <string id="DC.Description">description</string>
<string id="DC.Publisher">uploader</string> <string id="DC.Publisher">uploader</string>
<string id="DC.Contributor">contributor</string> <string id="DC.Contributor">contributor</string>
<string id="DC.Date">date</string> <string id="DC.Date">upload date</string>
<string id="DC.Source">source</string> <string id="DC.Source">source</string>
<string id="DC.Language">language</string> <string id="DC.Language">language</string>
<string id="DC.Coverage">coverage</string> <string id="DC.Coverage">coverage</string>
<string id="DC.Rights">righs holder</string> <string id="DC.Rights">rights holder</string>
<string id="DC.License">license</string> <string id="DC.License">license</string>
<string id="duration">duration</string> <string id="duration">duration</string>
@ -188,7 +187,9 @@
<!-- rss feed --> <!-- rss feed -->
<string id="rss_separator">&#160;-&#160;</string> <string id="rss_separator">&#160;-&#160;</string>
<string id="rss_description_1">This is an Yolanda RSS Feed for query "</string> <string id="rss_title_results_this_page">this page</string>
<string id="rss_title_results_all_pages">all results</string>
<string id="rss_description_1">This is an RSS Feed for the query "</string>
<string id="rss_description_2">".</string> <string id="rss_description_2">".</string>
</strings> </strings>

View file

@ -7,7 +7,6 @@ a
{ {
color: #3f3fff; color: #3f3fff;
text-decoration: none; text-decoration: none;
white-space: nowrap;
} }
a:focus a:focus
@ -42,13 +41,18 @@ div
border-width: 0px; border-width: 0px;
} }
div.button-download, div.button-edit, div.button-bookmark div.button-download,
div.button-edit,
div.button-junk
{ {
display: inline-block; display: inline-block;
margin: 0.5em; margin: 0.5em;
vertical-align: top;
} }
div.button-download img, div.button-edit img, div.button-bookmark img div.button-download img,
div.button-edit img,
div.button-junk img
{ {
margin: 0.5em; margin: 0.5em;
} }
@ -65,7 +69,6 @@ div
div.comments div.comments
{ {
display: none;
} }
div.footer div.footer
@ -91,7 +94,10 @@ div
vertical-align: bottom; vertical-align: bottom;
} }
div.loginform, div.registerform, div.uploadform, div.settingsform div.loginform,
div.registerform,
div.settingsform,
div.uploadform
{ {
line-height: 2.5em; line-height: 2.5em;
margin: 1.5em; margin: 1.5em;
@ -119,8 +125,8 @@ div
div.messagebox img div.messagebox img
{ {
margin: 0.75em; margin: 0.75em;
vertical-align: middle;
overflow: visible; overflow: visible;
vertical-align: middle;
} }
div.page-number div.page-number
@ -137,8 +143,8 @@ div
{ {
display: inline-block; display: inline-block;
margin: 0.75em; margin: 0.75em;
width: 160px;
overflow: visible; overflow: visible;
vertical-align: top;
} }
div.result img div.result img
@ -178,9 +184,15 @@ div
padding: 0.75em; padding: 0.75em;
} }
div.video
{
display: inline-block;
margin-bottom: 0.5em;
}
div.videoccdata div.videoccdata
{ {
margin: 1.5em; margin: 0.75em;
} }
div.videoccdata img div.videoccdata img
@ -191,15 +203,21 @@ div
margin-top: 0.5em; margin-top: 0.5em;
} }
div.videostuff div.video-metadata
{ {
} display: inline-block;
line-height: 1.5em;
margin-left: 1.5em;
text-align: left;
vertical-align: top;
width: 256px;
}
div.videotitle div.videotitle
{ {
font-size: 1.5em; font-size: 1.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
fieldset fieldset
{ {
@ -224,12 +242,6 @@ img
border-width: 0; border-width: 0;
} }
img.openid-icon
{
padding-left: 0.2em;
vertical-align: text-top;
}
img.logo-big img.logo-big
{ {
padding-bottom: 0.5em; padding-bottom: 0.5em;
@ -239,6 +251,12 @@ img
{ {
} }
img.openid-icon
{
padding-left: 0.2em;
vertical-align: text-top;
}
span.code span.code
{ {
font-family: monospace; font-family: monospace;
@ -250,11 +268,7 @@ span.heading
font-size: 1.5em; font-size: 1.5em;
} }
span.instruction span.instruction,
{
color: #606060;
}
span.protip span.protip
{ {
color: #606060; color: #606060;
@ -270,31 +284,34 @@ span.protip:before
content: "( "; content: "( ";
} }
table.results table.metadata,
table.metadata-upload
{ {
display: inline; border-width: 0px;
border-collapse: collapse;
width: 100%;
} }
table.videometadata table.metadata td.metadata-content,
{ table.metadata td.metadata-title,
border-width: 0px; table.metadata-upload td.metadata-content
width: 100%;
}
table.videometadata tr td.leftcell
{ {
color: #606060; text-align: left;
text-align: right; width: 50%;
width: 50%;
} }
table.videometadata tr td.rightcell table.metadata td.metadata-title
{ {
text-align: left; width: 40%;
width: 50%;
} }
td table.metadata-upload td.metadata-title
{
text-align: right;
width: 50%;
}
td.metadata-title
{ {
vertical-align: top; color: #606060;
} }

View file

@ -79,7 +79,7 @@
<link rel="alternate" type="application/rss+xml"> <link rel="alternate" type="application/rss+xml">
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:value-of select="//results/@query" /> <xsl:value-of select="$locale_strings[@id='rss_title_results_this_page']" />
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_root']" /> <xsl:value-of select="$site_strings[@id='page_root']" />
@ -91,6 +91,20 @@
</xsl:attribute> </xsl:attribute>
</link> </link>
<link rel="alternate" type="application/rss+xml">
<xsl:attribute name="title">
<xsl:value-of select="$locale_strings[@id='rss_title_results_all_pages']" />
</xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_root']" />
<xsl:value-of select="$site_strings[@id='page_results']" />
<xsl:value-of select="//results/@query" />
&amp;pagesize=99999
&amp;page=1
&#38;xslt=rss
</xsl:attribute>
</link>
</xsl:if> </xsl:if>
<title> <title>

View file

@ -530,28 +530,28 @@
</xsl:attribute> </xsl:attribute>
</input> </input>
<table class="videometadata"> <table class="metadata-upload">
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Title']" />: <xsl:value-of select="$locale_strings[@id='DC.Title']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Title" /> <xsl:value-of select="//uploadform/@DC.Title" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Subject']" />: <xsl:value-of select="$locale_strings[@id='DC.Subject']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Subject" /> <xsl:value-of select="//uploadform/@DC.Subject" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Description']" />: <xsl:value-of select="$locale_strings[@id='DC.Description']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Description" /> <xsl:value-of select="//uploadform/@DC.Description" />
</td> </td>
</tr> </tr>
@ -563,36 +563,36 @@
</xsl:attribute> </xsl:attribute>
</input> </input>
<table class="videometadata"> <table class="metadata-upload">
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Creator']" />: <xsl:value-of select="$locale_strings[@id='DC.Creator']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Creator" /> <xsl:value-of select="//uploadform/@DC.Creator" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Source']" />: <xsl:value-of select="$locale_strings[@id='DC.Source']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Source" /> <xsl:value-of select="//uploadform/@DC.Source" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Language']" />: <xsl:value-of select="$locale_strings[@id='DC.Language']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Language" /> <xsl:value-of select="//uploadform/@DC.Language" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Coverage']" />: <xsl:value-of select="$locale_strings[@id='DC.Coverage']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Coverage" /> <xsl:value-of select="//uploadform/@DC.Coverage" />
</td> </td>
</tr> </tr>

View file

@ -8,8 +8,8 @@
> >
<xsl:template name="video"> <xsl:template name="video">
<xsl:if test="not(//@embed='true')"> <xsl:if test="not(//@embed='true')">
<br />
<div class="videotitle"> <div class="videotitle">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" /> <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
<xsl:variable name="minutes" select="floor(//video/@duration div 60)" /> <xsl:variable name="minutes" select="floor(//video/@duration div 60)" />
@ -25,6 +25,7 @@
</xsl:choose> </xsl:choose>
</div> </div>
</xsl:if> </xsl:if>
<div class="video"> <div class="video">
<xsl:choose> <xsl:choose>
<xsl:when test="//video/@cortado='true'"> <xsl:when test="//video/@cortado='true'">
@ -116,6 +117,10 @@
</xsl:if> </xsl:if>
<xsl:if test="not(//@embed='true')"> <xsl:if test="not(//@embed='true')">
<xsl:call-template name="videometadata"/>
<br />
<div class="button-download"> <div class="button-download">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
@ -133,6 +138,26 @@
<br /> <br />
(<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='megabytes']" />) (<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='megabytes']" />)
</div> </div>
<!--
not implemented right now
<div class="button-junk">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'action=junk')" />
</xsl:attribute>
<img src="/images/tango/mail-mark-junk.png" />
</a>
<br />
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'action=junk')" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='junk_video']" />
</a>
</div>
<div class="button-edit"> <div class="button-edit">
<xsl:if test="//@edit='true'"> <xsl:if test="//@edit='true'">
<a> <a>
@ -150,67 +175,10 @@
</a> </a>
</xsl:if> </xsl:if>
</div> </div>
<div class="button-bookmark"> -->
<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" />
</a>
<br />
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'action=bookmark')" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='bookmark_video']" />
</a>
</div>
<xsl:call-template name="cclicense"/> <xsl:call-template name="cclicense"/>
<table class="videometadata">
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Creator']" />:
</td>
<td class="rightcell">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:creator" />
</td>
</tr>
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Description']" />:
</td>
<td class="rightcell">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:description" />
</td>
</tr>
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Date']" />:
</td>
<td class="rightcell">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:date" />
</td>
</tr>
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Source']" />:
</td>
<td class="rightcell">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:source" />
</td>
</tr>
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Rights']" />:
</td>
<td class="rightcell">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:rights" />
</td>
</tr>
</table>
<div class="videostuff"> <div class="videostuff">
<span class="protip-embed"> <span class="protip-embed">
<xsl:value-of select="$locale_strings[@id='protip_embed']" /> <xsl:value-of select="$locale_strings[@id='protip_embed']" />
@ -225,27 +193,13 @@
</span> </span>
</div> </div>
<xsl:call-template name="comments"/> <!--
too ugly right now
<xsl:call-template name="comments"/>
<xsl:call-template name="commentform"/>
-->
<xsl:if test="not(//@username='')">
<div class="commentform">
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" />
</xsl:attribute>
<fieldset>
<br />
<textarea name="comment" cols="30" rows="3" />
<br />
<input type="submit" name="send">
<xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='comment_post']" />
</xsl:attribute>
</input>
</fieldset>
</form>
</div>
</xsl:if>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@ -272,6 +226,30 @@
</xsl:template> </xsl:template>
<xsl:template name="commentform">
<xsl:if test="not(//@username='')">
<div class="commentform">
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" />
</xsl:attribute>
<fieldset>
<br />
<textarea name="comment" cols="30" rows="3" />
<br />
<input type="submit" name="send">
<xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='comment_post']" />
</xsl:attribute>
</input>
</fieldset>
</form>
</div>
</xsl:if>
</xsl:template>
<xsl:template name="cclicense"> <xsl:template name="cclicense">
<div class="videoccdata"> <div class="videoccdata">
@ -336,4 +314,93 @@
</xsl:template> </xsl:template>
<xsl:template name="videometadata">
<div class="video-metadata">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:description" />
<hr />
<table class="metadata">
<tr>
<td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Creator']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:creator" />
</td>
</tr>
<!--
dc:contributor is not in upload interface
<tr>
<td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Contributor']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:contributor" />
</td>
</tr>
-->
<tr>
<td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Coverage']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:coverage" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Rights']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:rights" />
</td>
</tr>
</table>
<hr />
<table class="metadata">
<tr>
<td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Publisher']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:publisher" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Date']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:date" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Source']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:source" />
</td>
</tr>
</table>
</div>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>