# HG changeset patch
# User Bob Farrell <robertanthonyfarrell@gmail.com>
# Date 1311975847 -3600
# Branch new-release-july-2011
# Node ID 43aaddc4245f5990e94ea2b65387593b07f5a87d
# Parent  8b5ce16f075f7d519c437a72659acd02df8a9a1d
# Parent  6a328136a9ca56492be365ce21da748ccbd2fae0
merge

diff -r 8b5ce16f075f7d519c437a72659acd02df8a9a1d -r 43aaddc4245f5990e94ea2b65387593b07f5a87d soundbush/public/css/base.css
--- a/soundbush/public/css/base.css	Fri Jul 29 22:12:29 2011 +0100
+++ b/soundbush/public/css/base.css	Fri Jul 29 22:44:07 2011 +0100
@@ -180,6 +180,7 @@
 
 div.track-box h3.date, span.date {
   color: #999;
+  font-size: 14px;
 }
 
 div.headerplayer {
diff -r 8b5ce16f075f7d519c437a72659acd02df8a9a1d -r 43aaddc4245f5990e94ea2b65387593b07f5a87d soundbush/public/js/main.js
--- a/soundbush/public/js/main.js	Fri Jul 29 22:12:29 2011 +0100
+++ b/soundbush/public/js/main.js	Fri Jul 29 22:44:07 2011 +0100
@@ -308,13 +308,16 @@
         function () {
             $("#artist-description").css("height", "auto");
             $(this).text("Show less");
+            return false;
         },
         function () {
             $("#artist-description").css("height", "100px");
             $(this).text("Show more");
+            return false;
         });
 
     $("#contact-submit").button();
+
     $("#contact-artist").click(function () {
         $("#contact-dialog").dialog({
             resizable: false,
diff -r 8b5ce16f075f7d519c437a72659acd02df8a9a1d -r 43aaddc4245f5990e94ea2b65387593b07f5a87d soundbush/templates/artist.mako
--- a/soundbush/templates/artist.mako	Fri Jul 29 22:12:29 2011 +0100
+++ b/soundbush/templates/artist.mako	Fri Jul 29 22:44:07 2011 +0100
@@ -79,19 +79,14 @@
 %for i, track in enumerate(c.tracks):
         <%owner = c.user and c.user.id == track.author.id%>
         <div class="track-box">
-        <table width="100%">
-            <tr>
-                <td style="padding: 0">
-                    <h2>${c.htmlify(track.title)}</h2>
-                </td>
-                %if owner:
-                <td style="padding: 0">
-                    <button class="edit-track-button">Edit</button>
-                    <button class="delete-track-button">Delete</button>
-                </td>
-                %endif
-            </tr>
-        </table>
+
+        %if owner:
+            <button style="float: right" class="delete-track-button">Delete</button>
+            <button style="float: right; margin-right: 5px;" class="edit-track-button">Edit</button>
+        %endif
+
+            <h3 class="date">${track.tstamp.strftime('%c')}</h3>
+            <h2>${c.htmlify(track.title)}</h2>
 
         <table class="play-links">
         <tr>
@@ -112,7 +107,7 @@
 
             <td>
                 <h2>
-                 |Share
+                 |<span style="color: #999">Share</span>
                 <a href="${c.url.facebook(track)}">
                     <img title="Facebook" src="${c.static}/img/icons/facebook.png"/></a>
                 <a href="${c.url.twitter(track)}">
@@ -124,7 +119,6 @@
 
         <h3 class="count">Plays <i>${track.listens}</i>
         Downloads <i>${track.downloads}</i></h3>
-        <h3 class="date">${track.tstamp.strftime('%c')}</h3>
         <p>${c.htmlify(track.description)}</p>
         <div class="commentlinks">
             <div class="commentlinkcontainer">