Merge branch 'closet'

app/views/items/show.html.haml

@@ -1,8 +1,7 @@
 - title @item.name
 - canonical_path @item
 
-- cache "items_show_#{@item.id}_main_content" do
+%header#item-header
-  %header#item-header
   = image_tag @item.thumbnail_url, :id => 'item-thumbnail'
   %div
     %h2#item-name= @item.name
@@ -11,7 +10,7 @@
       == Rarity: #{@item.rarity_index} (#{@item.rarity})
     = link_to 'NeoItems', neoitems_url_for(@item), :class => 'button'
 
-  - if @current_user_hangers
+- if @current_user_hangers
   #closet-hangers
     %header
       Track this in
@@ -30,9 +29,9 @@
           - unless lists.empty?
             = f.collection_select :list_id, lists, :id, :name, :include_blank => 'Not in a list'
           = f.submit "Save"
-  %p= @item.description
+%p= @item.description
 
-  #item-zones
+#item-zones
   %p
     %strong Occupies:
     = list_zones @item.occupied_zones, :uncertain_label
@@ -43,7 +42,7 @@
     - else
       = list_zones @item.restricted_zones
 
-  #trade-hangers
+#trade-hangers
   - [true, false].each do |owned|
     %p
       - unless @trading_closet_hangers_by_owned[owned].empty?
@@ -74,20 +73,20 @@
         %span.less less
 
 
-  #item-preview-header
+#item-preview-header
   %h3 Preview
   %a#customize-more.button{:href => '/'} Customize more
 
-  #item-preview
+#item-preview
   #item-preview-species= standard_species_images_for(@item)
   #item-preview-error
   #item-preview-swf
     Javascript and Flash are required to preview wearables. Sorry!
 
-  :javascript
+:javascript
   var CURRENT_ITEM_ZONES_RESTRICT = #{@item.zones_restrict.inspect},
     IMPRESS_HOST = #{RemoteImpressHost.inspect};
 
-  = include_javascript_libraries :jquery, :swfobject
+= include_javascript_libraries :jquery, :swfobject
-  = javascript_include_tag 'items/show'
+= javascript_include_tag 'items/show'