josch/yolanda
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added embedded mode - css has to be fixed accordingly

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@177 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
josch 2007-11-07 06:55:02 +00:00
parent 384fcb6467
commit 23f30e8259
5 changed files with 300 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/style/default.css
View file

@ -8,8 +8,8 @@ body
font-family: sans-serif; font-family: sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
min-width: 550px; // 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; margin: 2em; //this has to be zero for embed viewing
text-align: center; text-align: center;
} }

1
trunk/tagcloud.pl
View file

@ -1,7 +1,6 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
use DBI; use DBI;
use Data::Dumper::Simple;
$database = 'yolanda'; $database = 'yolanda';
$dbhost = 'localhost'; $dbhost = 'localhost';

2
trunk/video.pl
View file

@ -71,6 +71,8 @@ elsif($query->url_param('title') or $query->url_param('id'))
} }
elsif($rowcount == 1) elsif($rowcount == 1)
{ {
$page->{'embed'} = $query->param('embed') eq 'true' ? "true" : "false";
#if there was a single result, display the video #if there was a single result, display the video
my ($id, $title, $description, $publisher, $timestamp, $creator, $subject, my ($id, $title, $description, $publisher, $timestamp, $creator, $subject,
$contributor, $source, $language, $coverage, $rights, $license, $contributor, $source, $language, $coverage, $rights, $license,

211
trunk/xsl/xhtml.xsl
View file

@ -78,90 +78,93 @@
<body> <body>
<xsl:choose> <xsl:if test="not(//@embed='true')">
<xsl:when test="string-length(//@username)=0"> <xsl:choose>
<div class="header1"> <xsl:when test="string-length(//@username)=0">
<a> <div class="header1">
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_login']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_login']" />
<xsl:value-of select="$locale_strings[@id='login_to_upload']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='login_to_upload']" />
</div> </a>
<div class="header2"> </div>
<a> <div class="header2">
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_register']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_register']" />
<xsl:value-of select="$locale_strings[@id='register']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='register']" />
<xsl:value-of select="$locale_strings[@id='separator']" /> </a>
<a> <xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_login']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_login']" />
<xsl:value-of select="$locale_strings[@id='login']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='login']" />
<xsl:value-of select="$locale_strings[@id='separator']" /> </a>
<img class="openid-icon" src="/images/openid-icon.png" alt="open id logo" /> <xsl:value-of select="$locale_strings[@id='separator']" />
<a> <img class="openid-icon" src="/images/openid-icon.png" alt="open id logo" />
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_login-openid']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_login-openid']" />
<xsl:value-of select="$locale_strings[@id='login_openid']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='login_openid']" />
</div> </a>
</xsl:when> </div>
<xsl:otherwise> </xsl:when>
<div class="header1"> <xsl:otherwise>
<a> <div class="header1">
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_upload']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_upload']" />
<xsl:value-of select="$locale_strings[@id='upload_video']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='upload_video']" />
<xsl:value-of select="$locale_strings[@id='separator']" /> </a>
<a> <xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_bookmarks']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_bookmarks']" />
<xsl:value-of select="$locale_strings[@id='bookmarks']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='bookmarks']" />
<xsl:value-of select="$locale_strings[@id='separator']" /> </a>
<a> <xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_account']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_account']" />
<xsl:value-of select="$locale_strings[@id='account_details']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='account_details']" />
</div> </a>
<div class="header2"> </div>
<xsl:value-of select="$locale_strings[@id='logged_in_as']" /> <div class="header2">
<a> <xsl:value-of select="$locale_strings[@id='logged_in_as']" />
<xsl:attribute name="href"> <a>
user/<xsl:value-of select="//@username" /> <xsl:attribute name="href">
</xsl:attribute> user/<xsl:value-of select="//@username" />
<xsl:value-of select="//@username" /> </xsl:attribute>
</a> <xsl:value-of select="//@username" />
<xsl:value-of select="$locale_strings[@id='separator']" /> </a>
<a> <xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_logout']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_logout']" />
<xsl:value-of select="$locale_strings[@id='logout']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='logout']" />
</div> </a>
</xsl:otherwise> </div>
</xsl:choose> </xsl:otherwise>
</xsl:choose>
<hr /> <hr />
<xsl:if test="not(//frontpage)"> <xsl:if test="not(//frontpage)">
<xsl:call-template name="searchbar"/> <xsl:call-template name="searchbar"/>
</xsl:if> </xsl:if>
<xsl:if test="//message">
<xsl:call-template name="message"/>
</xsl:if>
<xsl:if test="//message">
<xsl:call-template name="message"/>
</xsl:if> </xsl:if>
<xsl:choose> <xsl:choose>
@ -188,28 +191,30 @@
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
<div class="footer"> <xsl:if test="not(//@embed='true')">
<a> <div class="footer">
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_authors']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_authors']" />
<xsl:value-of select="$locale_strings[@id='authors']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='authors']" />
<xsl:value-of select="$locale_strings[@id='separator']" /> </a>
<a> <xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_license']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_license']" />
<xsl:value-of select="$locale_strings[@id='license']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='license']" />
<xsl:value-of select="$locale_strings[@id='separator']" /> </a>
<a> <xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:attribute name="href"> <a>
<xsl:value-of select="$site_strings[@id='page_source-code']" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="$site_strings[@id='page_source-code']" />
<xsl:value-of select="$locale_strings[@id='source_code']" /> </xsl:attribute>
</a> <xsl:value-of select="$locale_strings[@id='source_code']" />
</div> </a>
</div>
</xsl:if>
</body> </body>

