[Librefm-commits] [1676] better placement of conditionals

[Clint Adams]

Revision: 1676
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1676
Author:   clint
Date:     2009-05-16 19:41:35 +0000 (Sat, 16 May 2009)
Log Message:
-----------
better placement of conditionals

Modified Paths:
--------------
    trunk/nixtape/themes/librefm/templates/album.tpl
    trunk/nixtape/themes/librefm/templates/track.tpl

Modified: trunk/nixtape/themes/librefm/templates/album.tpl
===================================================================
--- trunk/nixtape/themes/librefm/templates/album.tpl    2009-05-16 19:39:19 UTC 
(rev 1675)
+++ trunk/nixtape/themes/librefm/templates/album.tpl    2009-05-16 19:41:35 UTC 
(rev 1676)
@@ -16,19 +16,18 @@
                        alt="{$album->name|escape:'html':'UTF-8'}" 
title="{$album->name|escape:'html':'UTF-8'}" width="160" />
        </div>
 
+{if !isset($this_user) || $this_user->anticommercial<>1}
        <div id="purchase-download">
 
        <h2>Purchase this album</h2>
 
-{if !isset($this_user) || $this_user->anticommercial<>1}
        <ul>
        <li><a 
href="http://libre.fm/affliate.php?a={$artist->name}&m={$name}">Amazon 
MP3</a></li>
        <li><a 
href="http://libre.fm/affliate.php?a={$artist->name}&m={$name}&x=1">eMusic</a> 
(<a href="http://www.anrdoezrs.net/9g117dlurlt8CDHDBBH8A9D9IEBA";>Join 
eMusic)</a></li>
         </ul>
+        </div>
 {/if}
 
-        </div>
-
        <hr />
 
 {include file='player.tpl'}

Modified: trunk/nixtape/themes/librefm/templates/track.tpl
===================================================================
--- trunk/nixtape/themes/librefm/templates/track.tpl    2009-05-16 19:39:19 UTC 
(rev 1675)
+++ trunk/nixtape/themes/librefm/templates/track.tpl    2009-05-16 19:41:35 UTC 
(rev 1676)
@@ -4,18 +4,16 @@
 
        <h2 property="dc:title" class="fn" rel="foaf:page" 
rev="foaf:primaryTopic" resource="">{$track->name|escape:'html':'UTF-8'}</h2>
 
-       {if !$track->licenseurl && !$track->license}
+       {if !$track->licenseurl && !$track->license && (!isset($this_user) || 
$this_user->anticommercial<>1)}
 
        <div id="purchase-download">
 
        <h2>Purchase this track</h2>
 
-{if !isset($this_user) || $this_user->anticommercial<>1}
        <ul>
        <li><a 
href="http://libre.fm/affliate.php?a={$track->artist_name}&m={$track->album_name}&t={$track->name}">Amazon
 MP3</a></li>
        <li><a 
href="http://libre.fm/affliate.php?{$track->artist_name}&m={$track->album_name}&t={$track->name}&x=1">eMusic</a>
 (<a href="http://www.anrdoezrs.net/9g117dlurlt8CDHDBBH8A9D9IEBA";>Join 
eMusic)</a></li>
         </ul>
-{/if}
 
         </div>