# HG changeset patch
# User Bob Farrell <robertanthonyfarrell@gmail.com>
# Date 1311968110 -3600
# Branch single-column-redesign
# Node ID 28c0a6721fcd70c73298cc1751aad30e62291843
# Parent  af4a1c9c869672ce01506b5cf745b0f1dd5c1d5e
begin modifications of artist description area - need to close this branch and re-fork further up as we're going to need newer jquery features from edit-delete branch ...

diff -r af4a1c9c869672ce01506b5cf745b0f1dd5c1d5e -r 28c0a6721fcd70c73298cc1751aad30e62291843 soundbush/public/css/base.css
--- a/soundbush/public/css/base.css	Thu Jul 28 15:29:48 2011 +0100
+++ b/soundbush/public/css/base.css	Fri Jul 29 20:35:10 2011 +0100
@@ -458,3 +458,20 @@
   background-color: #990033;
   color: #fff;
 }
+
+button.edit-track-button, button.delete-track-button {
+  visibility: hidden;
+}
+
+a.edit-track-button div {
+  height: 32px;
+  width: 32px;
+  background-image: url(../img/edit.png);
+}
+
+a.delete-track-button div {
+  height: 32px;
+  width: 32px;
+  margin: 0 7px;
+  background-image: url(../img/delete.png);
+}
diff -r af4a1c9c869672ce01506b5cf745b0f1dd5c1d5e -r 28c0a6721fcd70c73298cc1751aad30e62291843 soundbush/public/css/reset.css
--- a/soundbush/public/css/reset.css	Thu Jul 28 15:29:48 2011 +0100
+++ b/soundbush/public/css/reset.css	Fri Jul 29 20:35:10 2011 +0100
@@ -15,6 +15,10 @@
   text-indent: 0
 }
 
+table {
+  border-collapse: collapse;
+}
+
 address {
   font-style: normal
 }
diff -r af4a1c9c869672ce01506b5cf745b0f1dd5c1d5e -r 28c0a6721fcd70c73298cc1751aad30e62291843 soundbush/public/js/main.js
--- a/soundbush/public/js/main.js	Thu Jul 28 15:29:48 2011 +0100
+++ b/soundbush/public/js/main.js	Fri Jul 29 20:35:10 2011 +0100
@@ -264,6 +264,43 @@
     SB.addPlayEvents(SB.tracks);
 
     SB.hideInfoMessage();
+
+    $("button.delete-track-button", "#maintext").button(
+        {icons: {primary: "ui-icon-closethick"}});
+
+    $("button.edit-track-button", "#maintext").button(
+        {icons: {primary: "ui-icon-pencil"}});
+
+    $("div.track-box", "#maintext"
+        ).hover(function () {
+                    $(this).find("button.delete-track-button, button.edit-track-button"
+                        ).css("visibility", "visible");
+                },
+                function () {
+                    $(this).find("button.delete-track-button, button.edit-track-button"
+                        ).css("visibility", "hidden");
+                });
+    $("button.delete-track-button", "#maintext"
+        ).click(
+        function () {
+            var that = this;
+            $("#delete-confirm-dialog").dialog({
+                resizable: false,
+                height: 200,
+                title: "Delete",
+                modal: true,
+                buttons: [
+                    {
+                     text: "Yes",
+                     click: function () { $(this).dialog("close"); console.log(that); }
+                    },
+                    {
+                     text: "No",
+                     click: function () { $(this).dialog("close"); }
+                    }]
+
+        });
+    });
 };
 
 $(document).ready(function () {
diff -r af4a1c9c869672ce01506b5cf745b0f1dd5c1d5e -r 28c0a6721fcd70c73298cc1751aad30e62291843 soundbush/templates/artist.mako
--- a/soundbush/templates/artist.mako	Thu Jul 28 15:29:48 2011 +0100
+++ b/soundbush/templates/artist.mako	Fri Jul 29 20:35:10 2011 +0100
@@ -46,7 +46,11 @@
     <h3>${c.htmlify(c.artist.displayname)}
         <a class="rsslink" href="${c.urlbase}/_artist/rss/${c.artist.id}"><img
         class="rsslink" src="${c.static}/img/feed-icon-14x14.png"/></a></h3>
-    <p>${c.htmlify(c.artist.description)}</p>
+    <button id="contact-artist">Contact</button>
+    <div id="artist-description"><p>${c.htmlify(c.artist.description)}</p></div>
+
+    <a href="#" id="read-more">Read More</a>
+
     </td>
 
     <td valign="top" style="padding-left: 10px;">
@@ -67,8 +71,21 @@
     </table>
 
 %for i, track in enumerate(c.tracks):
+        <%owner = c.user and c.user.id == track.author.id%>
         <div class="track-box">
-        <h2>${c.htmlify(track.title)}<br/>
+        <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>
 
         <table class="play-links">
         <tr>
diff -r af4a1c9c869672ce01506b5cf745b0f1dd5c1d5e -r 28c0a6721fcd70c73298cc1751aad30e62291843 soundbush/templates/base.mako
--- a/soundbush/templates/base.mako	Thu Jul 28 15:29:48 2011 +0100
+++ b/soundbush/templates/base.mako	Fri Jul 29 20:35:10 2011 +0100
@@ -5,11 +5,10 @@
 <link rel="image_src" href="${c.url.base_url}/img/logo-icon.png" />
 <link rel="stylesheet" type="text/css" href="${c.static}/css/reset.css">
 <link rel="stylesheet" type="text/css" href="${c.static}/css/base.css">
-<link rel="stylesheet" type="text/css" href="${c.static}/css/jquery-ui-1.7.2.custom.css">
+<link rel="stylesheet" type="text/css" href="${c.static}/css/jquery-ui-1.8.14.custom.css">
 <script type="text/javascript" src="${c.static}/js/json2.js"></script>
-<script type="text/javascript" src="${c.static}/js/jquery/jquery-1.3.2.min.js"></script>
-<script type="text/javascript" src="${c.static}/js/jquery/ui.core.js"></script>
-<script type="text/javascript" src="${c.static}/js/jquery/ui.dialog.js"></script>
+<script type="text/javascript" src="${c.static}/js/jquery/jquery-1.5.1.min.js"></script>
+<script type="text/javascript" src="${c.static}/js/jquery/jquery-ui-1.8.14.custom.min.js"></script>
 <script type="text/javascript" src="${c.static}/js/main.js"></script>
 <script type="text/javascript" language="javascript" src="${c.static}/js/niftyplayer.js"></script>
 <script type="text/javascript" language="javascript" src="${c.static}/js/flashmp3alizerconf.js"></script>
@@ -103,5 +102,6 @@
 </form>
 </div>
 
+<div id="delete-confirm-dialog">Permanently remove this upload?</div>
 </body>
 </html>