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

added settings changed message, fixed NaN bug from last commit, fixed rights and license in the upload wizard, added message value

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@227 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
josch 2007-12-29 04:51:14 +00:00
parent 2b40d41c1a
commit 37b75b5801
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@
<string id="information_comment_created">Your comment has been submitted.</string> <string id="information_comment_created">Your comment has been submitted.</string>
<string id="information_registered">Your account has been created.</string> <string id="information_registered">Your account has been created.</string>
<string id="information_uploaded">Your file has been uploaded.</string> <string id="information_uploaded">Your file has been uploaded.</string>
<string id="information_settings_changed">Your successfully changed your settings.</string>
<!-- warnings --> <!-- warnings -->
<string id="warning_no_results">There are no results satisfying your query.</string> <string id="warning_no_results">There are no results satisfying your query.</string>

3
trunk/settings.pl
View file

@ -12,6 +12,9 @@ if($userinfo->{'username'})
if($query->param('submit')) if($query->param('submit'))
{ {
$dbh->do(qq{update users set locale = ?, pagesize = ?, cortado = ? where id = ?}, undef, $query->param('locale'), $query->param('pagesize'), $query->param('cortado'), $userinfo->{'id'} ) or die $dbh->errstr; $dbh->do(qq{update users set locale = ?, pagesize = ?, cortado = ? where id = ?}, undef, $query->param('locale'), $query->param('pagesize'), $query->param('cortado'), $userinfo->{'id'} ) or die $dbh->errstr;
$page->{'message'}->{'type'} = "information";
$page->{'message'}->{'text'} = "information_settings_changed";
} }
} }

1
trunk/xsl/xhtml.xsl
View file

@ -335,6 +335,7 @@
</xsl:choose> </xsl:choose>
<xsl:variable name="messagetext" select="/page/message/@text" /> <xsl:variable name="messagetext" select="/page/message/@text" />
<xsl:value-of select="$locale_strings[@id=$messagetext]" /> <xsl:value-of select="$locale_strings[@id=$messagetext]" />
<xsl:value-of select="/page/message/@value" />
<!-- probably one can do this on one line, dunno how --> <!-- probably one can do this on one line, dunno how -->
</div> </div>

10
trunk/xsl/xhtml/upload.xsl
View file

@ -604,20 +604,20 @@
</xsl:attribute> </xsl:attribute>
</input> </input>
<table class="videometadata"> <table class="metadata-upload">
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.Rights']" />: <xsl:value-of select="$locale_strings[@id='DC.Rights']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Rights" /> <xsl:value-of select="//uploadform/@DC.Rights" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="leftcell"> <td class="metadata-title">
<xsl:value-of select="$locale_strings[@id='DC.License']" />: <xsl:value-of select="$locale_strings[@id='DC.License']" />:
</td> </td>
<td class="rightcell"> <td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.License" /> <xsl:value-of select="//uploadform/@DC.License" />
</td> </td>
</tr> </tr>

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

@ -12,8 +12,8 @@
<xsl:if test="not(//@embed='true')"> <xsl:if test="not(//@embed='true')">
<div class="videotitle"> <div class="videotitle">
<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" /> <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
<xsl:variable name="hours" select="floor(@duration div 3600)" /> <xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
<xsl:variable name="minutes" select="floor((@duration - $hours*3600) div 60)" /> <xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
<xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" /> <xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
<xsl:choose> <xsl:choose>
<xsl:when test="$hours=0"> <xsl:when test="$hours=0">