diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 88ba544..d978bd0 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -115,6 +115,8 @@
Download
MB
+ use browser plugin
+ use java applet
Edit
Bookmark
License Conditions
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 5155fe1..ce32447 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -39,7 +39,18 @@ div
div.button-download, div.button-edit, div.button-bookmark
{
- display: inline-block;
+ display: inline-block;
+ margin: 0.5em;
+ }
+
+ div.button-download img, div.button-edit img, div.button-bookmark img
+ {
+ margin: 0.5em;
+ }
+
+ div.comments
+ {
+ display: none;
}
div.footer
@@ -117,12 +128,34 @@ div
div.tagcloud
{
- display: inline-block;
- padding: 1.5em;
+ padding: 1.5em;
padding-left: 20%;
padding-right: 20%;
}
+ div.videoccdata
+ {
+ margin: 1.5em;
+ }
+
+ div.videoccdata img
+ {
+ border-width: 0px;
+ margin-left: 0.5em;
+ margin-right: 0.5em;
+ margin-top: 0.5em;
+ }
+
+div.videostuff
+{
+}
+
+div.videotitle
+{
+ font-size: 1.5em;
+ margin-bottom: 0.5em;
+}
+
fieldset
{
border-width: 0px;
@@ -154,14 +187,18 @@ img
img.logo-big
{
- display: inline-block;
- padding-bottom: 1.5em;
+ padding-bottom: 0.5em;
}
img.logo-small
{
}
+span.code
+{
+ font-family: monospace;
+}
+
span.protip
{
color: #606060;
@@ -177,11 +214,6 @@ span.protip:before
content: "( ";
}
-span.videotitle
-{
- font-size: 1.5em;
-}
-
table.results
{
display: inline;
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 0515adb..55ed960 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -54,12 +54,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
<xsl:choose>
<xsl:when test="boolean(//frontpage)">
diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl
index a890648..0271b15 100644
--- a/trunk/xsl/xhtml/results.xsl
+++ b/trunk/xsl/xhtml/results.xsl
@@ -28,14 +28,14 @@
</a>
</td>
<td>
- <span class="videotitle">
+ <div class="videotitle">
<a>
<xsl:attribute name="href">
<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
</xsl:attribute>
<xsl:value-of select="rdf:RDF/cc:Work/dc:title" />
</a>
- </span>
+ </div>
<br />
<xsl:value-of select="rdf:RDF/cc:Work/dc:description" />
<table class="videometadata">
@@ -301,46 +301,50 @@
<xsl:template name="pagination-arrows">
<xsl:variable name="query_string" select="concat('/', //results/@scriptname, '?', //results/@argument, '=', //results/@value, '&orderby=', //results/@orderby, '&sort=', //results/@sort, '&pagesize=', //results/@pagesize)" />
<div>
- <xsl:choose>
- <xsl:when test="//results/@currentpage<=1">
- <img src="./images/placeholder32x32.png" />
- <img src="./images/placeholder32x32.png" />
- </xsl:when>
- <xsl:otherwise>
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="concat($query_string, '&page=1')" />
- </xsl:attribute>
- <img src="./images/tango/go-first.png" />
- </a>
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="concat($query_string, '&page=', //results/@currentpage - 1)" />
- </xsl:attribute>
- <img src="./images/tango/go-previous.png" />
- </a>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="//results/@lastpage<=//results/@currentpage">
- <img src="./images/placeholder32x32.png" />
- <img src="./images/placeholder32x32.png" />
- </xsl:when>
- <xsl:otherwise>
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="concat($query_string, '&page=', //results/@currentpage + 1)" />
- </xsl:attribute>
- <img src="./images/tango/go-next.png" />
- </a>
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="concat($query_string, '&page=', //results/@lastpage)" />
- </xsl:attribute>
- <img src="./images/tango/go-last.png" />
- </a>
- </xsl:otherwise>
- </xsl:choose>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="concat($query_string, '&page=1')" />
+ </xsl:attribute>
+ <xsl:if test="//results/@currentpage<=1">
+ <xsl:attribute name="style">
+ visibility: hidden;
+ </xsl:attribute>
+ </xsl:if>
+ <img src="./images/tango/go-first.png" />
+ </a>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="concat($query_string, '&page=', //results/@currentpage - 1)" />
+ </xsl:attribute>
+ <xsl:if test="//results/@currentpage<=1">
+ <xsl:attribute name="style">
+ visibility: hidden;
+ </xsl:attribute>
+ </xsl:if>
+ <img src="./images/tango/go-previous.png" />
+ </a>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="concat($query_string, '&page=', //results/@currentpage + 1)" />
+ </xsl:attribute>
+ <xsl:if test="//results/@lastpage<=//results/@currentpage">
+ <xsl:attribute name="style">
+ visibility: hidden;
+ </xsl:attribute>
+ </xsl:if>
+ <img src="./images/tango/go-next.png" />
+ </a>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="concat($query_string, '&page=', //results/@lastpage)" />
+ </xsl:attribute>
+ <xsl:if test="//results/@lastpage<=//results/@currentpage">
+ <xsl:attribute name="style">
+ visibility: hidden;
+ </xsl:attribute>
+ </xsl:if>
+ <img src="./images/tango/go-last.png" />
+ </a>
</div>
</xsl:template>
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index 0780684..21ce4b8 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -8,8 +8,9 @@
>
<xsl:template name="video">
- <xsl:if test="//@embed!='true'">
- <h2>
+ <xsl:if test="not(//@embed='true')">
+ <br />
+ <div class="videotitle">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
<xsl:variable name="minutes" select="floor(//video/@duration div 60)" />
<xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
@@ -22,7 +23,7 @@
(<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</xsl:otherwise>
</xsl:choose>
- </h2>
+ </div>
</xsl:if>
<div class="video">
<xsl:choose>
@@ -68,7 +69,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- Watch using Browser Video Plugin
+ <xsl:value-of select="$locale_strings[@id='watch_browserplugin']" />
</a>
</div>
</xsl:when>
@@ -96,14 +97,14 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- Watch using Cortado Java Applet
+ <xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
</a>
</div>
</xsl:otherwise>
</xsl:choose>
</div>
- <xsl:if test="//@embed!='true'">
+ <xsl:if test="not(//@embed='true')">
<div class="button-download">
<a>
<xsl:attribute name="href">
@@ -155,29 +156,6 @@
</a>
</xsl:if>
</div>
-
- <table class="videometadata">
- <tr>
- <td class="leftcell">
- Viewcount
- </td>
- <td class="rightcell">
- <xsl:value-of select="//video/@viewcount" />
- </td>
- </tr>
- <tr>
- <td class="leftcell">
- Downloadcount
- </td>
- <td class="rightcell">
- <xsl:value-of select="//video/@downloadcount" />
- </td>
- </tr>
- </table>
-
- Permalink: <xsl:value-of select="//rdf:RDF/cc:Work/dc:identifier" />
- <br />
- <pre><iframe src="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/embed=true')" />" /></pre>
<div class="videoccdata">
<a>
<xsl:attribute name="href">
@@ -247,14 +225,6 @@
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:creator" />
</td>
</tr>
- <tr>
- <td class="leftcell">
- <xsl:value-of select="$locale_strings[@id='DC.Subject']" />:
- </td>
- <td class="rightcell">
- <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:subject" />
- </td>
- </tr>
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Description']" />:
@@ -263,14 +233,6 @@
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:description" />
</td>
</tr>
- <tr>
- <td class="leftcell">
- <xsl:value-of select="$locale_strings[@id='DC.Publisher']" />:
- </td>
- <td class="rightcell">
- <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:publisher" />
- </td>
- </tr>
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Date']" />:
@@ -296,20 +258,17 @@
</td>
</tr>
</table>
-
- <table class="videometadata">
- <xsl:for-each select="//referers/referer">
- <tr>
- <td class="leftcell">
- <xsl:value-of select="@count" />
- </td>
- <td class="rightcell">
- <xsl:value-of select="@referer" />
- </td>
- </tr>
- </xsl:for-each>
- </table>
-
+
+ <div class="videostuff">
+ <span class="protip-embed">
+ To embed the video on another web page, use the following HTML code:
+ <br />
+ <span class="code">
+ <iframe src="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/embed=true')" />" />
+ </span>
+ </span>
+ </div>
+
<xsl:call-template name="comments"/>
<xsl:if test="not(//@username='')">