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

minor fixes

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@189 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2007-11-29 02:27:12 +00:00
parent f0ad4c88a2
commit 9150a3cfc8
4 changed files with 41 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trunk/locale/en-us.xml
View file

@ -114,6 +114,9 @@
<!-- video page -->
<str id="download_video">Download</str>
<str id="megabytes">MB</str>
<str id="edit_video">Edit</str>
<str id="bookmark_video">Bookmark</str>
<str id="license_conditions">License Conditions</str>
<str id="comment_on_video">Flamewar area below. Proceed with caution.</str>
<str id="comment_post">Post</str>

4
trunk/site/main.xml
View file

@ -20,8 +20,8 @@
<str id="page_login-openid">/login.pl?action=openid</str>
<str id="page_logout">/login.pl?action=logout</str>
<str id="page_authors">INSERT LINK TO YOLANDA AUTHORS HERE</str>
<str id="page_license">http://gplv3.fsf.org/agplv3-dd2.html</str>
<str id="page_source-code">http://mister-muffin.de/proj/browser/trunk</str>
<str id="page_license">http://www.fsf.org/licensing/licenses/agpl-3.0.html</str>
<str id="page_source-code">http://yolanda.mister-muffin.de/trac/browser/trunk</str>
<str id="page_register">/register.pl</str>
<str id="page_results">search.pl?query=</str>
<str id="page_upload">/upload.pl</str>

16
trunk/style/default.css
View file

@ -35,9 +35,18 @@ body
div
{
border-width: 0px;
border-style: dashed;
}
div.button-download, div.button-edit, div.button-bookmark
{
display: inline-block;
}
div.footer
{
padding: 0.75em;
}
div.header1
{
color: #525252;
@ -114,11 +123,6 @@ div
padding-right: 20%;
}
div.footer
{
padding: 0.75em;
}
fieldset
{
border-width: 0px;

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

@ -8,7 +8,22 @@
>
<xsl:template name="video">
<h2><xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" /></h2>
<xsl:if test="//@embed!='true'">
<h2>
<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)" />
<xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
<xsl:choose>
<xsl:when test="$hours=0">
(<xsl:value-of select="concat(format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</xsl:when>
<xsl:otherwise>
(<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
</xsl:otherwise>
</xsl:choose>
</h2>
</xsl:if>
<div class="video">
<xsl:choose>
<xsl:when test="//video/@cortado='true'">
@ -88,8 +103,8 @@
</xsl:choose>
</div>
<xsl:if test="not(//@embed='true')">
<div style="display:table-cell">
<xsl:if test="//@embed!='true'">
<div class="button-download">
<a>
<xsl:attribute name="href">
<xsl:value-of select="//video/rdf:RDF/cc:Work/@rdf:about" />
@ -103,62 +118,45 @@
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='download_video']" />
</a>
<br />
(<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='megabytes']" />)
</div>
<div style="display:table-cell">
<div class="button-edit">
<xsl:if test="//@edit='true'">
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/action=edit')" />
</xsl:attribute>
<img src="/images/tango/accessories-text-editor.png" style="border:0;vertical-align:bottom;" />
<img src="/images/tango/accessories-text-editor.png" />
</a>
<br />
<a>
<xsl:attribute name="href">
<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, '/action=edit')" />
</xsl:attribute>
Edit
<xsl:value-of select="$locale_strings[@id='edit_video']" />
</a>
</xsl:if>
</div>
<div style="display:table-cell">
<div class="button-bookmark">
<xsl:if test="//@edit='true'">
<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" style="border:0;vertical-align:bottom;" />
<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>
Bookmark
<xsl:value-of select="$locale_strings[@id='bookmark_video']" />
</a>
</xsl:if>
</div>
<table class="videometadata">
<tr>
<td class="leftcell">
Filesize
</td>
<td class="rightcell">
<xsl:value-of select="format-number(number(//video/@filesize) div 1048576, '0.0#')" /> MB
</td>
</tr>
<tr>
<td class="leftcell">
Duration
</td>
<td class="rightcell">
<xsl:variable name="minutes" select="floor(//video/@duration div 60)" />
<xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
<xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />
</td>
</tr>
<tr>
<td class="leftcell">
Viewcount
@ -241,14 +239,6 @@
</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']" />: