- Many video sharing sites use the Adobe Flash Plugin to play embedded video. - We disapprove of that because Flash is proprietary (not free software). -
-
+
+
+
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 @@
-->
-
+
-
+
-
+
-
+
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 @@
-
-
-
- - | + +
- |
-
-