From 7bda55c9368b028b79fa19b82e3b2a0e54b39926 Mon Sep 17 00:00:00 2001
From: Tobias Klika <klika@live.at>
Date: Thu, 30 Jun 2011 08:18:10 +0200
Subject: [PATCH] auf gehts, ab gehts!!!

---
 app/views/devise/sessions/_new.html.erb |   2 +-
 app/views/layouts/application.html.haml |   6 +++---
 app/views/search/_show.html.haml        |   6 +-----
 app/views/users/_show.html.haml         |  14 +++++++++-----
 public/images/icons/logout.png          | Bin 0 -> 3708 bytes
 public/javascripts/ajax/requests.js     |   5 ++++-
 public/stylesheets/9minutes.css         |   6 +++++-
 public/stylesheets/sass/_user.scss      |   4 ++++
 8 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 public/images/icons/logout.png

diff --git a/app/views/devise/sessions/_new.html.erb b/app/views/devise/sessions/_new.html.erb
index caf8f7d..76fa6e1 100644
--- a/app/views/devise/sessions/_new.html.erb
+++ b/app/views/devise/sessions/_new.html.erb
@@ -1,6 +1,6 @@
 <div class="tabs tabs_js w03">
   <ul class="nav">
-    <li>signup</li>
+    <li>login</li>
   </ul>
   <div class="content">
     <div class="signuptab">
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a1b5f30..0531a08 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -18,8 +18,6 @@
     #bg_stripe
     #site
       #uuser{:style=>"display:block; color:#ddd;"}
-        - if user_signed_in?
-          =async_link_to "Logout", destroy_user_session_path
       #head
         %h1= link_to image_tag("nine-minutes.png"), "/#!/home"
         = render :partial=>"layouts/player"
@@ -34,7 +32,9 @@
           = form_tag '/search', :method => 'get', :id => "search_form", :remote=>true do
             = text_field_tag 'q', params[:q], :class => "text", :placeholder => "Search here ..."
             = link_to image_tag("icons/search-navi.png", :class=>"button"), "/#!/search"
-        - if !signed_in?
+        - if user_signed_in?
+          %li.login= async_link_to image_tag("icons/logout.png"), destroy_user_session_path
+        - else
           %li.login= async_link_to image_tag("icons/login.png"), new_user_session_path
       %br.clean
       #content
diff --git a/app/views/search/_show.html.haml b/app/views/search/_show.html.haml
index 357b011..a0bc194 100644
--- a/app/views/search/_show.html.haml
+++ b/app/views/search/_show.html.haml
@@ -3,7 +3,6 @@
     %li artists
     %li songs
     %li albums
-    %li youtube
   .content{:q=>"#{@q}"}
     %div
       = render :partial=>"sidebar/index"
@@ -19,7 +18,4 @@
       = render :partial=>"sidebar/index"
       = render :partial=>"search_form"
       %ul.list.albums.andmore{:tile=>"more_albums"}
-        = render :partial=>"artists/more_albums"
-    %div
-      = render :partial=>"sidebar/index"
-      = render :partial=>"search_form"
\ No newline at end of file
+        = render :partial=>"artists/more_albums"
\ No newline at end of file
diff --git a/app/views/users/_show.html.haml b/app/views/users/_show.html.haml
index c665a4c..be664c1 100644
--- a/app/views/users/_show.html.haml
+++ b/app/views/users/_show.html.haml
@@ -1,7 +1,7 @@
 #user_left
   =image_tag validate_avatar(user), :class => "picture"
   .information
-    %h1= user.username || current_user.email
+    %h1= (user.username || current_user.email)
     %ul.nav
       %li=image_tag "icons/artist-info.png"
       %li=image_tag "icons/artist-links.png"
@@ -15,9 +15,13 @@
       %li settings
   .content
     %div
-      - user.artists.each do |artist|
-        %p
-          =artist.name
-          =image_tag artist.img_url
+      %ul.list.related
+        - user.artists.each do |artist|
+          %li<
+            = link_to "#!/artists/#{CGI.escape(artist.name)}" do
+              %h5= trimString(artist.name, 20)
+              .img
+                = image_tag artist.img_url
+      %br.clean
     - if user == current_user
       %div=render :partial => "edit", :locals => { :user => current_user }
\ No newline at end of file
diff --git a/public/images/icons/logout.png b/public/images/icons/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c5dfbab7f51d7a7534d11272b49baa9ebe97687
GIT binary patch
literal 3708
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
a@y`JGL`ZkcuuOCS0000<MNUMnLSTY8<L-L^

literal 0
HcmV?d00001

diff --git a/public/javascripts/ajax/requests.js b/public/javascripts/ajax/requests.js
index a2b54eb..b3406c1 100644
--- a/public/javascripts/ajax/requests.js
+++ b/public/javascripts/ajax/requests.js
@@ -43,7 +43,10 @@ function favourite_request(link, params){
 }
 
 function load_site_request(link, params){
-  cacheResponse = cacheRequest(link+params);
+  if(link != user_path)
+    cacheResponse = cacheRequest(link+params);
+  else cacheResponse = false;
+  
   hide_flash(true);
   if(!cacheResponse)
   {
diff --git a/public/stylesheets/9minutes.css b/public/stylesheets/9minutes.css
index aee572b..0b273b1 100644
--- a/public/stylesheets/9minutes.css
+++ b/public/stylesheets/9minutes.css
@@ -478,7 +478,11 @@ body {
   #user_left h1 {
     font-size: 18px;
     line-height: 44px;
-    height: 44px; }
+    height: 44px;
+    color: #fff;
+    background: transparent url("/images/backgrounds/dark.png") repeat;
+    margin-bottom: 20px;
+    text-indent: 22px; }
   #user_left .nav li {
     background: url("/images/icons/artist-information-active-arrow.png") no-repeat right 10px;
     cursor: default; }
diff --git a/public/stylesheets/sass/_user.scss b/public/stylesheets/sass/_user.scss
index 33a9ecd..fcdabfa 100644
--- a/public/stylesheets/sass/_user.scss
+++ b/public/stylesheets/sass/_user.scss
@@ -23,6 +23,10 @@
     $height: 44px;
     line-height: $height;
     height: $height;
+    color: #fff;
+    @include stripe-bg();
+    margin-bottom: 20px;
+    text-indent: 22px;
   }
   .nav li {
     background: url('#{$ico-url}/artist-information-active-arrow.png') no-repeat right 10px;