diff --git a/trunk/images/tango/128x128/apps/bittorrent.png b/trunk/images/tango/128x128/apps/bittorrent.png new file mode 100644 index 0000000..a439bfe Binary files /dev/null and b/trunk/images/tango/128x128/apps/bittorrent.png differ diff --git a/trunk/lang/en.xml b/trunk/lang/en.xml index e5fb236..6b8f547 100755 --- a/trunk/lang/en.xml +++ b/trunk/lang/en.xml @@ -42,6 +42,7 @@ Preview Results Search + Tagcloud Upload form Video @@ -72,14 +73,14 @@ You did not supply a rights holder. You seem to be already registered. Please log out to create a new account. You seem to be already logged in. Please log out to log in again. - Username and password do not match. + Username and / or password do not match. Passwords do not match. Your desired Username was already registered Please insert a username. Please insert a password. Please repeat your password. You passed no query string. - Your browser does not support Ogg Theora video playback. + Your browser does not support Ogg Theora video playback. There is no video matching your request The provided URL doesn't declare its OpenID identity server No URL entered @@ -198,8 +199,8 @@ - English - German + English + German Download @@ -212,60 +213,18 @@ 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. -

- +

+ To view this video, install + VLC, + mplayer or + another player capable of playing + Ogg Theora + videos. +

+

+ For installation instructions, see the Wikipedia Media Help. +

+ backlink diff --git a/trunk/style/decoration/bridget.css b/trunk/style/decoration/bridget.css deleted file mode 100644 index 4b0cadc..0000000 --- a/trunk/style/decoration/bridget.css +++ /dev/null @@ -1,253 +0,0 @@ -/* -Yolanda default stylesheet colors (using tango color palette) -(c) 2007-2008 Nils Dagsson Moskopp - -This file is licensed under the WTF Public License -(License terms: Do what the fuck you want.) - -Purpose of this file is to provide decorations, such as: - - borders (size, width, style etc.) - - font properties (family, size, style, weight etc.) - - spacing between elements and / or content (margin, padding) - - css pseudo-content that isn't graphics (:before, :after) -*/ - -div -{ - border-style: solid; - border-width: 1px; - margin: 0.5em; - padding: 1em; -} - - div.description - { - /* TODO: find out /why we do this/ (see div.searchbar) ! */ - margin-top: 0em; - text-align: justify; - } - - div.footer, - div.header - { - } - - div.cc-license - { - /* TODO: find out /why we do this/ (see div.searchbar) ! */ - margin-top: 0em; - vertical-align: top; - } - - div.cc-license img - { - border-width: 0px; - margin: 0.5em; - } - - div.cc-license-chooser - { - } - - div.cc-license-chooser img - { - vertical-align: middle; - } - - div.commentform, - div.loginform, - div.registerform, - div.settingsform, - div.uploadform - { - /* correct spacing to avoid overlapping with float:right elements */ - margin-right: 22em; - } - - #loginbox - { - /* TODO: find out /why we do this/ (see div.searchbar) ! */ - margin-top: 0em; - text-align: justify; - } - - div.messagebox - { - /* correct spacing to avoid overlapping with float:right elements */ - margin-right: 22em; - } - - div.messagebox span.message - { - font-weight: bold; - line-height: 1.5em; - margin-bottom: 1em; - margin-top: 1em; - } - - div.metadata - { - /* TODO: find out /why we do this/ (see div.searchbar) ! */ - margin-top: 0em; - line-height: 1.5em; - text-align: justify; - } - - div.page-number - { - font-size: 40px; - overflow: visible; - } - - div.protip-embed - { - /* correct spacing to avoid overlapping with float:right elements */ - margin-right: 22em; - } - -div#preview -{ - /* correct spacing to avoid overlapping with float:right elements */ - margin-right: 22em; -} - - div#preview img - { - } - - div.results - { - border-width: 0px; - /* correct spacing to avoid overlapping with float:right elements */ - margin-right: 22em !important; - padding: 0px; - } - - div.results div.result - { - border-width: 0px; - padding: 0em; - } - - div.results div.result img - { - border-width: 1px; - } - - #searchbar - { - /* TODO: find out /why we do this/ ! - does float make zero top margin really necessary or is it a bug ? - latter seems unlikely because it works across browsers. */ - margin-top: 0em; - text-align: justify; - } - - div.splashbox - { - /* correct spacing to avoid overlapping with float:right elements */ - margin-right: 22em; - text-align: justify; - } - - div.tagcloud - { - /* TODO: find out /why we do this/ (see div.searchbar) ! */ - margin-top: 0em; - text-align: justify; - } - - div.video - { - } - -h1 -{ - font-weight: normal; - font-size: 2em; - text-align: center; -} - -li -{ -} - - li#search_custom_one - { - } - - li#search_custom_two - { - } - - li#search_custom_three - { - } - -input, -textarea -{ - text-align: left; - vertical-align: middle; -} - - -img -{ - border-width: 0px -} - - img#logo - { - } - -p -{ - margin: 0.5em; - padding: 0.5em; -} - -span -{ -} - - span.duration:after - { - content: ")"; - } - - span.duration:before - { - content: "("; - } - - span.instruction - { - } - - span.protip - { - font-weight:bold; - } - - span.protip:after - { - content: " )"; - } - - span.protip:before - { - content: "( "; - } - -table -{ - text-align: justify; -} - - ul#account-actions, - ul#queries - { - font-size: 1.5em; - font-weight: bold; - } diff --git a/trunk/style/default.css b/trunk/style/default.css index f325022..815ae78 100755 --- a/trunk/style/default.css +++ b/trunk/style/default.css @@ -8,6 +8,7 @@ This file is licensed under the WTF Public License Purpose of this file is to import color, decoration and structure stylesheets. */ +@import "reset.css"; @import "colors/tango.css"; @import "structure/fake6.css"; diff --git a/trunk/style/embedded.css b/trunk/style/embedded.css index fbef73e..2341abb 100644 --- a/trunk/style/embedded.css +++ b/trunk/style/embedded.css @@ -29,20 +29,13 @@ button position: absolute; top: 50%; left: 50%; - width: 15em; - height: 15em; + width: 164px; + height: 164px; } button[name="playback"] { /* crude center hack */ - margin-left: -15em; - margin-top: -7.5em; - } - - button[name="download"] - { - /* crude center hack */ - margin-left: 0em; - margin-top: -7.5em; + margin-left: -82px; + margin-top: -82px; } diff --git a/trunk/style/reset.css b/trunk/style/reset.css new file mode 100644 index 0000000..fe0c754 --- /dev/null +++ b/trunk/style/reset.css @@ -0,0 +1,72 @@ +/* +Eric Meyers reset stylesheet, stolen from + +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td +{ + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + font-family: inherit; + vertical-align: baseline; +} + +/* remember to define focus styles! */ +:focus +{ + outline: 0; +} + +body +{ + line-height: 1; + color: black; + background: white; +} + +ol, +ul +{ + list-style: none; +} + +/* tables still need 'cellspacing="0"' in the markup */ +table +{ + border-collapse: separate; + border-spacing: 0; +} + +caption, +th, +td +{ + text-align: left; + font-weight: normal; +} + +blockquote, +q +{ + quotes: "" ""; +} + + blockquote:before, + blockquote:after, + q:before, + q:after + { + content: ""; + } diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css index e2606c9..9915394 100644 --- a/trunk/style/structure/fake6.css +++ b/trunk/style/structure/fake6.css @@ -103,8 +103,8 @@ fieldset button[name="upload"] { - width: 15em; - height: 15em; + width: 164px; + height: 164px; } input[type="text"], @@ -182,22 +182,29 @@ form ol position: absolute; top: 50%; left: 50%; - width: 15em; - height: 15em; + width: 164px; + height: 164px; } #preview form button[name="playback"] { /* crude center hack */ - margin-left: -15em; - margin-top: -7.5em; + margin-left: -246px; + margin-top: -82px; } #preview form button[name="download"] { /* crude center hack */ - margin-left: 0em; - margin-top: -7.5em; + margin-left: -82px; + margin-top: -82px; + } + + #preview form button[name="bittorrent"] + { + /* crude center hack */ + margin-left: 82px; + margin-top: -82px; } /* images */ diff --git a/trunk/xsl/xhtml-embed.xsl b/trunk/xsl/xhtml-embed.xsl index 7dfb533..19339ba 100644 --- a/trunk/xsl/xhtml-embed.xsl +++ b/trunk/xsl/xhtml-embed.xsl @@ -17,6 +17,8 @@ omit-xml-declaration="no" /> + + @@ -107,21 +109,8 @@ - -
- Your browser does not support Ogg Theora video playback. -
-

