diff --git a/trunk/images/flags/COPYING b/trunk/images/flags/COPYING deleted file mode 100644 index d9f957b..0000000 --- a/trunk/images/flags/COPYING +++ /dev/null @@ -1,2 +0,0 @@ -images in this folder taken from KDE marble distribution -flags are probably free of any copyright diff --git a/trunk/images/flags/de-de.png b/trunk/images/flags/de-de.png deleted file mode 100644 index 54881c4..0000000 Binary files a/trunk/images/flags/de-de.png and /dev/null differ diff --git a/trunk/images/flags/de-de.svg b/trunk/images/flags/de-de.svg deleted file mode 100644 index 325f004..0000000 --- a/trunk/images/flags/de-de.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/trunk/images/flags/en-us.png b/trunk/images/flags/en-us.png deleted file mode 100644 index 10cc19f..0000000 Binary files a/trunk/images/flags/en-us.png and /dev/null differ diff --git a/trunk/images/flags/en-us.svg b/trunk/images/flags/en-us.svg deleted file mode 100644 index 366cbc0..0000000 --- a/trunk/images/flags/en-us.svg +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - United States - - - - - united_nations_member - america - flag - unitedstates - north_america - sign - - - - - Daniel McRae - - - - - Daniel McRae - - - - - Daniel McRae - - - - image/svg+xml - - - en - - - - - - - - - - The United States of America flag, produced by Daniel McRae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/trunk/images/logo.png b/trunk/images/logo.png index b0ea65b..8f3266e 100644 Binary files a/trunk/images/logo.png and b/trunk/images/logo.png differ diff --git a/trunk/images/logo.svg b/trunk/images/logo.svg index e5666a6..38ec722 100644 --- a/trunk/images/logo.svg +++ b/trunk/images/logo.svg @@ -9,8 +9,8 @@ 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" - width="156" - height="64" + width="180" + height="40" id="svg2" sodipodi:version="0.32" inkscape:version="0.45.1" @@ -61,7 +61,7 @@ xlink:href="#linearGradient9183" id="linearGradient2275" gradientUnits="userSpaceOnUse" - gradientTransform="translate(3.22852,34.8125)" + gradientTransform="translate(11.22852,34.8125)" x1="43.5" y1="30.257181" x2="43.5" @@ -95,19 +95,19 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.2214934" - inkscape:cx="91.101066" - inkscape:cy="36.70651" + inkscape:cx="88.688928" + inkscape:cy="24.166553" inkscape:document-units="px" inkscape:current-layer="layer1" - width="156px" - height="64px" + width="180px" + height="44px" borderlayer="true" showborder="true" inkscape:showpageshadow="false" showgrid="true" - gridspacingx="1px" - gridspacingy="1px" - gridempspacing="4" + gridspacingx="0.5px" + gridspacingy="0.5px" + gridempspacing="2" objecttolerance="10000" gridtolerance="10000" inkscape:grid-points="true" @@ -132,28 +132,28 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-1.6015625,-31.15625)"> + transform="translate(-2.5097656,-31)"> + transform="translate(8,-2)"> + transform="translate(8,-2)"> landa - Placeholder Logo™ diff --git a/trunk/lang/en.xml b/trunk/lang/en.xml index 6b2846f..b17b385 100755 --- a/trunk/lang/en.xml +++ b/trunk/lang/en.xml @@ -31,6 +31,20 @@ get source code report bug + + Comments + Description + Embedding + License + Login + Metadata + Plugin Help + Preview + Results + Search + Upload form + Video + Find Instant Access @@ -90,8 +104,8 @@ Your comment has been submitted. Your account has been created. Your file has been uploaded. It will be available at - Your successfully changed your settings. - The video being requested is not yet available. The overall sum of video queued is: + Your settings have been updated. + The video being requested is not yet available. The Server has to convert There are no results satisfying your query. @@ -161,23 +175,27 @@ Specify the copyright owner of the video. Specify the license, preferably by URL. Optionally, choose Creative Commons licensing. - Modification is allowed. - Modification is allowed, as long as derivatives use the same license. - Modification is not allowed. + + Is modification of the video allowed ? + + + Modification is allowed. + + + Modification is allowed, as long as others share alike. + + + Modification is not allowed. + + + Is commercial use of the video allowed ? + Commercial use is allowed. Commercial use is not allowed. - This is page 1 of 5. - This is page 2 of 5. - This is page 3 of 5. - This is page 4 of 5. - This is page 5 of 5. - back to page 1 - back to page 3 - back to page 4 English @@ -194,22 +212,22 @@ Post -

