diff --git a/trunk/functions.pl b/trunk/functions.pl index 1b73a62..cdaa0e6 100644 --- a/trunk/functions.pl +++ b/trunk/functions.pl @@ -214,7 +214,7 @@ sub output_page { return $session->header( -status=>'402 Payment required', - -cost=>'$9000.00', + -cost=>'$9001.00', # OVER NEIN THOUSAND ) } else diff --git a/trunk/images/cc/32x32/cc-by.png b/trunk/images/cc/32x32/cc-by.png new file mode 100644 index 0000000..9b7e464 Binary files /dev/null and b/trunk/images/cc/32x32/cc-by.png differ diff --git a/trunk/images/cc/32x32/cc-noderivatives.png b/trunk/images/cc/32x32/cc-noderivatives.png new file mode 100644 index 0000000..76a2354 Binary files /dev/null and b/trunk/images/cc/32x32/cc-noderivatives.png differ diff --git a/trunk/images/cc/32x32/cc-noncommercial.png b/trunk/images/cc/32x32/cc-noncommercial.png new file mode 100644 index 0000000..1ac192a Binary files /dev/null and b/trunk/images/cc/32x32/cc-noncommercial.png differ diff --git a/trunk/images/cc/32x32/cc-remix.png b/trunk/images/cc/32x32/cc-remix.png new file mode 100644 index 0000000..bce992e Binary files /dev/null and b/trunk/images/cc/32x32/cc-remix.png differ diff --git a/trunk/images/cc/32x32/cc-share.png b/trunk/images/cc/32x32/cc-share.png new file mode 100644 index 0000000..6381c60 Binary files /dev/null and b/trunk/images/cc/32x32/cc-share.png differ diff --git a/trunk/images/cc/32x32/cc-sharealike.png b/trunk/images/cc/32x32/cc-sharealike.png new file mode 100644 index 0000000..0110c43 Binary files /dev/null and b/trunk/images/cc/32x32/cc-sharealike.png differ diff --git a/trunk/images/cc/32x32/cc-unknown.png b/trunk/images/cc/32x32/cc-unknown.png new file mode 100644 index 0000000..09a4bbb Binary files /dev/null and b/trunk/images/cc/32x32/cc-unknown.png differ diff --git a/trunk/images/cc/32x32/no-endorse.png b/trunk/images/cc/32x32/no-endorse.png new file mode 100644 index 0000000..0a91fd3 Binary files /dev/null and b/trunk/images/cc/32x32/no-endorse.png differ diff --git a/trunk/images/tango/16x16/actions/document-properties.png b/trunk/images/tango/16x16/actions/document-properties.png new file mode 100644 index 0000000..ab0e8ea Binary files /dev/null and b/trunk/images/tango/16x16/actions/document-properties.png differ diff --git a/trunk/images/tango/16x16/actions/go-up.png b/trunk/images/tango/16x16/actions/go-up.png new file mode 100644 index 0000000..fa9a7d7 Binary files /dev/null and b/trunk/images/tango/16x16/actions/go-up.png differ diff --git a/trunk/images/tango/16x16/actions/system-log-out.png b/trunk/images/tango/16x16/actions/system-log-out.png new file mode 100644 index 0000000..0010931 Binary files /dev/null and b/trunk/images/tango/16x16/actions/system-log-out.png differ diff --git a/trunk/images/tango/16x16/actions/system-search.png b/trunk/images/tango/16x16/actions/system-search.png new file mode 100644 index 0000000..fd7f0b0 Binary files /dev/null and b/trunk/images/tango/16x16/actions/system-search.png differ diff --git a/trunk/images/tango/16x16/categories/preferences-system.png b/trunk/images/tango/16x16/categories/preferences-system.png new file mode 100644 index 0000000..9460dfc Binary files /dev/null and b/trunk/images/tango/16x16/categories/preferences-system.png differ diff --git a/trunk/images/tango/16x16/mimetypes/text-x-generic.png b/trunk/images/tango/16x16/mimetypes/text-x-generic.png new file mode 100644 index 0000000..2d7f2d6 Binary files /dev/null and b/trunk/images/tango/16x16/mimetypes/text-x-generic.png differ diff --git a/trunk/images/tango/16x16/mimetypes/video-x-generic.png b/trunk/images/tango/16x16/mimetypes/video-x-generic.png new file mode 100644 index 0000000..64e7a30 Binary files /dev/null and b/trunk/images/tango/16x16/mimetypes/video-x-generic.png differ diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml index de33d7f..0688777 100755 --- a/trunk/locale/en-us.xml +++ b/trunk/locale/en-us.xml @@ -155,16 +155,16 @@ German - download - plackback + Download + Plackback mark as junk edit use browser plugin use java applet license conditions To embed the video on another web page, use the following HTML code: - login to comment - post + Login to comment + Post backlink diff --git a/trunk/style/colors/tango.css b/trunk/style/colors/tango.css index 5a459d3..a3bf809 100644 --- a/trunk/style/colors/tango.css +++ b/trunk/style/colors/tango.css @@ -53,11 +53,11 @@ div border-color: #555753; } - div.button-download + div.cc-license { } - div.button-download img + div.cc-license img { } @@ -92,6 +92,7 @@ div.loginbox { /* TODO: find out how to set vertical-align:middle for this image */ content: url(../../images/tango/32x32/dialog-error.png); + height: 200px; } div.messagebox#information @@ -124,6 +125,10 @@ div.loginbox border-color: #555753; } + div.protip-embed + { + } + div#preview { } @@ -167,6 +172,39 @@ form { } +li +{ +} + + li#latestadditions + { + list-style-image: url(../../images/tango/16x16/actions/document-new.png) + } + + li#logout + { + list-style-image: url(../../images/tango/16x16/actions/system-log-out.png) + } + + li#mostviews + { + list-style-image: url(../../images/tango/16x16/emblems/emblem-favorite.png) + } + + li#mostdownloads + { + list-style-image: url(../../images/tango/16x16/actions/document-save.png) + } + + li#upload + { + list-style-image: url(../../images/tango/16x16/actions/go-up.png) + } + +p +{ +} + span { } @@ -195,6 +233,10 @@ ul { } + ul#account-actions + { + } + ul#footer, ul#header { @@ -217,18 +259,3 @@ ul 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 34916cf..c8ef9f5 100644 --- a/trunk/style/decoration/bridget.css +++ b/trunk/style/decoration/bridget.css @@ -67,16 +67,17 @@ div { } - div.button-download + div.cc-license { /* TODO: find out /why we do this/ (see div.searchbar) ! */ margin-top: 0em; vertical-align: top; } - div.button-download img + div.cc-license img { - margin: 0.5em; + border-width: 0px; + margin: 0.5em; } div.cc-license-chooser @@ -107,6 +108,7 @@ div div.messagebox { + font-weight: bold; /* correct spacing to avoid overlapping with float:right elements */ margin-right: 22em; } @@ -137,6 +139,12 @@ div 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 */ @@ -167,11 +175,10 @@ div#preview div.results { -/* border-width: 0px;*/ + border-width: 0px; /* correct spacing to avoid overlapping with float:right elements */ - margin: 0em; margin-right: 22em !important; - padding: 0em; + padding: 0px; } div.results div.result @@ -208,6 +215,10 @@ div#preview text-align: justify; } + div.video + { + } + form { } @@ -221,11 +232,27 @@ form { } - h1 +h1 +{ + font-weight: normal; + font-size: 2em; + text-align: center; +} + +li +{ +} + + li#latestadditions + { + } + + li#mostviews + { + } + + li#mostdownloads { - font-weight: normal; - font-size: 2em; - text-align: center; } input @@ -238,18 +265,24 @@ img border-width: 0; } +p +{ + margin: 0.5em; + padding: 0.5em; +} + span { } span.duration:after { - content: ") "; + content: ")"; } span.duration:before { - content: " ("; + content: "("; } span.instruction @@ -275,6 +308,10 @@ ul { } + ul#account-actions + { + } + ul#footer, ul#header { @@ -297,20 +334,9 @@ ul padding: 1em; } + ul#account-actions, ul#queries { font-size: 1.5em; font-weight: bold; } - - ul#queries li#latestadditions - { - } - - ul#queries li#mostviews - { - } - - ul#queries li#mostdownloads - { - } diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css index cf9458a..7d9db36 100644 --- a/trunk/style/structure/fake6.css +++ b/trunk/style/structure/fake6.css @@ -40,13 +40,17 @@ div { } - div.button-download + div.cc-license { clear: right; float: right; width: 20em; } + div.cc-license img + { + } + div.comments { } @@ -65,6 +69,22 @@ div width: 20em; } + div.messagebox + { + } + + div.messagebox#error + { + } + + div.messagebox#information + { + } + + div.messagebox#warning + { + } + div.metadata { clear: right; @@ -81,6 +101,10 @@ div overflow: visible; } + div.protip-embed + { + } + div#preview { position: relative; @@ -113,8 +137,10 @@ div div.results div.result { - float: left; - position: relative; +/* + at this point, browsers such as firefox 2.0 mess up +*/ + display: inline-block; } div.results div.result img @@ -123,9 +149,10 @@ div div.results div.result img.flag { - bottom: 3em; - position: absolute; - right: 0.5em; + position: relative; + /* flag is 32px wide and has 1px borders */ + right: 34px; + margin-right: -34px; } div.searchbar @@ -148,20 +175,14 @@ div div.video { display: inline-block; - margin-bottom: 0.5em; } div.videoccdata { - margin: 0.75em; } div.videoccdata img { - border-width: 0px; - margin-left: 0.5em; - margin-right: 0.5em; - margin-top: 0.5em; } div.videotitle @@ -185,6 +206,26 @@ h1 { } +li +{ +} + + li#latestadditions + { + } + + li#mostviews + { + } + + li#mostdownloads + { + } + +p +{ +} + span { } @@ -241,6 +282,10 @@ ul { } + ul#account-actions + { + } + ul#footer, ul#header { @@ -263,15 +308,3 @@ ul ul#queries { } - - ul#queries li#latestadditions - { - } - - ul#queries li#mostviews - { - } - - ul#queries li#mostdownloads - { - } diff --git a/trunk/video.pl b/trunk/video.pl index 96975af..63d89dd 100644 --- a/trunk/video.pl +++ b/trunk/video.pl @@ -187,7 +187,38 @@ elsif($query->url_param('title') or $query->url_param('id')) }, 'cc:License' => { - 'rdf:about' => $license + 'rdf:about' => $license, +# ↓↓ dummy code because josch is too lazy for DOIN IT RITE ↓↓ + 'cc:permits' => + { + 'rdf:resource' => "http://web.resource.org/cc/Reproduction" + }, + 'cc:permits' => + { + 'rdf:resource' => "http://web.resource.org/cc/Distribution" + }, + 'cc:permits' => + { + 'rdf:resource' => "http://web.resource.org/cc/DerivativeWorks" + }, + 'cc:requires' => + { + 'rdf:resource' => "http://web.resource.org/cc/Notice" + }, + 'cc:requires' => + { + 'rdf:resource' => "http://web.resource.org/cc/ShareAlike" + }, + 'cc:prohibits' => + { + 'rdf:resource' => "http://web.resource.org/cc/CommercialUse" + }, + 'cc:prohibits' => + { + 'rdf:resource' => "http://web.resource.org/cc/DerivativeWorks" + } +# ↑↑ dummy code because josch is too lazy for DOIN IT RITE ↑↑ +# sadly, i dunno how to add multiple tags } } }; diff --git a/trunk/xsl/xhtml/loginbox.xsl b/trunk/xsl/xhtml/loginbox.xsl index acf3fc5..b7ce143 100644 --- a/trunk/xsl/xhtml/loginbox.xsl +++ b/trunk/xsl/xhtml/loginbox.xsl @@ -9,37 +9,92 @@
-
- - - -
+ + + + + + + + +
+ + + + + +
+ +
+ + +
+ + + + + + + + +
+ + + + - - - -
- -
- - -
- - - - - + + + + user/ - -
- + + +--> + + + + + +
diff --git a/trunk/xsl/xhtml/messagebox.xsl b/trunk/xsl/xhtml/messagebox.xsl index fad0668..49345b3 100644 --- a/trunk/xsl/xhtml/messagebox.xsl +++ b/trunk/xsl/xhtml/messagebox.xsl @@ -22,11 +22,11 @@ - + - + diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl index 8500561..b25ee9e 100644 --- a/trunk/xsl/xhtml/results.xsl +++ b/trunk/xsl/xhtml/results.xsl @@ -51,7 +51,6 @@ - @@ -60,7 +59,6 @@ -
diff --git a/trunk/xsl/xhtml/searchbar.xsl b/trunk/xsl/xhtml/searchbar.xsl index 20439cf..05e5cc6 100644 --- a/trunk/xsl/xhtml/searchbar.xsl +++ b/trunk/xsl/xhtml/searchbar.xsl @@ -34,36 +34,36 @@ - diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl index 2ce8f2d..5680751 100644 --- a/trunk/xsl/xhtml/video.xsl +++ b/trunk/xsl/xhtml/video.xsl @@ -65,26 +65,26 @@ + + + - - -
- - -
- - <object data="" - type="application/xml" - width= - height= - /> - - +
+ +
+ + <object data="" + type="application/xml" + width= + height= + /> +
@@ -167,45 +172,46 @@ unfinished bizness - + --> - + share - + remix - + + - + by - + sharealike - - +--> + + - + noncommercial - + noderivatives @@ -213,6 +219,7 @@ +

- +   @@ -303,12 +311,7 @@ - - -
- - - +