diff --git a/trunk/images/logo-big.png b/trunk/images/logo-big.png
index 62d1a2e..6da4274 100644
Binary files a/trunk/images/logo-big.png and b/trunk/images/logo-big.png differ
diff --git a/trunk/images/tango/bookmark-delete.png b/trunk/images/tango/bookmark-delete.png
deleted file mode 100644
index 6c783f2..0000000
Binary files a/trunk/images/tango/bookmark-delete.png and /dev/null differ
diff --git a/trunk/images/tango/bookmark-delete.svg b/trunk/images/tango/bookmark-delete.svg
deleted file mode 100644
index b48145a..0000000
--- a/trunk/images/tango/bookmark-delete.svg
+++ /dev/null
@@ -1,1257 +0,0 @@
-
-
-
diff --git a/trunk/images/tango/bookmark-new.png b/trunk/images/tango/bookmark-new.png
deleted file mode 100644
index c67fbb8..0000000
Binary files a/trunk/images/tango/bookmark-new.png and /dev/null differ
diff --git a/trunk/images/tango/bookmark.png b/trunk/images/tango/bookmark.png
deleted file mode 100644
index 5108442..0000000
Binary files a/trunk/images/tango/bookmark.png and /dev/null differ
diff --git a/trunk/images/tango/bookmark.svg b/trunk/images/tango/bookmark.svg
deleted file mode 100644
index efc5e18..0000000
--- a/trunk/images/tango/bookmark.svg
+++ /dev/null
@@ -1,470 +0,0 @@
-
-
-
diff --git a/trunk/images/tango/mail-mark-junk.png b/trunk/images/tango/mail-mark-junk.png
new file mode 100644
index 0000000..0af3006
Binary files /dev/null and b/trunk/images/tango/mail-mark-junk.png differ
diff --git a/trunk/images/tango/video-x-generic.png b/trunk/images/tango/video-x-generic.png
deleted file mode 100644
index c0d079a..0000000
Binary files a/trunk/images/tango/video-x-generic.png and /dev/null differ
diff --git a/trunk/images/yolanda.svg b/trunk/images/yolanda.svg
index 18f8097..cc724cb 100644
--- a/trunk/images/yolanda.svg
+++ b/trunk/images/yolanda.svg
@@ -15,7 +15,7 @@
sodipodi:version="0.32"
inkscape:version="0.45.1"
version="1.0"
- sodipodi:docbase="/var/www/yolanda/images"
+ sodipodi:docbase="/home/nils/src/yolanda/images"
sodipodi:docname="yolanda.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:export-filename="/var/www/yolanda/images/yolanda-big.png"
@@ -117,18 +117,18 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="2.8"
- inkscape:cx="289.32894"
- inkscape:cy="34.298445"
+ inkscape:cx="127.90037"
+ inkscape:cy="36.977016"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:object-bbox="false"
inkscape:object-points="false"
inkscape:object-paths="false"
inkscape:object-nodes="false"
- inkscape:window-width="1920"
- inkscape:window-height="1130"
- inkscape:window-x="0"
- inkscape:window-y="25"
+ inkscape:window-width="1157"
+ inkscape:window-height="638"
+ inkscape:window-x="69"
+ inkscape:window-y="75"
width="320px"
height="100px" />
login with OpenID
upload video
- bookmarks
settings details
logged in as
@@ -150,11 +149,11 @@
download
+ mark as junk
+ edit
MB
use browser plugin
use java applet
- edit
- bookmark
license conditions
To embed the video on another web page, use the following HTML code:
@@ -166,15 +165,15 @@
title
author
- subject
+ keywords
description
uploader
contributor
- date
+ upload date
source
language
coverage
- righs holder
+ rights holder
license
duration
@@ -188,7 +187,9 @@
-
+
+
+
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 5e17971..717643c 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -7,7 +7,6 @@ a
{
color: #3f3fff;
text-decoration: none;
- white-space: nowrap;
}
a:focus
@@ -42,13 +41,18 @@ div
border-width: 0px;
}
- div.button-download, div.button-edit, div.button-bookmark
+ div.button-download,
+ div.button-edit,
+ div.button-junk
{
- display: inline-block;
- margin: 0.5em;
+ display: inline-block;
+ margin: 0.5em;
+ vertical-align: top;
}
- div.button-download img, div.button-edit img, div.button-bookmark img
+ div.button-download img,
+ div.button-edit img,
+ div.button-junk img
{
margin: 0.5em;
}
@@ -65,7 +69,6 @@ div
div.comments
{
- display: none;
}
div.footer
@@ -91,7 +94,10 @@ div
vertical-align: bottom;
}
- div.loginform, div.registerform, div.uploadform, div.settingsform
+ div.loginform,
+ div.registerform,
+ div.settingsform,
+ div.uploadform
{
line-height: 2.5em;
margin: 1.5em;
@@ -119,8 +125,8 @@ div
div.messagebox img
{
margin: 0.75em;
- vertical-align: middle;
overflow: visible;
+ vertical-align: middle;
}
div.page-number
@@ -137,8 +143,8 @@ div
{
display: inline-block;
margin: 0.75em;
- width: 160px;
overflow: visible;
+ vertical-align: top;
}
div.result img
@@ -178,9 +184,15 @@ div
padding: 0.75em;
}
+ div.video
+ {
+ display: inline-block;
+ margin-bottom: 0.5em;
+ }
+
div.videoccdata
{
- margin: 1.5em;
+ margin: 0.75em;
}
div.videoccdata img
@@ -191,15 +203,21 @@ div
margin-top: 0.5em;
}
-div.videostuff
-{
-}
+ div.video-metadata
+ {
+ display: inline-block;
+ line-height: 1.5em;
+ margin-left: 1.5em;
+ text-align: left;
+ vertical-align: top;
+ width: 256px;
+ }
-div.videotitle
-{
- font-size: 1.5em;
- margin-bottom: 0.5em;
-}
+ div.videotitle
+ {
+ font-size: 1.5em;
+ margin-bottom: 0.5em;
+ }
fieldset
{
@@ -224,12 +242,6 @@ img
border-width: 0;
}
- img.openid-icon
- {
- padding-left: 0.2em;
- vertical-align: text-top;
- }
-
img.logo-big
{
padding-bottom: 0.5em;
@@ -239,6 +251,12 @@ img
{
}
+ img.openid-icon
+ {
+ padding-left: 0.2em;
+ vertical-align: text-top;
+ }
+
span.code
{
font-family: monospace;
@@ -250,11 +268,7 @@ span.heading
font-size: 1.5em;
}
-span.instruction
-{
- color: #606060;
-}
-
+span.instruction,
span.protip
{
color: #606060;
@@ -270,31 +284,34 @@ span.protip:before
content: "( ";
}
-table.results
+table.metadata,
+table.metadata-upload
{
- display: inline;
+ border-width: 0px;
+ border-collapse: collapse;
+ width: 100%;
}
-table.videometadata
-{
- border-width: 0px;
- width: 100%;
-}
-
- table.videometadata tr td.leftcell
+ table.metadata td.metadata-content,
+ table.metadata td.metadata-title,
+ table.metadata-upload td.metadata-content
{
- color: #606060;
- text-align: right;
- width: 50%;
+ text-align: left;
+ width: 50%;
}
- table.videometadata tr td.rightcell
+ table.metadata td.metadata-title
{
- text-align: left;
- width: 50%;
+ width: 40%;
}
-td
+ table.metadata-upload td.metadata-title
+ {
+ text-align: right;
+ width: 50%;
+ }
+
+td.metadata-title
{
- vertical-align: top;
-}
+ color: #606060;
+}
\ No newline at end of file
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 481133d..b6c59ae 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -79,7 +79,7 @@
-
+
@@ -91,6 +91,20 @@
+
+
+
+
+
+
+
+
+ &pagesize=99999
+ &page=1
+ &xslt=rss
+
+
+
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index e000e73..c71889d 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -530,28 +530,28 @@
</xsl:attribute>
</input>
- <table class="videometadata">
+ <table class="metadata-upload">
<tr>
- <td class="leftcell">
+ <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Title']" />:
</td>
- <td class="rightcell">
+ <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Title" />
</td>
</tr>
<tr>
- <td class="leftcell">
+ <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Subject']" />:
</td>
- <td class="rightcell">
+ <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Subject" />
</td>
</tr>
<tr>
- <td class="leftcell">
+ <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Description']" />:
</td>
- <td class="rightcell">
+ <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Description" />
</td>
</tr>
@@ -563,36 +563,36 @@
</xsl:attribute>
</input>
- <table class="videometadata">
+ <table class="metadata-upload">
<tr>
- <td class="leftcell">
+ <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Creator']" />:
</td>
- <td class="rightcell">
+ <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Creator" />
</td>
</tr>
<tr>
- <td class="leftcell">
+ <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Source']" />:
</td>
- <td class="rightcell">
+ <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Source" />
</td>
</tr>
<tr>
- <td class="leftcell">
+ <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Language']" />:
</td>
- <td class="rightcell">
+ <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Language" />
</td>
</tr>
<tr>
- <td class="leftcell">
+ <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Coverage']" />:
</td>
- <td class="rightcell">
+ <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Coverage" />
</td>
</tr>
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index fccdfd0..768c9f1 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -8,8 +8,8 @@
>
<xsl:template name="video">
- <xsl:if test="not(//@embed='true')">
- <br />
+
+ <xsl:if test="not(//@embed='true')">
<div class="videotitle">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
<xsl:variable name="minutes" select="floor(//video/@duration div 60)" />
@@ -25,6 +25,7 @@
</xsl:choose>
</div>
</xsl:if>
+
<div class="video">
<xsl:choose>
<xsl:when test="//video/@cortado='true'">
@@ -116,6 +117,10 @@
</xsl:if>
<xsl:if test="not(//@embed='true')">
+
+ <xsl:call-template name="videometadata"/>
+ <br />
+
<div class="button-download">
<a>
<xsl:attribute name="href">
@@ -133,6 +138,26 @@
<br />
(<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" /> <xsl:value-of select="$locale_strings[@id='megabytes']" />)
</div>
+
+<!--
+not implemented right now
+
+ <div class="button-junk">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'action=junk')" />
+ </xsl:attribute>
+ <img src="/images/tango/mail-mark-junk.png" />
+ </a>
+ <br />
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'action=junk')" />
+ </xsl:attribute>
+ <xsl:value-of select="$locale_strings[@id='junk_video']" />
+ </a>
+ </div>
+
<div class="button-edit">
<xsl:if test="//@edit='true'">
<a>
@@ -150,67 +175,10 @@
</a>
</xsl:if>
</div>
- <div class="button-bookmark">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'action=bookmark')" />
- </xsl:attribute>
- <img src="/images/tango/bookmark-new.png" />
- </a>
- <br />
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'action=bookmark')" />
- </xsl:attribute>
- <xsl:value-of select="$locale_strings[@id='bookmark_video']" />
- </a>
- </div>
+-->
<xsl:call-template name="cclicense"/>
- <table class="videometadata">
- <tr>
- <td class="leftcell">
- <xsl:value-of select="$locale_strings[@id='DC.Creator']" />:
- </td>
- <td class="rightcell">
- <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.Description']" />:
- </td>
- <td class="rightcell">
- <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.Date']" />:
- </td>
- <td class="rightcell">
- <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:date" />
- </td>
- </tr>
- <tr>
- <td class="leftcell">
- <xsl:value-of select="$locale_strings[@id='DC.Source']" />:
- </td>
- <td class="rightcell">
- <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:source" />
- </td>
- </tr>
- <tr>
- <td class="leftcell">
- <xsl:value-of select="$locale_strings[@id='DC.Rights']" />:
- </td>
- <td class="rightcell">
- <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:rights" />
- </td>
- </tr>
- </table>
-
<div class="videostuff">
<span class="protip-embed">
<xsl:value-of select="$locale_strings[@id='protip_embed']" />
@@ -225,27 +193,13 @@
</span>
</div>
+<!--
+ too ugly right now
+
<xsl:call-template name="comments"/>
+ <xsl:call-template name="commentform"/>
+-->
- <xsl:if test="not(//@username='')">
- <div class="commentform">
- <form method="post">
- <xsl:attribute name="action">
- <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" />
- </xsl:attribute>
- <fieldset>
- <br />
- <textarea name="comment" cols="30" rows="3" />
- <br />
- <input type="submit" name="send">
- <xsl:attribute name="value">
- <xsl:value-of select="$locale_strings[@id='comment_post']" />
- </xsl:attribute>
- </input>
- </fieldset>
- </form>
- </div>
- </xsl:if>
</xsl:if>
</xsl:template>
@@ -272,6 +226,30 @@
</xsl:template>
+<xsl:template name="commentform">
+
+ <xsl:if test="not(//@username='')">
+ <div class="commentform">
+ <form method="post">
+ <xsl:attribute name="action">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" />
+ </xsl:attribute>
+ <fieldset>
+ <br />
+ <textarea name="comment" cols="30" rows="3" />
+ <br />
+ <input type="submit" name="send">
+ <xsl:attribute name="value">
+ <xsl:value-of select="$locale_strings[@id='comment_post']" />
+ </xsl:attribute>
+ </input>
+ </fieldset>
+ </form>
+ </div>
+ </xsl:if>
+
+</xsl:template>
+
<xsl:template name="cclicense">
<div class="videoccdata">
@@ -336,4 +314,93 @@
</xsl:template>
+<xsl:template name="videometadata">
+
+ <div class="video-metadata">
+
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:description" />
+
+ <hr />
+
+ <table class="metadata">
+
+ <tr>
+ <td class="metadata-title">
+ <xsl:value-of select="$locale_strings[@id='DC.Creator']" />:
+ </td>
+ <td class="metadata-content">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:creator" />
+ </td>
+ </tr>
+
+<!--
+ dc:contributor is not in upload interface
+
+ <tr>
+ <td class="metadata-title">
+ <xsl:value-of select="$locale_strings[@id='DC.Contributor']" />:
+ </td>
+ <td class="metadata-content">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:contributor" />
+ </td>
+ </tr>
+-->
+
+ <tr>
+ <td class="metadata-title">
+ <xsl:value-of select="$locale_strings[@id='DC.Coverage']" />:
+ </td>
+ <td class="metadata-content">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:coverage" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="metadata-title">
+ <xsl:value-of select="$locale_strings[@id='DC.Rights']" />:
+ </td>
+ <td class="metadata-content">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:rights" />
+ </td>
+ </tr>
+
+ </table>
+
+ <hr />
+
+ <table class="metadata">
+
+ <tr>
+ <td class="metadata-title">
+ <xsl:value-of select="$locale_strings[@id='DC.Publisher']" />:
+ </td>
+ <td class="metadata-content">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:publisher" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="metadata-title">
+ <xsl:value-of select="$locale_strings[@id='DC.Date']" />:
+ </td>
+ <td class="metadata-content">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:date" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="metadata-title">
+ <xsl:value-of select="$locale_strings[@id='DC.Source']" />:
+ </td>
+ <td class="metadata-content">
+ <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:source" />
+ </td>
+ </tr>
+
+ </table>
+
+ </div>
+
+</xsl:template>
+
</xsl:stylesheet>