Common Questions

+ Common Questions -

Why Not Use Flash ?

-

- Many video sharing sites use the Adobe Flash Plugin to play embedded video. - We disapprove of that because Flash is proprietary (not free software). -

-

+ Why Not Use Flash ? + + Many video sharing sites use the Adobe Flash Plugin to play embedded video. + We disapprove of that because Flash is proprietary (not free software). + + Additionally, well-known video formats like DivX or H.264 are patent-encumbered in many countries. Because license fees have to be paid for usage, it might be a legal risk to include them in free software: GNU/Linux distributions like Debian or Ubuntu do not include them in their default installation. -

-

+ + Therefore, Yolanda uses the Ogg container format containing the codecs Theora and Vorbis, which are maintained by Xiph.org. As of 2008, Ogg and Vorbis are free of patent claims and all known patents regarding Theora have been donated to the public. -

+

Which Plugins Do I Have to Download ?

diff --git a/trunk/style/colors/tango.css b/trunk/style/colors/tango.css index 0b192b8..c333647 100644 --- a/trunk/style/colors/tango.css +++ b/trunk/style/colors/tango.css @@ -12,6 +12,12 @@ Please replace the colors in this file with suitable Tango! equivalents. ↑↑ Remove this notice as soon as this file holds only Tango! colors. ↑↑ */ +/* +links "Sky Blue 2" #3465a4 +borders "Aluminium 5" #555753; + +*/ + a { /* what color is this ? */ @@ -27,10 +33,6 @@ a color: #cc0000; } - a:hover - { - } - a.footer, a.header, div.footer, @@ -47,115 +49,53 @@ a border-color: #c0c0c0; } -div -{ - /* "Aluminium 5" */ - border-color: #555753; -} - - div.messagebox - { - } - - div.messagebox#error + .messagebox#error { /* "Scarlet Red 1" + 30 luminosity */ background-color: #f46060; } - div.messagebox#information + .messagebox#information { /* "Chameleon 1" + 30 luminosity */ background-color: #a9ec68; } - div.messagebox#warning + .messagebox#warning { /* "Orange 1" */ background-color: #fcaf3e; } - div.page-number - { - /* "Aluminium 5" */ - border-color: #555753; - } - - div.result - { - } - - div.result img - { - /* "Aluminium 5" */ - border-color: #555753; - } - -fieldset +div, +div.result img, +fieldset, +#footer, +#header { - /* "Aluminium 5" */ border-color: #555753; } - /* TODO: make images configureable (maybe via symlinks?) */ + /* TODO: make images configurable (maybe via symlinks?) */ li#search_custom_one { - list-style-image: url(../../images/tango/16x16/actions/document-new.png) + list-style-image: url(../../images/tango/16x16/actions/document-new.png) !important; } li#search_custom_two { - list-style-image: url(../../images/tango/16x16/actions/document-save.png) + list-style-image: url(../../images/tango/16x16/actions/document-save.png) !important; } li#search_custom_three { - list-style-image: url(../../images/tango/16x16/emblems/emblem-favorite.png) + list-style-image: url(../../images/tango/16x16/emblems/emblem-favorite.png) !important; } - span.duration - { - } - - span.heading - { - } - - span.instruction - { - /* "Aluminium 5" */ - color: #555753; - } + span.instruction, span.protip { /* "Aluminium 5" */ color: #555753; } - -ul -{ -} - - ul#footer, - ul#header - { - /* "Aluminium 5" */ - border-color: #555753; - } - - ul#footer li:hover, - ul#header li:hover - { - /* Aluminium 1 */ - background-color: #eeeeec; - } - - ul#footer li a, - ul#footer li a - { - } - - ul#queries - { - } diff --git a/trunk/style/decoration/bridget.css b/trunk/style/decoration/bridget.css index 8dcac92..4b0cadc 100644 --- a/trunk/style/decoration/bridget.css +++ b/trunk/style/decoration/bridget.css @@ -12,40 +12,6 @@ Purpose of this file is to provide decorations, such as: - css pseudo-content that isn't graphics (:before, :after) */ -body -{ - font-family: sans-serif; - font-size: 8pt; -/* font-weight: bold;*/ - margin: 1.5em; - text-align: center; -} - -a -{ - text-decoration: none; -} - - a:focus - { - } - - a:hover - { - text-decoration: underline; - } - - a.tag - { - margin-left: 0.25em; - margin-right: 0.25em; - } - -code -{ - font-family: monospace; -} - div { border-style: solid; @@ -145,24 +111,6 @@ div#preview margin-right: 22em; } - div#preview form - { - } - - div#preview form button[name="playback"] - { - /* crude center hack (second part in fake6.css) */ - margin-left: -15em; - margin-top: -7.5em; - } - - div#preview form button[name="download"] - { - /* crude center hack (second part in fake6.css) */ - margin-left: 0em; - margin-top: -7.5em; - } - div#preview img { } @@ -213,14 +161,6 @@ div#preview { } -fieldset -{ - border-style: solid; - border-width: 1px; - margin: 0.5em; - padding: 1em; -} - h1 { font-weight: normal; @@ -305,34 +245,6 @@ table text-align: justify; } - ul#header - { - /* don't overlapt with the site logo */ - margin-left: 260px !important; - } - - ul#footer, - ul#header - { - border-style: solid; - border-width: 1px; - font-weight:bold; - list-style-type: none; - margin: 0.5em; - } - - ul li - { - } - - ul#footer li a, - ul#header li a - { - font-size: 1em; - line-height: 3em; - padding: 1em; - } - ul#account-actions, ul#queries { diff --git a/trunk/style/default.css b/trunk/style/default.css index 5143e3e..f325022 100755 --- a/trunk/style/default.css +++ b/trunk/style/default.css @@ -9,5 +9,5 @@ Purpose of this file is to import color, decoration and structure stylesheets. */ @import "colors/tango.css"; -@import "decoration/bridget.css"; @import "structure/fake6.css"; + diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css index e0add24..59930e2 100644 --- a/trunk/style/structure/fake6.css +++ b/trunk/style/structure/fake6.css @@ -8,322 +8,251 @@ This file is licensed under the WTF Public License Purpose of this file is to provide the structure of the layout, such as: - display style (block, inline, inline-block etc.) - size of (width, height) + - spacing (margin, padding) Please clear this file of any CSS properties that do not define structure. ↑↑ Remove this notice as soon as this file holds only structural CSS. ↑↑ */ -body -{ - min-height: 100%; -} - a { + text-decoration: underline; } - a:focus +blockquote +{ + width: 15em; +} + + blockquote:before { + content: open-quote; + font-size: 2em; + margin-left: 7.5em; } - a:hover + blockquote:after { + content: close-quote; + font-size: 2em; + margin-right: 7.5em; } - a.tag +body +{ + font-family: sans-serif; + font-size: 10pt; + margin: 1.5em; + min-height: 100%; + min-width: 40em; + text-align: center; +} + +code +{ + font-family: monospace; +} + +fieldset +{ + border-style: solid; + border-width: 1px; + margin: 0.5em; + padding: 1em; +} + + q:before { - display: block; - float: left; + content: open-quote; } -div + q:after + { + content: close-quote; + } + +/* ids */ + +#license, +#description, +#loginbox, +#metadata, +#tagcloud, +#searchbar +{ + clear: right; + float: right; + width: 15em; + text-align: left; +} + +#searchbar +{ + margin-top: 0em; +} + +/* classes */ + +.result +{ + display: inline-block; +} + + +/* forms */ + + button[name="upload"] + { + width: 15em; + height: 15em; + } + + input[type="text"], + input[type="password"], + textarea + { + width: 15em; + } + + textarea + { + height: 10em; + } + +form fieldset { } - div.cc-license +form ol +{ + display: inline-block; + text-align: left; +} + + form li { - clear: right; - float: right; - width: 18em; + list-style: none; } - div.cc-license img - { - } - - div.comments - { - } - - div.description - { - clear: right; - float: right; - width: 18em; - } - - #loginbox - { - clear: right; - float: right; - width: 18em; - } - - div.messagebox - { - } - - div.messagebox span.message - { - display:block; - } - - div.metadata - { - clear: right; - float: right; - width: 18em; - } - - div.page-number - { - display: inline-block; - font-size: 40px; - height: 32px; - width: 32px; - overflow: visible; - } - - div.pluginhelp - { - } - - div.pluginhelp h3 - { - clear: left; - } - - div.protip-embed - { - } - - div#preview - { - position: relative; - } - - div#preview form - { - height: 100%; - width: 100%; - } - - div#preview form button - { - /* crude center hack (second part in bridget.css) */ - position: absolute; - top: 50%; - left: 50%; - width: 15em; - height: 15em; - } - - div#preview img - { - } - - div.results - { - - } - - div.results div.result - { -/* - at this point, browsers such as firefox 2.0 mess up -*/ - display: inline-block; - } - - div.results div.result img - { - } - - div.results div.result img.flag - { - position: relative; - /* flag is 32px wide and has 1px borders */ - right: 34px; - margin-right: -34px; - } - - #searchbar - { - float: right; - width: 18em; - } - - div.splashbox - { - } - - div.tagcloud - { - clear: right; - float: right; - width: 18em; - } - - div.video + form label { display: inline-block; + margin-bottom: 0.5em; + margin-top: 0.5em; + padding: 0px; + vertical-align: top; + width: 15em; } - div.videoccdata + form fieldset fieldset { + border: none; + margin-bottom: 0.5em; + margin-right: 0px; + margin-left: 0px; + margin-top: 0.5em; + padding: 0px; } - div.videoccdata img - { - } - - div.videotitle + form fieldset fieldset label { - font-size: 1.5em; + display: block; + margin: 0px; + /* padding of outer fieldset needs to be substracted */ + margin-left: 14.5em; + padding: 0px; + width: auto; } -form +#preview { + position: relative; } - form fieldset + #preview form { + height: 100%; + width: 100%; } - form fieldset input[type="text"] + #preview form button { + /* crude center hack (second part in bridget.css) */ + position: absolute; + top: 50%; + left: 50%; + width: 15em; + height: 15em; } - form fieldset button[name="upload"] + #preview form button[name="playback"] { - width: 15em; - height: 15em; + /* crude center hack (second part in fake6.css) */ + margin-left: -15em; + margin-top: -7.5em; } -img -{ -} + #preview form button[name="download"] + { + /* crude center hack (second part in fake6.css) */ + margin-left: 0em; + margin-top: -7.5em; + } + +/* images */ img#logo { - float: left; - height: 3em; + float: left; + border-width: 0px; + } + + img.antipixel + { + padding: 1em; + border-width: 0px; } img.icon-mediaplayer { - float: left; + float: left; } -li +/* header and footer */ + +#footer, +#header { + border-style: solid; + border-width: 1px; + clear: right; + display: block; + height: 3em; + font-weight: bold; + list-style-type: none; + margin: 0.5em; } - li#search_custom_one - { - } - - li#search_custom_two - { - } - - li#search_custom_three - { - } - -p +#header { + margin-left: 180px; } -span -{ -} - - span.duration + #footer > *, + #header > * { + float: left; + margin-left: 0.5em; + margin-right: 0.5em; } - span.heading + #footer > * a, + #header > * a { + display: block; + line-height: 3em; + padding-left: 0.5em; + padding-right: 0.5em; } - span.instruction - { - } - span.protip - { - } - -table.metadata, -table.metadata-upload -{ - border-width: 0px; - border-collapse: collapse; - width: 100%; -} - - table.metadata td.metadata-content, - table.metadata td.metadata-title, - table.metadata-upload td.metadata-content - { - text-align: left; - width: 50%; - } - - table.metadata td.metadata-title - { - width: 40%; - } - - table.metadata-upload td.metadata-title - { - text-align: right; - width: 50%; - } - -td.metadata-title -{ - color: #606060; -} - -ul -{ -} - - ul#account-actions - { - } - - ul#footer, - ul#header - { - clear: right; - display: block; - height: 3em; - } - - ul#footer li, - ul#header li - { - float: left; - } - - ul#footer li a, - ul#header li a - { - } - - ul#queries - { - } diff --git a/trunk/upload.pl b/trunk/upload.pl index d3dfb42..107c5df 100644 --- a/trunk/upload.pl +++ b/trunk/upload.pl @@ -52,6 +52,8 @@ $video->appendChild( getElementDC( "replaces", "xsd:normalizedString") ); $video->appendChild( getElementDC( "rightsHolder", "xsd:normalizedString") ); $video->appendChild( getElementDC( "source", "xsd:normalizedString") ); $video->appendChild( getElementDC( "license", "xsd:normalizedString") ); + +# this is absolutely wrong, there is no dcterms:data $video->appendChild( getElementDC( "data", "xsd:base64Binary") ); $instance->appendChild($video); diff --git a/trunk/xsl/xhtml/footer.xsl b/trunk/xsl/xhtml/footer.xsl index 3e59495..1a181d9 100644 --- a/trunk/xsl/xhtml/footer.xsl +++ b/trunk/xsl/xhtml/footer.xsl @@ -46,19 +46,19 @@ --> - XHTML 1.1 + XHTML 1.1 - CSS + CSS - Ogg Theora + Ogg Theora - Open Source + Open Source
diff --git a/trunk/xsl/xhtml/header.xsl b/trunk/xsl/xhtml/header.xsl index 9202566..d0bec8c 100644 --- a/trunk/xsl/xhtml/header.xsl +++ b/trunk/xsl/xhtml/header.xsl @@ -34,20 +34,6 @@ - - -

  • - - - - - - - -
  • - diff --git a/trunk/xsl/xhtml/messagebox.xsl b/trunk/xsl/xhtml/messagebox.xsl index e5d9536..6c38e60 100644 --- a/trunk/xsl/xhtml/messagebox.xsl +++ b/trunk/xsl/xhtml/messagebox.xsl @@ -9,7 +9,7 @@ -
    +
    @@ -38,7 +38,7 @@ -
    +
    diff --git a/trunk/xsl/xhtml/pluginhelp.xsl b/trunk/xsl/xhtml/pluginhelp.xsl index f0bc561..c9cdab4 100644 --- a/trunk/xsl/xhtml/pluginhelp.xsl +++ b/trunk/xsl/xhtml/pluginhelp.xsl @@ -9,11 +9,15 @@ -
    +
    - + + + -
    + + +
    diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl index 2456fc3..0019339 100644 --- a/trunk/xsl/xhtml/results.xsl +++ b/trunk/xsl/xhtml/results.xsl @@ -11,28 +11,36 @@ -

    -   -   -   - - - - - - - -   -   -   - -

    +
    - + + + - - - +

    +   +   +   + + + + + + + +   +   +   + +

    + + + + + + + +
    @@ -40,54 +48,44 @@ -
    - - + + +
    + + + + + + +
    + + + + + + + + + + + + + +
    +
    @@ -116,6 +114,7 @@ +
    diff --git a/trunk/xsl/xhtml/tagbar.xsl b/trunk/xsl/xhtml/tagbar.xsl index 0038a43..e4b5d56 100644 --- a/trunk/xsl/xhtml/tagbar.xsl +++ b/trunk/xsl/xhtml/tagbar.xsl @@ -10,4 +10,6 @@ + + diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl index ba56490..cd78cf3 100644 --- a/trunk/xsl/xhtml/upload.xsl +++ b/trunk/xsl/xhtml/upload.xsl @@ -18,149 +18,179 @@
    - + + + + + +
      -
    - + + + + - - - + -
    - - + + - - - - - - - + + + + + + + + + + - - - - - - - + + + - - - + + + + + + + + - - - - - 1 - 31 - option - - - - - - - + - - - - - - - - - - - - - - - - -
    -
    +
  • +
    + + + + + + +
    +
  • -
    - - -
    - - -
    - - -
    +
  • +
    + + + + + +
    +
  • -
    - - allow commercial use ? - - - -
    - - -
    + -
    +