[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Librefm-commits] [1830] added support
|
From: |
Matt Lee |
|
Subject: |
[Librefm-commits] [1830] added support |
|
Date: |
Sun, 24 May 2009 21:57:51 +0000 |
Revision: 1830
http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1830
Author: mattl
Date: 2009-05-24 21:57:51 +0000 (Sun, 24 May 2009)
Log Message:
-----------
added support
Modified Paths:
--------------
trunk/nixtape/.htaccess
trunk/nixtape/artist.php
trunk/nixtape/themes/librefm/templates/header.tpl
Added Paths:
-----------
trunk/nixtape/popular.php
Modified: trunk/nixtape/.htaccess
===================================================================
--- trunk/nixtape/.htaccess 2009-05-24 21:54:30 UTC (rev 1829)
+++ trunk/nixtape/.htaccess 2009-05-24 21:57:51 UTC (rev 1830)
@@ -16,4 +16,4 @@
RewriteRule ^country/([^/]+)/?$
location.php?country=$1 [B,NC]
RewriteRule ^logout
login.php?action=logout [B,NC]
RewriteRule ^listen listen.php
-RewriteRule ^music
artist.php?popular=true
+RewriteRule ^music popular.php
Modified: trunk/nixtape/artist.php
===================================================================
--- trunk/nixtape/artist.php 2009-05-24 21:54:30 UTC (rev 1829)
+++ trunk/nixtape/artist.php 2009-05-24 21:57:51 UTC (rev 1830)
@@ -26,8 +26,6 @@
require_once('data/Server.php');
require_once('data/TagCloud.php');
-if (!$_GET['popular']) {
-
try {
$artist = new Artist($_GET['artist']);
} catch (exception $e) {
@@ -59,15 +57,4 @@
}
-else {
-
-$aTagCloud = TagCloud::GenerateTagCloud(TagCloud::scrobblesTable(), 'artist');
-if ($aTagCloud) {
- $smarty->assign('tagcloud', $aTagCloud);
-}
-
-$smarty->display("top-artists.tpl");
-
-}
-
?>
Added: trunk/nixtape/popular.php
===================================================================
--- trunk/nixtape/popular.php (rev 0)
+++ trunk/nixtape/popular.php 2009-05-24 21:57:51 UTC (rev 1830)
@@ -0,0 +1,37 @@
+<?php
+
+/* Libre.fm -- a free network service for sharing your music listening habits
+
+ Copyright (C) 2009 Libre.fm Project
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+require_once('database.php');
+require_once('templating.php');
+require_once('data/sanitize.php');
+require_once('data/Server.php');
+require_once('data/TagCloud.php');
+
+$aTagCloud = TagCloud::GenerateTagCloud(TagCloud::scrobblesTable(), 'artist');
+if ($aTagCloud) {
+ $smarty->assign('tagcloud', $aTagCloud);
+}
+
+
+$smarty->display("popular.tpl");
+
+?>
Modified: trunk/nixtape/themes/librefm/templates/header.tpl
===================================================================
--- trunk/nixtape/themes/librefm/templates/header.tpl 2009-05-24 21:54:30 UTC
(rev 1829)
+++ trunk/nixtape/themes/librefm/templates/header.tpl 2009-05-24 21:57:51 UTC
(rev 1830)
@@ -34,8 +34,18 @@
<body typeof="foaf:Document">
-<div id="try-the-alpha"><a href="http://alpha.libre.fm{$this_page}";>This is
the current, live, in-development beta version of the site</a></div>
+<div id="project-links">
+<ul>
+<li><a href="http://libre.fm/";>Libre.fm</a></li>
+<li><a href="http://libre.fm#what/";>What is Libre.fm?</a></li>
+<li><a href="http://libre.fm#why/";>Why use Libre.fm?</a></li>
+<li><a href="http://libre.fm#artists/";>What's in it for artists?</a></li>
+<li><a href="http://libre.fm#users/";>What's in it for users?</a></li>
+</ul>
+
+</div>
+
<div id="hd" role="navigation">
<div class="inner">
<h1 rel="dc:publisher" class="vcard"><a property="foaf:name"
rel="foaf:homepage" href="{$base_url}" class="fn org url">Libre.fm</a></h1>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Librefm-commits] [1830] added support,
Matt Lee <=