CHANGED: removed links from description (artist); ADDED: :hover for gallery

app/views/artists/show.html.haml

@@ -2,7 +2,7 @@
   .side
     .img= image_tag validate_img_url(@artist.image, "artist", :mega)
     %p.description
-      %span
+      %span.tags
         %b Tags:
         - @artist.tags.tag.each_with_index do |tag, i|
           - @tag = link_to tag.name, search_index_path(:q=>tag.name)
@@ -10,10 +10,7 @@
 
       %br
       %br
-      =raw @artist.bio.summary
-      %br
-      =link_to "CLICK", "javascript:ajj();"
-      #myajax
+      %span.text=raw @artist.bio.summary
   .main
     %h2.headline.blue= @artist.name
     %ul.navigation.hash{:steering=>"artist"}

public/javascripts/application.js

@@ -9,6 +9,8 @@ $(document).ready(function(){
   onImageError(); // replace broken image links with placeholders
   initPictureOverlay();
   
+  initArtistDescription();
+  
   fitImages(".artists img"); // resize and resposition images (artists, album)
   fitImages("#artist .side .img img");
 });
@@ -29,6 +31,12 @@ function initPictureOverlay(){
           $('#overlayGallery .original').fadeIn(300);
         });
     });   
+  }).hover(function(){
+    $(this).append('<img src="/images/ico/gallery-fullscreen.png" class="fscreen" />');
+    $posy = $(this).children("img").height() / 2 - $(this).children('.fscreen').height() / 2 + 8;
+    $(this).children('.fscreen').css('top', $posy).fadeTo(400, 0.8);
+  }, function(){
+    $(this).children('.fscreen').remove();
   });
   $('#overlayGallery .close').click(function(){
     setTimeout(
@@ -47,6 +55,13 @@ function ajj(){
 
 
 
+function initArtistDescription(){
+  $("#artist .description .text a").each(function(){
+    $text = $(this).html();
+    $(this).after($text).remove();
+  });
+}
+
 
 
 
@@ -138,7 +153,7 @@ function initNavigation()
     if($(this).hasClass("hash"))
     {
       $str = $.deparam.fragment(window.location.href);
-      $active = $(".navigation li[hashcontrol="+$str.category+"]");
+      $active = $(".navigation li[hashcontrol="+$str.tab+"]");
       if($active.text() == "" || $active == null) $id = 0;
       else $id = $active.parent().children().index($active);
     }
@@ -155,7 +170,7 @@ function initNavigation()
 function orderNavigation(){
   $(".navigation.hash").each(function(){
     $str = $.deparam.fragment(window.location.href);
-    $active = $(this).children("[hashcontrol="+$str.category+"]");
+    $active = $(this).children("[hashcontrol="+$str.tab+"]");
     if($active.text() == "" || $active == null) return;
     
     $id = $active.parent().children().index($active);
@@ -197,7 +212,7 @@ function handleNavigation()
     
     // change URL
     if(!$settings['nav'].hasClass('sub')){
-      $str = $.param.fragment(window.location.href, 'category='+$(this).attr("hashcontrol"));
+      $str = $.param.fragment(window.location.href, 'tab='+$(this).attr("hashcontrol"));
       window.location.href = $str;
     }
     

public/stylesheets/layout.css

@@ -298,9 +298,9 @@ div[wheel] > div { display: none; opacity: 0.0; position: relative; }
   position: relative;
   overflow: hidden;
 }
-#artist .description { width: 363px; font-size: 12px; }
+#artist .description{ width: 363px; font-size: 12px; }
 #artist .description a {text-decoration: underline; }
-#artist .description span, #artist .description span a { color: #2e353c; text-decoration: none;}
+#artist .description .tags, #artist .description .tags a { color: #2e353c; text-decoration: none;}
 #artist .main
 {
   float: right;
@@ -315,16 +315,25 @@ div[wheel] > div { display: none; opacity: 0.0; position: relative; }
 
 #artist .gallery img
 {
-  padding: 7px;
-  border: 1px solid #e9edf0;
-  display: inline;
-  vertical-align: bottom;
-  margin-bottom: 10px;
+  float: left;
 }
 #artist .gallery a
 {
   margin-right: 5px;
-  vertical-align: bottom;
+  overflow: hidden;
+  padding: 7px;
+  border: 1px solid #e9edf0;
+  margin-bottom: 10px;
+  display: inline-block;
+  position: relative;
+}
+#artist .gallery a:hover { border-color: #cfd5da; }
+#artist .gallery .fscreen
+{
+  position: absolute;
+  left: 19px;
+  top: 7px;
+  display: none;
 }
 
 .overlay