diff options
| author | Antti Ajanki <antti.ajanki@iki.fi> | 2011-07-08 17:33:54 +0300 |
|---|---|---|
| committer | Antti Ajanki <antti.ajanki@iki.fi> | 2011-07-08 17:33:54 +0300 |
| commit | e1257449b0659cf7d0b0e96b0cc8bee277b68af7 (patch) | |
| tree | 673a91d4432577915294ab773aa4a4f96a05aeb7 | |
| parent | 44a6c80d07eacbdb9f0e0f696d7b32435193dc7c (diff) | |
| download | vdr-plugin-webvideo-e1257449b0659cf7d0b0e96b0cc8bee277b68af7.tar.gz vdr-plugin-webvideo-e1257449b0659cf7d0b0e96b0cc8bee277b68af7.tar.bz2 | |
Improved ruutu.fi support
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | templates/www.ruutu.fi/program.xsl | 25 |
2 files changed, 13 insertions, 13 deletions
@@ -244,3 +244,4 @@ Video site modules: - Prefer mplayer over VLC when playing streams - Fixed "Error 501: No active sockets" by properly implementing timeouts +- Improved ruutu.fi support diff --git a/templates/www.ruutu.fi/program.xsl b/templates/www.ruutu.fi/program.xsl index 6487b9e..fd5c9c0 100644 --- a/templates/www.ruutu.fi/program.xsl +++ b/templates/www.ruutu.fi/program.xsl @@ -24,8 +24,17 @@ <link> <label> <xsl:choose> - <xsl:when test="program_episode_name"> - <xsl:value-of select="concat(program_episode_name, ' ', video_datetime_to_use)"/> + <xsl:when test="video_name_to_use != '' and program_episode_name != '' and video_name_to_use != program_episode_name"> + <xsl:value-of select="normalize-space(concat(video_name_to_use, ': ', program_episode_name, ' ', video_datetime_to_use))"/> + </xsl:when> + <xsl:when test="clip_series_name != '' and video_name_to_use != ''"> + <xsl:value-of select="normalize-space(concat(clip_series_name, ': ', video_name_to_use, ' ', video_datetime_to_use))"/> + </xsl:when> + <xsl:when test="video_name_to_use != ''"> + <xsl:value-of select="normalize-space(concat(video_name_to_use, ' ', video_datetime_to_use))"/> + </xsl:when> + <xsl:when test="program_episode_name != ''"> + <xsl:value-of select="normalize-space(concat(program_episode_name, ' ', video_datetime_to_use))"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="title"/> @@ -47,17 +56,7 @@ </xsl:variable> <!-- title --> - <title> - <xsl:choose> - <xsl:when test="/jsondocument/dict/video_episode/list/li[1]/dict/series_name"> - <xsl:value-of select="/jsondocument/dict/video_episode/list/li[1]/dict/series_name"/> - </xsl:when> - <xsl:when test="/jsondocument/dict/video/list/li[1]/dict/clip_series_name"> - <xsl:value-of select="/jsondocument/dict/video/list/li[1]/dict/clip_series_name"/> - </xsl:when> - <xsl:otherwise>Ruutu.fi</xsl:otherwise> - </xsl:choose> - </title> + <title>Ruutu.fi</title> <!-- Video links --> <xsl:if test="not(/jsondocument/dict/video | /jsondocument/dict/video_episode)"> |