We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 2cbe85cf authored by mattl's avatar mattl

merging in changes

parents ac5ffd3e a7cfa250
......@@ -9,24 +9,16 @@
{/if}
</div>
<ul id="albums" rel="foaf:made" rev="foaf:maker">
<ul>
{section name=i loop=$albums}
{if $albums[i]->name}
<li about="{$albums[i]->id}" property="dc:title" content="{$albums[i]->name|escape:'html':'UTF-8'}" typeof="mo:Record" class="haudio">
<a rel="foaf:page" href="{$albums[i]->getURL()}">
<span{if $albums[i]->image != false} about="{$albums[i]->id}" rel="foaf:depiction"{/if}>
<img class="album photo" {if $albums[i]->image == false} src="http://s.libre.fm/librefm/img/qm160.png"{else}src="{$albums[i]->image}"{/if}
alt="{$albums[i]->name|escape:'html':'UTF-8'}"
title="{$albums[i]->name|escape:'html':'UTF-8'}" width="160" />
</span>
</a>
</li>
<a rel="foaf:page" href="{$albums[i]->getURL()}">{$albums[i]->name|escape:'html':'UTF-8'}</a>
</li>{/if}
{/section}
</ul>
</div>
<div class="cleaner">&nbsp;</div>
{include file='footer.tpl'}
......@@ -4,6 +4,14 @@
{include file='menu.tpl'}
{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://bugs.libre.fm/newticket">Report a bug</a> | <a href="http://bugs.libre.fm/wiki/">Wiki</a> | <a href="http://turtle.libre.fm/">Recent tracks</a></p>
</div>
</div>
</div>
......@@ -12,9 +20,10 @@
<hr />
<p><a href="http://playogg.org/">Libre.fm is a proud supporter of the Play Ogg campaign</a></p>
<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>
<p>Libre.fm &mdash; you own your own data.</p>
</div>
</div>
......
<!DOCTYPE html>
<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}
......
{include file='header.tpl'}
{include file='mini-header.tpl'}
<h2>Login</h2>
......@@ -13,4 +13,4 @@
href="http://lists.autonomo.us/mailman/listinfo/libre-fm">join
our mailing list</a> and have your say!</p>
{include file='footer.tpl'}
{include file='mini-footer.tpl'}
<p><a href="/">back to site</a> | <a href="/register.php">Register</a> | <a href="/login.php">Login</a> | <a href="/reset.php">Lost password</a></p>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<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" />
</head>
<body>
{include file='header.tpl'}
{include file='mini-header.tpl'}
{if isset($activated)}
<h3>Your account has been activated! You may now <a href="/login.php">login!</a></h3>
<h2>You're in!</h2>
<p>Your account has been activated! You may now <a href="/login.php">login!</a></p>
{elseif isset($registered) }
<h2><img src="http://s.libre.fm/librefm/img/check-mail.png" alt="Go! Go! Go! Check your email now" /></h2>
<h2>Go! Go! Go! Check your email now</h2>
<h3>{t}Please follow the link in your email to activate your account!{/t}</h3>
<p>{t}Please follow the link in your email to activate your account!{/t}</p>
{else}
<h2><img src="http://s.libre.fm/librefm/img/look-awesome.png" alt="You look awesome today by the way" /></h2>
<h2>You look awesome today, by the way</h2>
{if isset($errors) }
<p id='errors'>{$errors}</p>
......@@ -21,19 +23,25 @@
<form action='' method='post'>
<fieldset>
<div><label for='username'>{t}Your username:{/t}<span>{t}(no more than 16 chars.){/t}</span></label>
<input id='username' name='username' type='text' value='{$username}' maxlength='16' /></div>
<h3><label for='username'>{t}Your username:{/t}</label></h3>
<p><small>{t}No more than 16 characters, please.{/t}</small></p>
<div><input id='username' name='username' type='text' value='{$username}' maxlength='16' size='16' /></div>
<h3>
<label for='password'>{t}Your password:{/t}</label></h3>
<p><small>{t}Try and make it hard to guess! Don't use the same password for everything!{/t}</small></p>
<div><input id='password' name='password' type='password' value=''/></div>
<div>
<label for='password'>{t}Your password:{/t}<span>{t}(make it hard to guess){/t}</span></label>
<input id='password' name='password' type='password' value=''/></div>
<h3>
<label for='password-repeat'>{t}Your password again{/t}</label></h3>
<p><small>Who said repeating yourself was a bad thing?</small></p>
<div><input id='password-repeat' name='password-repeat' type='password' value=''/></div>
<div>
<label for='password-repeat'>{t}Your password again{/t}<span>{t}(you should repeat it.){/t}</span></label>
<input id='password-repeat' name='password-repeat' type='password' value=''/></div>
<h3><label for='email'>{t}Your e-mail:{/t}</label></h3>
<p><small>We're going to email you here to confirm this account.</small></p>
<div><input id='email' name='email' type='text' value='{$email}' maxlength='64' /></div>
<div><label for='email'>{t}Your e-mail:{/t}<span>{t}(must be valid!){/t}</span></label>
<input id='email' name='email' type='text' value='{$email}' maxlength='64' /></div>
<p><label><input type="checkbox" name="foo-check" /> I read this form carefully, and double-checked my email address first, honest.</label></p>
</fieldset>
......@@ -41,7 +49,7 @@
</form>
<h3 class="disclaimer">{t}We won't sell, swap or give away your email address. You can optionally include personal data on your profile, which is displayed publicly.{/t}</h3>
<p><small>{t}We won't sell, swap or give away your email address. You can optionally include personal data on your profile, which is displayed publicly.{/t}</small></p>
{/if}
{include file='footer.tpl'}
{include file='mini-footer.tpl'}
{include file='header.tpl'}
{include file='mini-header.tpl'}
<h2>{t}Reset my password{/t}</h2>
......@@ -13,13 +13,16 @@
{else}
<div id='invite'>
<p>Enter your email address and we'll email you a link to reset your
password. All passwords are encrypted in our database.</p>
<form action="{$base_url}/reset.php" method='post'>
<fieldset>
<label for='username'>{t}Username{/t}</span></label>
<input id='username' name='user' type='text' value='' />
<h3><label for='username'>{t}Username{/t}</span></label></h3>
<div><input id='username' name='user' type='text' value='' /></div>
<input type='submit' name='recover' value='{t}Reset my password!{/t}'/>
<p><input type='submit' name='recover' value='{t}Reset my password!{/t}'/></p>
</fieldset>
</form>
......@@ -27,4 +30,4 @@
{/if}
{include file='footer.tpl'}
{include file='mini-footer.tpl'}
......@@ -12,13 +12,24 @@
{else}
<h2 id="txt-a-lot-more-fun-if-youre-logged-in">A lot more fun if you're logged in.</h2>
<h2><img src="http://s.libre.fm/librefm/img/better-deal.png" alt="A better deal for artists and fans" /></h2>
<form action="{$base_url}/login.php" method="post">
{include file='login-form.tpl'}
</form>
<h3 style="text-align: center; color #aaa;">Libre.fm allows you to share your listening habits and discover new music.</h3>
<p>No account? No problem, <a href="/register.php">sign up now</a>.</p>
<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}
......
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