auf gehts, ab gehts!!!

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">

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

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"
+        = render :partial=>"artists/more_albums"

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 }

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)
   {

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; }

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;