diff --git a/trunk/images/tango/128x128/document-save.png b/trunk/images/tango/128x128/actions/document-save.png similarity index 100% rename from trunk/images/tango/128x128/document-save.png rename to trunk/images/tango/128x128/actions/document-save.png diff --git a/trunk/images/tango/128x128/actions/document-send.png b/trunk/images/tango/128x128/actions/document-send.png new file mode 100644 index 0000000..f16c04f Binary files /dev/null and b/trunk/images/tango/128x128/actions/document-send.png differ diff --git a/trunk/images/tango/128x128/player_play.png b/trunk/images/tango/128x128/actions/player_play.png similarity index 100% rename from trunk/images/tango/128x128/player_play.png rename to trunk/images/tango/128x128/actions/player_play.png diff --git a/trunk/lang/en.xml b/trunk/lang/en.xml index aff27c5..6b2846f 100755 --- a/trunk/lang/en.xml +++ b/trunk/lang/en.xml @@ -1,5 +1,9 @@ - + @@ -8,14 +12,14 @@ to upload videos, log in first. - register - login + Register + Login - upload video - settings details + Upload video + Settings logged in as  - logout + Logout © 2007 - 2008 Yolanda Team @@ -120,10 +124,10 @@ timestamp - search + Search - username + Username Username or OpenID Password repeat password @@ -133,8 +137,8 @@ file - continue - upload + Continue + Upload Basic Information Similar Videos Additional Metainformation @@ -157,10 +161,15 @@ Specify the copyright owner of the video. Specify the license, preferably by URL. Optionally, choose Creative Commons licensing. - Permit modification. - Permit modification, derivatives must use the same license. - Prohibit modification. - Prohibit commercial use. + Modification is allowed. + Modification is allowed, as long as derivatives use the same license. + Modification is not 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. @@ -177,8 +186,6 @@ Download Plackback - mark as junk - edit use browser plugin use java applet license conditions @@ -186,6 +193,62 @@ Login to comment Post + +

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). +

+

+ 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 ?

+

+ Each media player plugin that can play Ogg Theora + Vorbis can be used. + While there are several plugins that qualify, this section will only focus on three of them, that are also free software. +

+ +

VLC Media Player

+

+ + The VLC Media Player, started by students of École Centrale Paris plays almost any video format on a wide range of platforms. + Be sure to install the Mozilla plugin or you will die a horrible, agonizing death. +

+

+ Downloads can be found on the Videolan web page. + Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources. +

+ +

Mplayer

+

+ + Mplayer, the media player for EXPERT PROGRAMMERS, is only available for real operating systems. + It does work with both Mozilla and Konqueror. +

+

+ Downloads can be found on the Mplayer web page. + Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources. +

+ +

Totem

+

+ + Totem is the default media player in GNOME and therefore only used by SPIDER EXPERTS like Miguel de Icaza. +

+

+ Downloads can and should not be found, go ask Miguel for the OOXML specification instead. +

