Commit 1fd2db2e authored by mattl's avatar mattl

Remove libre.fm branding for generic GNU FM branding

parent ebffc91a
......@@ -12,7 +12,7 @@
</h2>
<div{if $album->image != false} rel="foaf:depiction"{/if}>
<img {if $album->image == false} src="{$base_url}/themes/librefm/images/qm160.png"{else} class="photo" src="{$album->image}"{/if}
<img {if $album->image == false} src="{$base_url}/images/qm160.png"{else} class="photo" src="{$album->image}"{/if}
alt="{$album->name|escape:'html':'UTF-8'}" title="{$album->name|escape:'html':'UTF-8'}" width="160" />
</div>
......
......@@ -10,11 +10,6 @@
<label for="new">{t}Address for the group:{/t}</label><br />
<b>{$base_url}/group/</b><input id="new" name="new" size="12" /></p>
<p>Please remember that Libre.fm is focused on freedom, so try to
create groups that can help that goal. Also be mindful of the power of
words and the importance of framing the issues we discuss and work on
in the best possible terms.</p>
<p>
<input name="group" value="new" type="hidden" />
<input type="submit" value=" {t}Create{/t} " />
......@@ -78,7 +73,7 @@ in the best possible terms.</p>
<h3>Help</h3>
<dl>
<dt id="dfn_avatar_uri">Logo URL</dt>
<dd>{t}The web address for a picture to represent your group on libre.fm. It should
<dd>{t}The web address for a picture to represent your group on. It should
not be more than 80x80 pixels. (64x64 is best.){/t}</dd>
<dt id="dfn_owner">Leader</dt>
......
......@@ -2,13 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
{if !($pagetitle)}
<title>Libre.fm &mdash; {t}discover new music{/t}</title>
{else}
<title>{$pagetitle|escape:'html':'UTF-8'} &mdash; Libre.fm &mdash; {t}discover new music{/t}</title>
{/if}
<link rel="stylesheet" href="http://s.libre.fm/librefm/css/tmp.css?200912281344" type="text/css" />
<script type="text/javascript" src="http://s.libre.fm/librefm/js/js.js?200912281344"></script>
<title>GNU FM</title>
<meta name="author" content="FooCorp catalogue number FOO200 and contributors" />
{section name=i loop=$extra_head_links}
<link rel="{$extra_head_links[i].rel|escape:'html':'UTF-8'}" href="{$extra_head_links[i].href|escape:'html':'UTF-8'}" type="{$extra_head_links[i].type|escape:'html':'UTF-8'}" title="{$extra_head_links[i].title|escape:'html':'UTF-8'}" />
......@@ -16,18 +10,4 @@
</head>
<body>
<div id="doc3" class="yui-t7">
<div id="hd">
{if ($logged_in)}
<p><a href="{$this_user->getURL()}">{$this_user->name}</a>'s</p>
{/if}
<h1><a href="{$base_url}">Libre.fm</a></h1>
</div>
<div id="bd">
<div class="yui-ge">
<div class="yui-u first">
<h1><a href="/">GNU FM</a></h1>
......@@ -14,7 +14,7 @@
<form action='' method='post'>
<fieldset>
<p>{t escape=no}Do you have an awesome friend you'd like to share <a href='http://libre.fm' rel='bookmark' class='vcard fn org url'>libre.fm</a> with? Just enter his/her email address and we'll sort them out with an invitation code.{/t}</p>
<p>{t escape=no}Do you have an awesome friend you'd like to share with? Just enter his/her email address and we'll sort them out with an invitation code.{/t}</p>
<label for='email'>{t}Invitee's E-mail:{/t}<span>{t}must be valid!{/t}</span></label>
<input id='email' name='email' type='text' value='' />
......
......@@ -13,7 +13,7 @@
{/if}
</script>
{else}
<h3>Listen to 100% libre music right here in your web browser!</h3>
<h3>Listen to music right here in your web browser!</h3>
<p>To get started, simply enter the type of music you'd like to hear
or select one of the common tags below:</p>
......
......@@ -8,9 +8,4 @@
{include file='login-form.tpl'}
</form>
<p>Join us in #libre.fm on irc.freenode.net to help shape
that, or <a
href="http://lists.autonomo.us/mailman/listinfo/libre-fm">join
our mailing list</a> and have your say!</p>
{include file='mini-footer.tpl'}
......@@ -2,7 +2,6 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Libre.fm</title>
<link rel="stylesheet" href="http://s.libre.fm/mini.css" />
<title>GNU FM</title>
</head>
<body>
......@@ -13,7 +13,7 @@
</audio>
<div id="interface">
<div id="trackinfo">
<span id="artistname"></span> - <span id="trackname"></span> <span id="showplaylist"><a href="#" onclick="togglePlaylist()"><img src="{$media_url}/{$default_theme}/img/player/show-playlist.png" alt="Show playlist" title="Show playlist" /></a></span><span id="hideplaylist"><a href="#" onclick="togglePlaylist()"><img src="{$media_url}/{$default_theme}/librefm/img/player/hide-playlist.png" alt="Hide playlist" title="Hide playlist" /></a></span>
<span id="artistname"></span> - <span id="trackname"></span> <span id="showplaylist"><a href="#" onclick="togglePlaylist()"><img src="{$media_url}/{$default_theme}/img/player/show-playlist.png" alt="Show playlist" title="Show playlist" /></a></span><span id="hideplaylist"><a href="#" onclick="togglePlaylist()"><img src="{$media_url}/{$default_theme}/img/player/hide-playlist.png" alt="Hide playlist" title="Hide playlist" /></a></span>
<div id="playlist">
<hr />
<strong><u>{t}Playlist{/t}</u></strong>
......@@ -36,20 +36,3 @@
</div>
</div>
</div>
{if !$track->streamurl}
<p>Sorry, this track doesn't offer you the ability to
<a href="http://freedomdefined.org/">legally share
this song</a>, so we're unable to bring you a
stream/download.</p>
<p>If you feel this is a mistake, please <a href="http://bugs.libre.fm/newticket?summary={$track->name} by {$track->artist_name} is a free track&description=Please update the database/website&component=website-alpha">let us know</a>.</p>
{else}
<p><a href="http://freedomdefined.org/"><img
src="http://freedomdefined.org/upload/b/bf/Mfalzon-freecontent_logo01--wikilogo.png"
alt="Free music" /></a></p>
{/if}
\ No newline at end of file
<playlist version="1" xmlns:lastfm="http://www.audioscrobbler.net/dtd/xspf-lastfm">
<title>{$title}</title>
<creator>libre.fm</creator>
<creator>GNU FM</creator>
<link rel="http://www.last.fm/skipsLeft">9999</link>
<trackList>
......
......@@ -2,7 +2,7 @@
<lfm status="ok">
<playlist version="1" xmlns="http://xspf.org/ns/0/">
<title>{$title}</title>
<creator>libre.fm</creator>
<creator>GNU FM</creator>
<date>{$date}</date>
<link rel="http://www.last.fm/expiry">3600</link>
<trackList>
......@@ -16,7 +16,7 @@
<creator>{$radiotracks[rt].creator|escape:"html":"UTF-8"}</creator>
<duration>{$radiotracks[rt].duration|escape:"html":"UTF-8"}</duration>
<image>{$radiotracks[rt].image|escape:"html":"UTF-8"}</image>
<extension application="http://alpha.libre.fm/">
<extension application="/">
<trackauth>00000</trackauth>
<albumid>00000</albumid>
<artistid>00000</artistid>
......
......@@ -7,14 +7,13 @@
{/if}
{if isset($reg)}
<p>{t}Your request for an invitation has been registered. Thank you for your interest in libre.fm!{/t}</p>
<p>{t}Your request for an invitation has been registered. Thank you for your interest!{/t}</p>
{else}
<div id='invite'>
<form action='' method='post'>
<fieldset>
<p>{t escape=no}<a href='http://libre.fm' rel='bookmark' class='vcard fn org url'>libre.fm</a> is now in alpha. We're slowly adding new users, so if you're interested, type in your email address and you'll receive an invitation in a few days time.{/t}</p>
<label for='email'>{t}Email{/t} <span>{t}must be valid!{/t}</span></label>
<input id='email' name='email' type='text' value='' />
......
......@@ -25,7 +25,7 @@
</dl>
{if $track->licenseurl && $track->license}
<p><a rel=":license" href="{$track->licenseurl}"><img src="{$base_url}/themes/librefm/images/licenses/{$track->license}.png" /></a></p>
<p><a rel=":license" href="{$track->licenseurl}"><img src="{$base_url}/themes/images/licenses/{$track->license}.png" /></a></p>
{/if}
<ul>
......
......@@ -112,7 +112,7 @@
<dd>{t escape=no}This feature looks up your location on <a href='http://www.geonames.org'>geonames</a>. You don't need to do it, but it will allow us find your latitude and longitude so we can add some great location-based features in the future.{/t}</dd>
<dt id='dfn_avatar_uri'>{t}Avatar URL{/t}</dt>
<dd>{t escape=no}The web address for a picture to represent you on libre.fm. It should not be more than 80x80 pixels. (64x64 is best.) If you leave this empty, libre.fm will use <a href='http://gravatar.com'>Gravatar</a> to find an image for you.{/t}</dd>
<dd>{t escape=no}The web address for a picture to represent you. It should not be more than 80x80 pixels. (64x64 is best.) If you leave this empty, we will use <a href='http://gravatar.com'>Gravatar</a> to find an image for you.{/t}</dd>
<dt id='dfn_id'>WebID (FOAF)</dt>
<dd>{t escape=no}A URI that represents you in RDF. See <a href='http://esw.w3.org/topic/WebID'>WebID</a> for details. If you don't know what this is, it's best to leave it blank.{/t}</dd>
......@@ -121,7 +121,7 @@
<dd>{t escape=no}The URL for your micro-blog on a <a href='http://laconi.ca/'>Laconica</a>-powered site such as <a href='http://identi.ca/'>identi.ca</a>.{/t}</dd>
<dt id='dfn_journal_rss'>RSS Feed</dt>
<dd>{t escape=no}An RSS feed which will be used to populate your journal on libre.fm. Defaults to your Laconica RSS feed if you provide your Laconica micro-blog address.{/t}</dd>
<dd>{t escape=no}An RSS feed which will be used to populate your journal. Defaults to your Laconica RSS feed if you provide your Laconica micro-blog address.{/t}</dd>
<dt id='dfn_anticommercial'>Anticommercial</dt>
<dd>{t escape=no}By enabling this option, you will not be shown advertisements or affiliate purchase links.{/t}</dd>
......
......@@ -13,10 +13,6 @@
{/section}
{/if}
<p><small>If this list is looking a little funky, we
apologise... we're working on it! It may appear that we didn't get
your scrobbles, <b>we probably did</b>.</small></p>
<h3>{t plays=$scrobbles|@count}Latest %1 Plays:{/t}</h3>
<ol class="gobbles" about="{$me->id|escape:'html':'UTF-8'}" rev="gob:user">
......
{include file='header.tpl'}
{if ($logged_in)}
<h2 id="txt-this-is-your-dashboard">This is your dashboard.</h2>
<ul>
<li>Have you configured your player to report your music listening habits?</li>
<li>Have you <a href="/listen/">tried our funky in-browser player</a>?</li>
</ul>
<h2><a href="{$this_user->getURL()}">Go to your profile</a> or <a href="{$this_user->getURL()}/stats">view your listening statistics</a>.</h2>
{else}
<ul id="buttons">
<li><a href="/register.php">Sign up now</a></li>
</ul>
{/if}
{include file='footer.tpl'}
You'll need the smarty-gettext package installed (apt-get install smarty-gettext on Debian/Ubuntu)
After changing the translatable strings in the templates run "./update.sh"
After changing translations in the relevant .po files run "./update.sh"
To create a new set of translations for a new locale run "msginit -l en_GB" Where en_GB is replaced by the locale you wish to create.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
tsmarty2c.php ../templates/*.tpl > translatable_strings.c
xgettext translatable_strings.c
mv messages.po nixtape.pot
for langpo in `ls *.po`
do
lang=`echo $langpo | cut -d '.' -f 1`
echo "Updating $lang"
msgmerge -U $langpo nixtape.pot
mkdir -p $lang/LC_MESSAGES/
msgfmt -o $lang/LC_MESSAGES/nixtape.mo $langpo
done
<div id="adbard-librefm">
<!--Ad Bard advertisement snippet, begin -->
<div style="background-color: white; position: absolute; width: 140px; height: 205px; top: 21px; left: 22px; border: 2px solid white;"><script type='text/javascript'>
var ab_h = '4bcaab930d3bdfded68fd7be730d7db4';
var ab_s = '55fd9cde6d855a75f9ca43d854272f6b';
</script>
<script type='text/javascript' src='http://cdn1.adbard.net/js/ab1.js'></script>
</div>
<!--Ad Bard, end -->
</div>
</div>
<div class="yui-u">
{include file='menu.tpl'}
<p style="text-align: center;">&nbsp;<!--Ad Bard advertisement snippet, begin -->
<script type='text/javascript'>
var ab_h = '4bcaab930d3bdfded68fd7be730d7db4';
var ab_s = '55fd9cde6d855a75f9ca43d854272f6b';
</script>
<script type='text/javascript' src='http://cdn1.adbard.net/js/ab1.js'></script>
<!--Ad Bard, end --></p>
{include file='popular.html'}
<p><a href="http://playogg.org/">Libre.fm is a proud supporter of the Play Ogg campaign</a></p>
<p><b>Libre.fm &mdash; you own your own data.</b></p>
<p><a href="http://libre.fm/developers/">Developer info</a> | <a href="http://bugs.libre.fm/newticket">Report a bug</a> | <a href="http://bugs.libre.fm/wiki/">Wiki</a> | <a href="http://identi.ca/group/librefm/join">Join our blog</a> | <a href="http://turtle.libre.fm/">Recent tracks</a></p>
</div>
</div>
</div>
<div id="ft">
<hr />
<a style="float: left;" href="http://foocorp.net/"><img src="http://s.libre.fm/foocorp.png" alt="FooCorp" /></a>
<a href="http://foocorp.net/cat.html"><img src="http://s.libre.fm/foo200.png" alt="FOO200" style="float: right;" /></a>
</div>
</div>
</body>
</html>
<ul class="tagcloud">
<li style='font-size:medium'><a href='/artist/Brad+Sucks' title='This artist was played 815 times' rel='tag'>Brad Sucks</a></li>
<li style='font-size:x-large'><a href='/artist/Ehma' title='This artist was played 1483 times' rel='tag'>Ehma</a></li>
<li style='font-size:large'><a href='/artist/Josh+Woodward' title='This artist was played 1278 times' rel='tag'>Josh Woodward</a></li>
<li style='font-size:xx-large'><a href='/artist/Professor+Kliq' title='This artist was played 1858 times' rel='tag'>Professor Kliq</a></li>
<li style='font-size:small'><a href='/artist/Silence' title='This artist was played 452 times' rel='tag'>Silence</a></li>
<li style='font-size:xx-small'><a href='/artist/Torley+on+Piano' title='This artist was played 332 times' rel='tag'>Torley on Piano</a></li>
<li style='font-size:xx-large'><a href='/artist/Tryad' title='This artist was played 1620 times' rel='tag'>Tryad</a></li>
<li style='font-size:small'><a href='/artist/Windpearl' title='This artist was played 397 times' rel='tag'>Windpearl</a></li>
<li style='font-size:large'><a href='/artist/adragante' title='This artist was played 852 times' rel='tag'>adragante</a></li>
<li style='font-size:x-small'><a href='/artist/paniq' title='This artist was played 368 times' rel='tag'>paniq</a></li>
</ul>
\ No newline at end of file
This diff is collapsed.
<ul class="tagcloud">
<li style='font-size:xx-small'><a href='/artist/Abscondo' title='This artist was played 71 times' rel='tag'>Abscondo</a></li>
<li style='font-size:x-large'><a href='/artist/Alexander+Blu' title='This artist was played 280 times' rel='tag'>Alexander Blu</a></li>
<li style='font-size:small'><a href='/artist/Andrea+Barone' title='This artist was played 100 times' rel='tag'>Andrea Barone</a></li>
<li style='font-size:xx-large'><a href='/artist/Brad+Sucks' title='This artist was played 815 times' rel='tag'>Brad Sucks</a></li>
<li style='font-size:x-small'><a href='/artist/Chill+Carrier' title='This artist was played 76 times' rel='tag'>Chill Carrier</a></li>
<li style='font-size:x-small'><a href='/artist/Circa+Vitae' title='This artist was played 76 times' rel='tag'>Circa Vitae</a></li>
<li style='font-size:x-small'><a href='/artist/Daniel+Bautista' title='This artist was played 77 times' rel='tag'>Daniel Bautista</a></li>
<li style='font-size:large'><a href='/artist/Distemper' title='This artist was played 138 times' rel='tag'>Distemper</a></li>
<li style='font-size:large'><a href='/artist/Doc' title='This artist was played 183 times' rel='tag'>Doc</a></li>
<li style='font-size:xx-small'><a href='/artist/DovEporTar' title='This artist was played 70 times' rel='tag'>DovEporTar</a></li>
<li style='font-size:xx-large'><a href='/artist/Ehma' title='This artist was played 1483 times' rel='tag'>Ehma</a></li>
<li style='font-size:x-small'><a href='/artist/Electric+Grocery' title='This artist was played 72 times' rel='tag'>Electric Grocery</a></li>
<li style='font-size:medium'><a href='/artist/En+Busca+Del+Pasto' title='This artist was played 126 times' rel='tag'>En Busca Del Pasto</a></li>
<li style='font-size:medium'><a href='/artist/Eraplee+Noisewall+Orchestra' title='This artist was played 108 times' rel='tag'>Eraplee Noisewall Orchestra</a></li>
<li style='font-size:large'><a href='/artist/Flatlink' title='This artist was played 201 times' rel='tag'>Flatlink</a></li>
<li style='font-size:xx-small'><a href='/artist/Jeff+Wyatt' title='This artist was played 69 times' rel='tag'>Jeff Wyatt</a></li>
<li style='font-size:large'><a href='/artist/Jim+Grayne' title='This artist was played 188 times' rel='tag'>Jim Grayne</a></li>
<li style='font-size:xx-large'><a href='/artist/Josh+Woodward' title='This artist was played 1278 times' rel='tag'>Josh Woodward</a></li>
<li style='font-size:medium'><a href='/artist/Juanitos' title='This artist was played 124 times' rel='tag'>Juanitos</a></li>
<li style='font-size:large'><a href='/artist/KraftiM' title='This artist was played 130 times' rel='tag'>KraftiM</a></li>
<li style='font-size:small'><a href='/artist/Les+Vieilles+Salopes' title='This artist was played 91 times' rel='tag'>Les Vieilles Salopes</a></li>
<li style='font-size:small'><a href='/artist/Mark.Nine' title='This artist was played 95 times' rel='tag'>Mark.Nine</a></li>
<li style='font-size:xx-large'><a href='/artist/Professor+Kliq' title='This artist was played 1858 times' rel='tag'>Professor Kliq</a></li>
<li style='font-size:xx-small'><a href='/artist/Rapha%C3%ABl+Badawi' title='This artist was played 70 times' rel='tag'>Raphaël Badawi</a></li>
<li style='font-size:x-small'><a href='/artist/Revolution+Void' title='This artist was played 75 times' rel='tag'>Revolution Void</a></li>
<li style='font-size:small'><a href='/artist/Richie+Reinholdt' title='This artist was played 88 times' rel='tag'>Richie Reinholdt</a></li>
<li style='font-size:xx-small'><a href='/artist/STEEP' title='This artist was played 67 times' rel='tag'>STEEP</a></li>
<li style='font-size:small'><a href='/artist/Sean+Wright' title='This artist was played 99 times' rel='tag'>Sean Wright</a></li>
<li style='font-size:x-large'><a href='/artist/Silence' title='This artist was played 452 times' rel='tag'>Silence</a></li>
<li style='font-size:x-small'><a href='/artist/Speedsound+' title='This artist was played 81 times' rel='tag'>Speedsound </a></li>
<li style='font-size:small'><a href='/artist/StrangeZero' title='This artist was played 91 times' rel='tag'>StrangeZero</a></li>
<li style='font-size:x-large'><a href='/artist/The+Dada+Weatherman' title='This artist was played 284 times' rel='tag'>The Dada Weatherman</a></li>
<li style='font-size:large'><a href='/artist/The+Liquid+Kitchen' title='This artist was played 178 times' rel='tag'>The Liquid Kitchen</a></li>
<li style='font-size:x-large'><a href='/artist/Torley+on+Piano' title='This artist was played 332 times' rel='tag'>Torley on Piano</a></li>
<li style='font-size:xx-large'><a href='/artist/Tryad' title='This artist was played 1620 times' rel='tag'>Tryad</a></li>
<li style='font-size:x-large'><a href='/artist/Windpearl' title='This artist was played 397 times' rel='tag'>Windpearl</a></li>
<li style='font-size:medium'><a href='/artist/Zeropage' title='This artist was played 129 times' rel='tag'>Zeropage</a></li>
<li style='font-size:xx-large'><a href='/artist/adragante' title='This artist was played 852 times' rel='tag'>adragante</a></li>
<li style='font-size:medium'><a href='/artist/bert+jerred' title='This artist was played 106 times' rel='tag'>bert jerred</a></li>
<li style='font-size:x-large'><a href='/artist/paniq' title='This artist was played 368 times' rel='tag'>paniq</a></li>
</ul>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
{include file='header.tpl'}
{if ($logged_in)}
<h2 id="txt-this-is-your-dashboard">This is your dashboard.</h2>
<ul>
<li>Have you <a href="http://bugs.libre.fm/wiki/Client_Support">configured your player</a> to report your music listening habits?</li>
<li>Have you <a href="/listen/">tried our funky in-browser player</a>?</li>
</ul>
<h2><a href="{$this_user->getURL()}">Go to your profile</a> or <a href="{$this_user->getURL()}/stats">view your listening statistics</a>.</h2>
{else}
<h2><img src="http://s.libre.fm/librefm/img/better-deal.png" alt="A better deal for artists and fans" /></h2>
<h3 style="text-align: center; color #aaa;">Libre.fm allows you to share your listening habits and discover new music.</h3>
<ul id="benefits">
<li>100% indie artists.<ul><li>Libre.fm actively supports the creation of music by independent artists.</li></ul></li>
<li>You own your own listening data.<ul><li>Everything you put into Libre.fm is yours, not ours. Take it away and do cool things!</li></ul></li>
<li>Legally download and share any track.<ul><li>Every song on Libre.fm is made by musicians who <b>want</b> you to share their music.</li></ul></li>
<li>Your privacy, taken care of.<ul><li>Our <a href="http://libre.fm/more.html#privacy">privacy policy</a> is awesome. We don't even log your IP address! Privacy is important.</li></ul></li>
</ul>
<ul id="buttons">
<li><a href="http://alpha.libre.fm/register.php"><img src="http://s.libre.fm/librefm/img/signup-button.png" alt="Sign up now" /></a></li>
</ul>
<h4>That's not all! The code that powers Libre.fm is <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a> &mdash; <a href="http://bzr.savannah.gnu.org/lh/librefm/">take it</a>, run your own site and <a href="http://lists.autonomo.us/mailman/listinfo/libre-fm">join the development community!</a></h4>
{/if}
{include file='footer.tpl'}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment