app/views/store/events/show.html.haml in artfully_ose-1.2.0.pre.15 vs app/views/store/events/show.html.haml in artfully_ose-1.2.0.pre.16

@@ -5,24 +5,19 @@
     %h1#logo= @event.name
     %h4= @event.producer
 
   .row
     .span8  
-
-      - @use_calendar = (@event.upcoming_public_shows.length > 5 || params[:calendar] == 'true')
-      
-      =render 'calendar' if @use_calendar
       #loading-container
         #loading
           Hang tight! We're searching for your tickets.
           =image_tag "loading.gif"
         #error
           We had a problem finding tickets. Please try again.
       %ul#shows.unstyled
-        - @event.upcoming_public_shows.each do |show|
-          %li{:id => "show_#{show.id}", 'data-show-uuid' => show.uuid, :style => "#{'display:none' if @use_calendar}", 'data-date' => "#{show.datetime_local_to_event.strftime('%D')}"}
-            - unless @use_calendar
-              =render :partial => 'store/shows/show', :locals => {:show => show, :collapsed => !@use_calendar}
+        - @shows.each do |show|
+          %li{:id => "show_#{show.id}", 'data-show-uuid' => show.uuid, 'data-date' => "#{show.datetime_local_to_event.strftime('%D')}"}
+            =render :partial => 'store/shows/show', :locals => {:show => show, :collapsed => true}
 
     .span4
       #description.side-section
         %h6 About
         - if @event.image?