+ + backlink diff --git a/trunk/style/colors/tango.css b/trunk/style/colors/tango.css index dc05a73..0b192b8 100644 --- a/trunk/style/colors/tango.css +++ b/trunk/style/colors/tango.css @@ -53,31 +53,6 @@ div border-color: #555753; } - div.cc-license - { - } - - div.cc-license img - { - } - -div.loginbox -{ -} - - div.loginbox form - { - } - - div.loginbox form fieldset - { - } - - div.loginbox form fieldset input:after - { - content: url(../../images/openid-icon.png); - } - div.messagebox { } @@ -115,7 +90,13 @@ div.loginbox /* "Aluminium 5" */ border-color: #555753; } - + +fieldset +{ + /* "Aluminium 5" */ + border-color: #555753; +} + /* TODO: make images configureable (maybe via symlinks?) */ li#search_custom_one { diff --git a/trunk/style/decoration/bridget.css b/trunk/style/decoration/bridget.css index d80e19c..8dcac92 100644 --- a/trunk/style/decoration/bridget.css +++ b/trunk/style/decoration/bridget.css @@ -51,15 +51,9 @@ div border-style: solid; border-width: 1px; margin: 0.5em; - padding: 0.5em; + padding: 1em; } - div.button-download - { - /* TODO: find out /why we do this/ (see div.searchbar) ! */ - margin-top: 0em; - } - div.description { /* TODO: find out /why we do this/ (see div.searchbar) ! */ @@ -100,12 +94,11 @@ div div.settingsform, div.uploadform { - line-height: 2.5em; /* correct spacing to avoid overlapping with float:right elements */ margin-right: 22em; } - div.loginbox + #loginbox { /* TODO: find out /why we do this/ (see div.searchbar) ! */ margin-top: 0em; @@ -193,7 +186,7 @@ div#preview border-width: 1px; } - div.searchbar + #searchbar { /* TODO: find out /why we do this/ ! does float make zero top margin really necessary or is it a bug ? @@ -220,19 +213,14 @@ div#preview { } -form +fieldset { + border-style: solid; + border-width: 1px; + margin: 0.5em; + padding: 1em; } - form fieldset - { - border-width: 0px; - } - - form fieldset input[type="text"] - { - } - h1 { font-weight: normal; @@ -256,11 +244,14 @@ li { } -input +input, +textarea { text-align: left; + vertical-align: middle; } + img { border-width: 0px @@ -309,6 +300,11 @@ span content: "( "; } +table +{ + text-align: justify; +} + ul#header { /* don't overlapt with the site logo */ diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css index d146932..e0add24 100644 --- a/trunk/style/structure/fake6.css +++ b/trunk/style/structure/fake6.css @@ -44,7 +44,7 @@ div { clear: right; float: right; - width: 20em; + width: 18em; } div.cc-license img @@ -59,14 +59,14 @@ div { clear: right; float: right; - width: 20em; + width: 18em; } - div.loginbox + #loginbox { clear: right; float: right; - width: 20em; + width: 18em; } div.messagebox @@ -82,7 +82,7 @@ div { clear: right; float: right; - width: 20em; + width: 18em; } div.page-number @@ -157,10 +157,10 @@ div margin-right: -34px; } - div.searchbar + #searchbar { float: right; - width: 20em; + width: 18em; } div.splashbox @@ -171,7 +171,7 @@ div { clear: right; float: right; - width: 20em; + width: 18em; } div.video @@ -204,9 +204,11 @@ form { } -h1 -{ -} + form fieldset button[name="upload"] + { + width: 15em; + height: 15em; + } img { @@ -215,6 +217,7 @@ img img#logo { float: left; + height: 3em; } img.icon-mediaplayer diff --git a/trunk/upload.pl b/trunk/upload.pl index 61f2f59..d3dfb42 100644 --- a/trunk/upload.pl +++ b/trunk/upload.pl @@ -30,25 +30,28 @@ sub getElementDC return $node; } -$video->appendChild( getElementDC( "abstract", "xsd:string") ); +$video->appendChild( getElementDC( "title", "xsd:normalizedString") ); $video->appendChild( getElementDC( "alternative", "xsd:normalizedString") ); +$video->appendChild( getElementDC( "abstract", "xsd:string") ); +$video->appendChild( getElementDC( "spatial", "xsd:normalizedString") ); +$video->appendChild( getElementDC( "subject", "xsd:normalizedString") ); +$video->appendChild( getElementDC( "temporal", "xsd:date") ); +$video->appendChild( getElementDC( "language", "xsd:language") ); + +$video->appendChild( getElementDC( "creator", "xsd:normalizedString") ); $video->appendChild( getElementDC( "contributor", "xsd:normalizedString") ); $video->appendChild( getElementDC( "created", "xsd:date") ); -$video->appendChild( getElementDC( "creator", "xsd:normalizedString") ); + $video->appendChild( getElementDC( "hasFormat", "xsd:normalizedString") ); $video->appendChild( getElementDC( "hasPart", "xsd:normalizedString") ); $video->appendChild( getElementDC( "isFormatOf", "xsd:normalizedString") ); $video->appendChild( getElementDC( "isPartOf", "xsd:normalizedString") ); -$video->appendChild( getElementDC( "language", "xsd:language") ); -$video->appendChild( getElementDC( "license", "xsd:normalizedString") ); $video->appendChild( getElementDC( "references", "xsd:normalizedString") ); $video->appendChild( getElementDC( "replaces", "xsd:normalizedString") ); + $video->appendChild( getElementDC( "rightsHolder", "xsd:normalizedString") ); $video->appendChild( getElementDC( "source", "xsd:normalizedString") ); -$video->appendChild( getElementDC( "spatial", "xsd:normalizedString") ); -$video->appendChild( getElementDC( "subject", "xsd:normalizedString") ); -$video->appendChild( getElementDC( "temporal", "xsd:date") ); -$video->appendChild( getElementDC( "title", "xsd:normalizedString") ); +$video->appendChild( getElementDC( "license", "xsd:normalizedString") ); $video->appendChild( getElementDC( "data", "xsd:base64Binary") ); $instance->appendChild($video); diff --git a/trunk/xsl/xhtml/loginbox.xsl b/trunk/xsl/xhtml/loginbox.xsl index fb1ad5e..59a9701 100644 --- a/trunk/xsl/xhtml/loginbox.xsl +++ b/trunk/xsl/xhtml/loginbox.xsl @@ -9,48 +9,48 @@ -
+
- + + + - - - +
-
+ + + - -
- -
+ +
+ +
- -
- + +
+ - - - - - + + + + + -
+
-
-