- To view this video, install - VLC, - mplayer or - another player capable of playing - Ogg Theora - videos. -

-

- For installation instructions, see the Wikipedia Media Help. -

+ + @@ -160,19 +149,6 @@ - diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl index 911bc27..046eafa 100755 --- a/trunk/xsl/xhtml.xsl +++ b/trunk/xsl/xhtml.xsl @@ -36,7 +36,6 @@ - diff --git a/trunk/xsl/xhtml/messagebox.xsl b/trunk/xsl/xhtml/messagebox.xsl index 6c38e60..ee9f2bd 100644 --- a/trunk/xsl/xhtml/messagebox.xsl +++ b/trunk/xsl/xhtml/messagebox.xsl @@ -17,7 +17,7 @@ - + diff --git a/trunk/xsl/xhtml/pluginhelp.xsl b/trunk/xsl/xhtml/pluginhelp.xsl index c9cdab4..f37887b 100644 --- a/trunk/xsl/xhtml/pluginhelp.xsl +++ b/trunk/xsl/xhtml/pluginhelp.xsl @@ -9,6 +9,12 @@ +
+ + + +
+
diff --git a/trunk/xsl/xhtml/splash.xsl b/trunk/xsl/xhtml/splash.xsl index 042c774..34915ce 100644 --- a/trunk/xsl/xhtml/splash.xsl +++ b/trunk/xsl/xhtml/splash.xsl @@ -9,7 +9,7 @@ -
+
- - diff --git a/trunk/xsl/xhtml/tagcloud.xsl b/trunk/xsl/xhtml/tagcloud.xsl index de675d9..12b6615 100644 --- a/trunk/xsl/xhtml/tagcloud.xsl +++ b/trunk/xsl/xhtml/tagcloud.xsl @@ -11,7 +11,13 @@ -
+ +
+ + + + + @@ -33,7 +39,8 @@ ‌ -
+ +
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl index db264b3..1e1267c 100644 --- a/trunk/xsl/xhtml/video.xsl +++ b/trunk/xsl/xhtml/video.xsl @@ -48,10 +48,10 @@ - - + + @@ -215,19 +215,6 @@ filesize

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

@@ -339,13 +326,6 @@ filesize -
- - - - -
- @@ -404,6 +384,20 @@ filesize + @@ -422,7 +416,7 @@ filesize
<object data="" - type="application/xml" + type="application/xhtml+xml" width="" height="" />