From 23f30e8259af2bb6d9f1871d559091681194eccf Mon Sep 17 00:00:00 2001 From: josch Date: Wed, 7 Nov 2007 06:55:02 +0000 Subject: [PATCH] added embedded mode - css has to be fixed accordingly git-svn-id: http://yolanda.mister-muffin.de/svn@177 7eef14d0-6ed0-489d-bf55-20463b2d70db --- trunk/style/default.css | 4 +- trunk/tagcloud.pl | 1 - trunk/video.pl | 2 + trunk/xsl/xhtml.xsl | 217 ++++++++++++----------- trunk/xsl/xhtml/video.xsl | 359 ++++++++++++++++++++------------------ 5 files changed, 300 insertions(+), 283 deletions(-) diff --git a/trunk/style/default.css b/trunk/style/default.css index 8921e53..518013b 100755 --- a/trunk/style/default.css +++ b/trunk/style/default.css @@ -8,8 +8,8 @@ body font-family: sans-serif; font-size: 8pt; font-weight: bold; - min-width: 550px; - margin: 2em; +// min-width: 550px; //what is this for? we do not know which font size the user will choose so something in pixel is bullshit + margin: 2em; //this has to be zero for embed viewing text-align: center; } diff --git a/trunk/tagcloud.pl b/trunk/tagcloud.pl index a8e2141..6ffb8af 100755 --- a/trunk/tagcloud.pl +++ b/trunk/tagcloud.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl -w use DBI; -use Data::Dumper::Simple; $database = 'yolanda'; $dbhost = 'localhost'; diff --git a/trunk/video.pl b/trunk/video.pl index 0e41186..afd85a3 100644 --- a/trunk/video.pl +++ b/trunk/video.pl @@ -71,6 +71,8 @@ elsif($query->url_param('title') or $query->url_param('id')) } elsif($rowcount == 1) { + $page->{'embed'} = $query->param('embed') eq 'true' ? "true" : "false"; + #if there was a single result, display the video my ($id, $title, $description, $publisher, $timestamp, $creator, $subject, $contributor, $source, $language, $coverage, $rights, $license, diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl index 99a6ed0..65ee3db 100755 --- a/trunk/xsl/xhtml.xsl +++ b/trunk/xsl/xhtml.xsl @@ -77,91 +77,94 @@ - - - -
- - - - - - -
-
- - - - - - - - - - - - - - - open id logo - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - -
-
- - - - user/ - - - - - - - - - - -
- - - -
- - - - - - + + + +
+ + + + + + +
+
+ + + + + + + + + + + + + + + open id logo + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + + user/ + + + + + + + + + + +
+ + + +
+ + + + + + + + + @@ -188,28 +191,30 @@ -
- - - - - - - - - - - - - - - - - - - - -
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl index 82981d9..637308d 100644 --- a/trunk/xsl/xhtml/video.xsl +++ b/trunk/xsl/xhtml/video.xsl @@ -7,10 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" > - - - -
@@ -47,7 +43,14 @@
- + + + + + + + + Watch using Browser Video Plugin @@ -68,7 +71,14 @@ -
- - - - - - - - - - + +
+ + + + + + + + + + +
+ + +
+ +
+ + + + + : +
- - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
- - - - - : - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
- - - +
- -
- + : - +
+ + + : + + + + + + + + : + + + + + + + + : + + + + + + + + : + + + + + + + + : + + + + + + + + : + + + + + + + + : + + + + + + - + + + + + + + +
+ + + +
- -
-
- - - -
-
-