diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index d978bd0..a077fe4 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -3,148 +3,150 @@
- |
+ |
- to upload videos, log in first.
+ to upload videos, log in first.
- register
- login
- login with OpenID
+ register
+ login
+ login with OpenID
- upload video
- bookmarks
- account details
+ upload video
+ bookmarks
+ account details
- logged in as
- logout
+ logged in as
+ logout
- © 2007 Yolanda team
- license
- download source code
+ © 2007 Yolanda team
+ license
+ download source code
- Find
- Instant Access
+ Find
+ Instant Access
- latest additions
- most downloads
- most views
+ latest additions
+ most downloads
+ most views
- Error 202c - Access forbidden by government.
- You did not supply a file.
- You did not supply a title.
- You did not supply a creator.
- You did not supply any keywords.
- You did not supply a description.
- You did not supply a publisher.
- You did not supply a title.
- You did not supply a source.
- You did not supply a language.
- You did not supply a coverage.
- 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.
- Passwords do not match.
- Please insert a username.
- Please insert a password.
- Please repeat your password.
-
+ Error 202c - Access forbidden by government.
+ You did not supply a file.
+ You did not supply a title.
+ You did not supply a creator.
+ You did not supply any keywords.
+ You did not supply a description.
+ You did not supply a publisher.
+ You did not supply a title.
+ You did not supply a source.
+ You did not supply a language.
+ You did not supply a coverage.
+ 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.
+ Passwords do not match.
+ Please insert a username.
+ Please insert a password.
+ Please repeat your password.
+
- You are now logged in.
- You are now logged out.
- To put the video into context, additional metainformation is needed.
-
-
- Your account has been created.
- Your file has been uploaded.
+ You are now logged in.
+ You are now logged out.
+ To put the video into context, additional metainformation is needed.
+
+
+ Your account has been created.
+ Your file has been uploaded.
- results for query
- ordered by
- ascending
- descending
- results on
- pages
- relevance
- duration
- filesize
- viewcount
- downloadcount
- timestamp
+ results for query
+ ordered by
+ ascending
+ descending
+ results on
+ pages
+ relevance
+ duration
+ filesize
+ viewcount
+ downloadcount
+ timestamp
- search
+ search
- username
- password
- repeat password
- register
- login
+ username
+ password
+ repeat password
+ register
+ login
- file
- next page
- previous page
- upload
- Specify the file you want to upload.
- State the title of the video.
- Specify the creator of the video.
- State some keywords, separated by commas.
- Describe the video in natural language.
- Specify the source, preferably by URL.
- State the language of the video.
- Specify the time and location covered.
- This is page 1 of 6.
- This is page 2 of 6.
- This is page 3 of 6.
- This is page 4 of 6.
- This is page 5 of 6.
- This is page 6 of 6.
- Page 1
- Page 3
- Page 4
+ file
+ next page
+ previous page
+ upload
+ Specify the file you want to upload.
+ State the title of the video.
+ Specify the creator of the video.
+ State some keywords, separated by commas.
+ Describe the video in natural language.
+ Specify the source, preferably by URL.
+ State the language of the video.
+ Specify the time and location covered.
+ This is page 1 of 6.
+ This is page 2 of 6.
+ This is page 3 of 6.
+ This is page 4 of 6.
+ This is page 5 of 6.
+ This is page 6 of 6.
+ Page 1
+ Page 3
+ Page 4
- Download
- MB
- use browser plugin
- use java applet
- Edit
- Bookmark
- License Conditions
-
-
+ Download
+ MB
+ use browser plugin
+ use java applet
+ Edit
+ Bookmark
+ License Conditions
+ To embed the video on another web page, use the following HTML code:
+
+
+
+
+ backlink
- title
- author
- subject
- description
- uploader
- contributor
- date
- source
- language
- coverage
- righs holder
+ title
+ author
+ subject
+ description
+ uploader
+ contributor
+ date
+ source
+ language
+ coverage
+ righs holder
- duration
- viewcount
+ duration
+ viewcount
- my uploads
- edit my settings
- my bookmarks
-
-
+ my uploads
+ edit my settings
+ my bookmarks
diff --git a/trunk/style/embedded.css b/trunk/style/embedded.css
new file mode 100644
index 0000000..970ce1b
--- /dev/null
+++ b/trunk/style/embedded.css
@@ -0,0 +1,21 @@
+body
+{
+ font-family: sans-serif;
+ font-size: 8pt;
+ font-weight: bold;
+ overflow: visible;
+}
+
+div.watch-browserplugin, div.watch-cortadoapplet
+{
+ float: left;
+ text-align: left;
+ width: 50%;
+}
+
+div.embedded-backlink
+{
+ float: right;
+ text-align: right;
+ width: 50%;
+}
\ No newline at end of file
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 55ed960..54b33e8 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -37,7 +37,7 @@
-
+
@@ -55,14 +55,27 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /style/embedded.css
+
+
+
+
<xsl:choose>
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index 21ce4b8..2ca0420 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -57,7 +57,7 @@
<param name="showStatus" value="show"/>
<param name="bufferSize" value="200"/>
</applet>
- <div>
+ <div class="watch-browserplugin">
<a>
<xsl:attribute name="href">
<xsl:choose>
@@ -85,7 +85,7 @@
<xsl:value-of select="concat(//video/rdf:RDF/cc:Work/@rdf:about,'/view=true')" />
</xsl:attribute>
</object>
- <div>
+ <div class="watch-cortadoapplet">
<a>
<xsl:attribute name="href">
<xsl:choose>
@@ -104,6 +104,17 @@
</xsl:choose>
</div>
+ <xsl:if test="//@embed='true'">
+ <div class="embedded-backlink">
+ <a target="_blank">
+ <xsl:attribute name="href">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" />
+ </xsl:attribute>
+ <xsl:value-of select="$locale_strings[@id='backlink']" />
+ </a>
+ </div>
+ </xsl:if>
+
<xsl:if test="not(//@embed='true')">
<div class="button-download">
<a>
@@ -261,10 +272,14 @@
<div class="videostuff">
<span class="protip-embed">
- To embed the video on another web page, use the following HTML code:
+ <xsl:value-of select="$locale_strings[@id='protip_embed']" />
<br />
<span class="code">
- <iframe src="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/embed=true')" />" />
+ <object data="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/embed=true')" />"
+ type="application/xml"
+ width=<xsl:value-of select="//video/@width + 24" />
+ height=<xsl:value-of select="//video/@height + 48" />
+ />
</span>
</span>
</div>
diff --git a/trunk/xsl/xspf.xsl b/trunk/xsl/xspf.xsl
index a040dfc..5633d4a 100644
--- a/trunk/xsl/xspf.xsl
+++ b/trunk/xsl/xspf.xsl
@@ -18,7 +18,7 @@
/>
<xsl:variable name="site_strings" select="document('../site/main.xml')//strings" />
-<xsl:variable name="locale_strings" select="document(concat('../locale/',/page/@locale,'.xml'))//strings" />
+<xsl:variable name="locale_strings" select="document(concat('../locale/', $locale, '.xml'))//strings/string" />
<xsl:template match="/">
<xsl:apply-templates />