diff --git a/trunk/images/flags/README b/trunk/images/flags/COPYING
similarity index 100%
rename from trunk/images/flags/README
rename to trunk/images/flags/COPYING
diff --git a/trunk/images/flags/de-de.png b/trunk/images/flags/de-de.png
index d26c4b2..54881c4 100644
Binary files a/trunk/images/flags/de-de.png and b/trunk/images/flags/de-de.png differ
diff --git a/trunk/images/flags/en-us.png b/trunk/images/flags/en-us.png
index b1ecf9d..10cc19f 100644
Binary files a/trunk/images/flags/en-us.png and b/trunk/images/flags/en-us.png differ
diff --git a/trunk/images/logo-big.png b/trunk/images/logo-big.png
deleted file mode 100644
index 6da4274..0000000
Binary files a/trunk/images/logo-big.png and /dev/null differ
diff --git a/trunk/images/openid-icon.png b/trunk/images/openid-icon.png
deleted file mode 100755
index 4d1418d..0000000
Binary files a/trunk/images/openid-icon.png and /dev/null differ
diff --git a/trunk/images/tango/128x128/document-save.png b/trunk/images/tango/128x128/document-save.png
new file mode 100644
index 0000000..0c5a242
Binary files /dev/null and b/trunk/images/tango/128x128/document-save.png differ
diff --git a/trunk/images/tango/128x128/player_play.png b/trunk/images/tango/128x128/player_play.png
new file mode 100644
index 0000000..0aefd5d
Binary files /dev/null and b/trunk/images/tango/128x128/player_play.png differ
diff --git a/trunk/images/tango/16x16/actions/document-new.png b/trunk/images/tango/16x16/actions/document-new.png
new file mode 100644
index 0000000..4c3efdd
Binary files /dev/null and b/trunk/images/tango/16x16/actions/document-new.png differ
diff --git a/trunk/images/tango/16x16/actions/document-save.png b/trunk/images/tango/16x16/actions/document-save.png
new file mode 100644
index 0000000..22ff495
Binary files /dev/null and b/trunk/images/tango/16x16/actions/document-save.png differ
diff --git a/trunk/images/tango/16x16/emblems/emblem-favorite.png b/trunk/images/tango/16x16/emblems/emblem-favorite.png
new file mode 100644
index 0000000..3acb57d
Binary files /dev/null and b/trunk/images/tango/16x16/emblems/emblem-favorite.png differ
diff --git a/trunk/images/tango/dialog-error.png b/trunk/images/tango/32x32/dialog-error.png
similarity index 100%
rename from trunk/images/tango/dialog-error.png
rename to trunk/images/tango/32x32/dialog-error.png
diff --git a/trunk/images/tango/dialog-information.png b/trunk/images/tango/32x32/dialog-information.png
similarity index 100%
rename from trunk/images/tango/dialog-information.png
rename to trunk/images/tango/32x32/dialog-information.png
diff --git a/trunk/images/tango/dialog-warning.png b/trunk/images/tango/32x32/dialog-warning.png
similarity index 100%
rename from trunk/images/tango/dialog-warning.png
rename to trunk/images/tango/32x32/dialog-warning.png
diff --git a/trunk/images/tango/README b/trunk/images/tango/COPYING
similarity index 100%
rename from trunk/images/tango/README
rename to trunk/images/tango/COPYING
diff --git a/trunk/images/tango/media-playback-start.png b/trunk/images/tango/player_play.png
similarity index 100%
rename from trunk/images/tango/media-playback-start.png
rename to trunk/images/tango/player_play.png
diff --git a/trunk/images/tango/search.png b/trunk/images/tango/search.png
new file mode 100644
index 0000000..a0155e7
Binary files /dev/null and b/trunk/images/tango/search.png differ
diff --git a/trunk/images/tango/video.png b/trunk/images/tango/video.png
new file mode 100644
index 0000000..89757fa
Binary files /dev/null and b/trunk/images/tango/video.png differ
diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 3e92dd7..de33d7f 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -33,9 +33,9 @@
Instant Access
Advanced Search
- latest additions
+ new videos
most downloaded
- most viewed
+ popular videos
Error 202c - Access forbidden by government.
@@ -159,7 +159,6 @@
plackback
mark as junk
edit
- MB
use browser plugin
use java applet
license conditions
@@ -200,6 +199,12 @@
+
+ MB
+ sec
+ min
+ h
+
diff --git a/trunk/style/colors/tango.css b/trunk/style/colors/tango.css
index bd60696..5a459d3 100644
--- a/trunk/style/colors/tango.css
+++ b/trunk/style/colors/tango.css
@@ -5,8 +5,8 @@ Yolanda default stylesheet colors (using tango color palette)
This file is licensed under the WTF Public License
(License terms: Do what the fuck you want.)
-Purpose of this file is to provide colors according to the Tango! palette.
-Protip: Use only CSS properties that contain "color" !
+Purpose of this file is to provide graphics according to the Tango! palette.
+Protip: Graphics are colors, background and pseudo-content images !
Please replace the colors in this file with suitable Tango! equivalents.
↑↑ Remove this notice as soon as this file holds only Tango! colors. ↑↑
@@ -49,18 +49,37 @@ a
div
{
+ /* "Aluminium 5" */
+ border-color: #555753;
}
- div.footer,
- div.header
+ div.button-download
{
- border-color: #c0c0c0;
}
+ div.button-download img
+ {
+ }
+
+div.loginbox
+{
+}
+
+ div.loginbox form
+ {
+ }
+
+ div.loginbox form fieldset
+ {
+ }
+
+ div.loginbox form fieldset input:after
+ {
+ content: url(../../images/openid-icon.png);
+ }
+
div.messagebox
{
- /* "Aluminium 5" */
- border-color: #555753;
}
div.messagebox#error
@@ -69,10 +88,10 @@ div
background-color: #f46060;
}
- div.messagebox#warning
+ div.messagebox#error:before
{
- /* "Orange 1" */
- background-color: #fcaf3e;
+ /* TODO: find out how to set vertical-align:middle for this image */
+ content: url(../../images/tango/32x32/dialog-error.png);
}
div.messagebox#information
@@ -81,25 +100,91 @@ div
background-color: #a9ec68;
}
+ div.messagebox#information:before
+ {
+ /* TODO: find out how to set vertical-align:middle for this image */
+ content: url(../../images/tango/32x32/dialog-information.png);
+ }
+
+ div.messagebox#warning
+ {
+ /* "Orange 1" */
+ background-color: #fcaf3e;
+ }
+
+ div.messagebox#warning:before
+ {
+ /* TODO: find out how to set vertical-align:middle for this image */
+ content: url(../../images/tango/32x32/dialog-warning.png);
+ }
+
div.page-number
{
/* "Aluminium 5" */
border-color: #555753;
}
+div#preview
+{
+}
+
+ div#preview form
+ {
+ }
+
+ div.result
+ {
+ }
+
+ div.result img
+ {
+ /* "Aluminium 5" */
+ border-color: #555753;
+ }
+
+ div.searchbar
+ {
+ }
+
+ div.splashbox
+ {
+ }
+
div.tagcloud
{
- /* Aluminium 1 */
- background-color: #eeeeec;
- /* "Aluminium 5" */
- border-color: #555753;
}
+
+form
+{
+}
+
+ form fieldset
+ {
+ }
+
+ form fieldset input[type="text"]
+ {
+ }
+
span
{
}
- span.instruction,
+ span.duration
+ {
+ }
+
+ span.heading
+ {
+ }
+
+ span.instruction
+ {
+ /* "Aluminium 5" */
+ color: #555753;
+ }
+
span.protip
{
/* "Aluminium 5" */
@@ -110,8 +195,40 @@ ul
{
}
-ul li:hover
+ ul#footer,
+ ul#header
{
- /* Aluminium 1 */
- background-color: #eeeeec;
+ /* "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
+ {
+ }
+
+ ul#queries li#latestadditions
+ {
+ list-style-image: url(../../images/tango/16x16/actions/document-new.png)
+ }
+
+ ul#queries li#mostviews
+ {
+ list-style-image: url(../../images/tango/16x16/emblems/emblem-favorite.png)
+ }
+
+ ul#queries li#mostdownloads
+ {
+ list-style-image: url(../../images/tango/16x16/actions/document-save.png)
+ }
diff --git a/trunk/style/decoration/bridget.css b/trunk/style/decoration/bridget.css
index 8c47364..34916cf 100644
--- a/trunk/style/decoration/bridget.css
+++ b/trunk/style/decoration/bridget.css
@@ -9,15 +9,16 @@ 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)
- - content generated by css (:before, :after)
+ - css pseudo-content that isn't graphics (:before, :after)
*/
body
{
font-family: sans-serif;
font-size: 8pt;
- font-weight: bold;
+/* font-weight: bold;*/
margin: 1.5em;
+ text-align: center;
}
a
@@ -42,28 +43,41 @@ a
div
{
- border-width: 0px;
+ border-style: solid;
+ border-width: 1px;
+ margin: 0.5em;
+ padding: 0.5em;
}
+ 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) ! */
+ margin-top: 0em;
+ text-align: justify;
+ }
+
div.footer,
div.header
{
}
- div.button-download,
- div.button-edit,
- div.button-junk
+ div.button-download
{
- margin: 0.5em;
- vertical-align: top;
+ /* TODO: find out /why we do this/ (see div.searchbar) ! */
+ margin-top: 0em;
+ vertical-align: top;
}
- div.button-download img,
- div.button-edit img,
- div.button-junk img
- {
- margin: 0.5em;
- }
+ div.button-download img
+ {
+ margin: 0.5em;
+ }
div.cc-license-chooser
{
@@ -71,28 +85,33 @@ div
div.cc-license-chooser img
{
- margin: 0.25em;
vertical-align: middle;
}
- div#container form
- {
- padding-left: auto;
- padding-right: auto;
- }
-
- div.messagebox
+ div.commentform,
+ div.loginform,
+ div.registerform,
+ div.settingsform,
+ div.uploadform
{
- border-style: solid;
- border-width: 1px;
+ line-height: 2.5em;
margin: 1.5em;
}
- div.messagebox#error
- {
- }
+ div.loginbox
+ {
+ /* TODO: find out /why we do this/ (see div.searchbar) ! */
+ margin-top: 0em;
+ text-align: justify;
+ }
- div.messagebox#warning
+ div.messagebox
+ {
+ /* correct spacing to avoid overlapping with float:right elements */
+ margin-right: 22em;
+ }
+
+ div.messagebox#error
{
}
@@ -100,12 +119,17 @@ div
{
}
- div.messagebox img
- {
- margin: 0.75em;
- overflow: visible;
- vertical-align: middle;
- }
+ div.messagebox#warning
+ {
+ }
+
+ 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
{
@@ -113,16 +137,97 @@ div
overflow: visible;
}
- div.result
+div#preview
+{
+ /* correct spacing to avoid overlapping with float:right elements */
+ 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
+ {
+ }
+
+ div.results
{
+/* border-width: 0px;*/
+ /* correct spacing to avoid overlapping with float:right elements */
+ margin: 0em;
+ margin-right: 22em !important;
+ padding: 0em;
}
- div.result img
+ div.results div.result
{
- border-color: black;
- border-width: 1px;
+ border-width: 0px;
+ padding: 0em;
}
+ div.results div.result img
+ {
+ border-width: 1px;
+ }
+
+ div.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;
+ }
+
+form
+{
+}
+
+ form fieldset
+ {
+ border-width: 0px;
+ }
+
+ form fieldset input[type="text"]
+ {
+ }
+
+ h1
+ {
+ font-weight: normal;
+ font-size: 2em;
+ text-align: center;
+ }
+
input
{
text-align: left;
@@ -133,30 +238,79 @@ img
border-width: 0;
}
-span.protip:after
+span
{
- content: " )";
}
-span.protip:before
-{
- content: "( ";
-}
+ span.duration:after
+ {
+ content: ") ";
+ }
-ul[role="navigation"]
-{
- border-style: solid;
- list-style-type: none;
- border-width: 1px;
-}
+ span.duration:before
+ {
+ content: " (";
+ }
- ul[role="navigation"] li
+ span.instruction
{
}
- ul[role="navigation"] li a
+ span.protip
+ {
+ font-weight:bold;
+ }
+
+ span.protip:after
+ {
+ content: " )";
+ }
+
+ span.protip:before
+ {
+ content: "( ";
+ }
+
+ul
+{
+}
+
+ 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#queries
+ {
+ font-size: 1.5em;
+ font-weight: bold;
+ }
+
+ ul#queries li#latestadditions
+ {
+ }
+
+ ul#queries li#mostviews
+ {
+ }
+
+ ul#queries li#mostdownloads
{
- font-size: 1em;
- line-height: 3em;
- padding: 1em;
}
diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css
index 026e82e..cf9458a 100644
--- a/trunk/style/structure/fake6.css
+++ b/trunk/style/structure/fake6.css
@@ -16,7 +16,6 @@ Please clear this file of any CSS properties that do not define structure.
body
{
min-height: 100%;
- text-align: center;
}
a
@@ -33,46 +32,46 @@ a
a.tag
{
- display: inline-block;
+ display: block;
+ float: left;
}
div
{
}
- div.button-download,
- div.button-edit,
- div.button-junk
+ div.button-download
{
- display: inline-block;
- }
-
- div#container
- {
- position: relative;
- }
-
- div#container form
- {
- position: absolute;
- top: 50%;
- width: 100%
- }
-
- div.commentform,
- div.loginform,
- div.registerform,
- div.settingsform,
- div.uploadform
- {
- line-height: 2.5em;
- margin: 1.5em;
+ clear: right;
+ float: right;
+ width: 20em;
}
div.comments
{
}
+ div.description
+ {
+ clear: right;
+ float: right;
+ width: 20em;
+ }
+
+ div.loginbox
+ {
+ clear: right;
+ float: right;
+ width: 20em;
+ }
+
+ div.metadata
+ {
+ clear: right;
+ float: right;
+ width: 20em;
+ }
+
div.page-number
{
display: inline-block;
@@ -82,56 +81,68 @@ div
overflow: visible;
}
- div.result
+ div#preview
{
- display: inline-block;
- position: relative;
- vertical-align: top;
+ position: relative;
}
- div.result img
+ 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
{
}
-/*
- indefinitely postponed - does any major browser support absolute
- positioning /inside inline-blocks/ ?
+ div.results
+ {
+
+ }
- div.result img.flag
+ div.results div.result
{
- position: absolute;
- bottom: 32px;
- right: 10px;
+ float: left;
+ position: relative;
}
-*/
- div.search
+ div.results div.result img
+ {
+ }
+
+ div.results div.result img.flag
+ {
+ bottom: 3em;
+ position: absolute;
+ right: 0.5em;
+ }
+
+ div.searchbar
{
- padding: 0.75em;
+ float: right;
+ width: 20em;
}
- div.search-small
+ div.splashbox
{
- clear: both;
- float: right;
- height: 0em;
- overflow: visible;
- text-align: right;
- }
-
- div.toplists
- {
- padding: 0.75em;
}
div.tagcloud
{
- border-style: solid;
- border-width: 1px;
- margin: 0.75em;
- margin-left: 20%;
- margin-right: 20%;
- padding: 0.75em;
+ clear: right;
+ float: right;
+ width: 20em;
}
div.video
@@ -153,48 +164,46 @@ div
margin-top: 0.5em;
}
- div.video-metadata
- {
- display: inline-block;
- line-height: 1.5em;
- margin-left: 1.5em;
- text-align: left;
- vertical-align: top;
- width: 256px;
- }
-
div.videotitle
{
font-size: 1.5em;
- margin-bottom: 0.5em;
}
-fieldset
+form
{
- border-width: 0px;
}
- img.logo-big
+ form fieldset
{
- padding-bottom: 0.5em;
}
- img.openid-icon
+ form fieldset input[type="text"]
+ {
+ }
+
+h1
+{
+}
+
+span
+{
+}
+
+ span.duration
{
- padding-left: 0.2em;
- vertical-align: text-top;
}
-span.code
-{
- font-family: monospace;
- font-weight: normal;
-}
+ span.heading
+ {
+ }
-span.heading
-{
- font-size: 1.5em;
-}
+ span.instruction
+ {
+ }
+
+ span.protip
+ {
+ }
table.metadata,
table.metadata-upload
@@ -225,16 +234,44 @@ table.metadata-upload
td.metadata-title
{
- color: #606060;
+ color: #606060;
}
-ul[role="navigation"]
+ul
{
- display: block;
- height: 3em;
}
- ul[role="navigation"] li
+ ul#footer,
+ ul#header
{
- float: left;
+ clear: both;
+ display: block;
+ height: 3em;
}
+
+ ul#footer li,
+ ul#header li
+ {
+ float: left;
+ }
+
+ ul#footer li a,
+ ul#header li a
+ {
+ }
+
+ ul#queries
+ {
+ }
+
+ ul#queries li#latestadditions
+ {
+ }
+
+ ul#queries li#mostviews
+ {
+ }
+
+ ul#queries li#mostdownloads
+ {
+ }
diff --git a/trunk/tools/buzzword bingo.gnumeric b/trunk/tools/buzzword bingo.gnumeric
index 3b370fd..f807227 100644
Binary files a/trunk/tools/buzzword bingo.gnumeric and b/trunk/tools/buzzword bingo.gnumeric differ
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 2cac299..eacae0f 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -17,19 +17,23 @@
omit-xml-declaration="no"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -43,8 +47,11 @@
-
-
+
@@ -63,51 +70,4 @@