359
trunk/xsl/xhtml/video.xsl
View file

@ -7,10 +7,6 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
> >
<xsl:template name="video">
</xsl:template>
<xsl:template name="video"> <xsl:template name="video">
<div class="video"> <div class="video">
<xsl:choose> <xsl:choose>
@ -47,7 +43,14 @@
<div> <div>
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="concat(//video/rdf:RDF/cc:Work/dc:identifier, '/cortado=false')" /> <xsl:choose>
<xsl:when test="//@embed='true'">
<xsl:value-of select="concat(//video/rdf:RDF/cc:Work/dc:identifier, '/cortado=false&amp;embed=true')" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat(//video/rdf:RDF/cc:Work/dc:identifier, '/cortado=false')" />
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
Watch using Browser Video Plugin Watch using Browser Video Plugin
</a> </a>
@ -68,7 +71,14 @@
<div> <div>
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" /> <xsl:choose>
<xsl:when test="//@embed='true'">
<xsl:value-of select="concat(//video/rdf:RDF/cc:Work/dc:identifier, '/embed=true')" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" />
</xsl:otherwise>
</xsl:choose>
</xsl:attribute> </xsl:attribute>
Watch using Cortado Java Applet Watch using Cortado Java Applet
</a> </a>
@ -77,184 +87,185 @@
</xsl:choose> </xsl:choose>
</div> </div>
<div class="videodownload"> <xsl:if test="not(//@embed='true')">
<a> <div class="videodownload">
<xsl:attribute name="href"> <a>
<xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
<img src="/images/tango/document-save.png" /> </xsl:attribute>
</a> <img src="/images/tango/document-save.png" />
<a> </a>
<xsl:attribute name="href"> <a>
<xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" /> <xsl:attribute name="href">
</xsl:attribute> <xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
</xsl:attribute>
<br />
<xsl:value-of select="$locale_strings[@id='download_video']" />
</a>
</div>
<div class="videoccdata">
<a>
<xsl:attribute name="href">
<xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='license_conditions']" />:
</a>
<br /> <br />
<xsl:value-of select="$locale_strings[@id='download_video']" /> <a>
</a> <xsl:attribute name="href">
</div> <xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
</xsl:attribute>
<!--
unfinished bizness
<xsl:value-of select="@rdf:about" />
<xsl:if test="true()">
<img src="./images/cc/somerights.png" />
</xsl:if>
-->
<xsl:for-each select="//video/rdf:RDF/cc:License/cc:permits">
<!--
since we are talking about digital media here, distribution actually /is/ reproduction
(also, i was too stupid to figure out how to test for both conditions).
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Reproduction'">
<img src="./images/cc/cc-share.png" />
</xsl:if>
-->
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
<img src="./images/cc/cc-share.png" />
</xsl:if>
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
<img src="./images/cc/cc-remix.png" />
</xsl:if>
</xsl:for-each>
<xsl:for-each select="rdf:RDF/cc:License/cc:requires">
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Notice'">
<img src="./images/cc/cc-by.png" />
</xsl:if>
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/ShareAlike'">
<img src="./images/cc/cc-sharealike.png" />
</xsl:if>
<!--
source code doesn't make much sense in video context.
still, this is preserved for potential future use.
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/SourceCode'">
SOURCE
</xsl:if>
-->
</xsl:for-each>
<xsl:for-each select="rdf:RDF/cc:License/cc:prohibits">
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/CommercialUse'">
<img src="./images/cc/cc-noncommercial.png" />
</xsl:if>
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
<img src="./images/cc/cc-noderivatives.png" />
</xsl:if>
</xsl:for-each>
</a>
</div>
<div class="videoccdata"> <table class="videometadata">
<a>
<xsl:attribute name="href">
<xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='license_conditions']" />:
</a>
<br />
<a>
<xsl:attribute name="href">
<xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
</xsl:attribute>
<!--
unfinished bizness
<xsl:value-of select="@rdf:about" />
<xsl:if test="true()">
<img src="./images/cc/somerights.png" />
</xsl:if>
-->
<xsl:for-each select="//video/rdf:RDF/cc:License/cc:permits">
<!--
since we are talking about digital media here, distribution actually /is/ reproduction
(also, i was too stupid to figure out how to test for both conditions).
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Reproduction'">
<img src="./images/cc/cc-share.png" />
</xsl:if>
-->
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
<img src="./images/cc/cc-share.png" />
</xsl:if>
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
<img src="./images/cc/cc-remix.png" />
</xsl:if>
</xsl:for-each>
<xsl:for-each select="rdf:RDF/cc:License/cc:requires">
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Notice'">
<img src="./images/cc/cc-by.png" />
</xsl:if>
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/ShareAlike'">
<img src="./images/cc/cc-sharealike.png" />
</xsl:if>
<!--
source code doesn't make much sense in video context.
still, this is preserved for potential future use.
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/SourceCode'">
SOURCE
</xsl:if>
-->
</xsl:for-each>
<xsl:for-each select="rdf:RDF/cc:License/cc:prohibits">
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/CommercialUse'">
<img src="./images/cc/cc-noncommercial.png" />
</xsl:if>
<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
<img src="./images/cc/cc-noderivatives.png" />
</xsl:if>
</xsl:for-each>
</a>
</div>
<table class="videometadata">
<tr>
<td class="leftcell">
<xsl:value-of select="$locale_strings[@id='DC.Title']" />:
</td>
<td class="rightcell">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
</td>
</tr>
<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.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']" />:
</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.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']" />:
</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>
<table class="referer">
<xsl:for-each select="//referers/referer">
<tr> <tr>
<td class="leftcell"> <td class="leftcell">
<xsl:value-of select="@count" /> <xsl:value-of select="$locale_strings[@id='DC.Title']" />:
</td> </td>
<td class="rightcell"> <td class="rightcell">
<xsl:value-of select="@referer" /> <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
</td> </td>
</tr> </tr>
</xsl:for-each> <tr>
</table> <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.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']" />:
</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.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']" />:
</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>
<xsl:call-template name="comments"/> <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>
<xsl:if test="not(//@username='')"> <xsl:call-template name="comments"/>
<div class="commentform">
<form method="post"> <xsl:if test="not(//@username='')">
<xsl:attribute name="action"> <div class="commentform">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" /> <form method="post">
</xsl:attribute> <xsl:attribute name="action">
<fieldset> <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:identifier" />
<br /> </xsl:attribute>
<textarea name="comment" cols="30" rows="3" /> <fieldset>
<br /> <br />
<input type="submit" name="send"> <textarea name="comment" cols="30" rows="3" />
<xsl:attribute name="value"> <br />
<xsl:value-of select="$locale_strings[@id='comment_post']" /> <input type="submit" name="send">
</xsl:attribute> <xsl:attribute name="value">
</input> <xsl:value-of select="$locale_strings[@id='comment_post']" />
</fieldset> </xsl:attribute>
</form> </input>
</div> </fieldset>
</form>
</div>
</xsl:if>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
<xsl:template name="comments"> <xsl:template name="comments">
@ -268,7 +279,7 @@
<div class="comment"> <div class="comment">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
./user/<xsl:value-of select="@username" /> /user/<xsl:value-of select="@username" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="@username" /> <xsl:value-of select="@username" />
</a>: </a>: