Merge

2014-03-18 21:30:12 +01:00 · 2014-03-18 21:30:12 +01:00 · 3af9bad30e
commit 3af9bad30e
parent 2ccd37a7af
92 changed files with 2089 additions and 10693 deletions
--- a/app/views/admin/stats/_tickets.html.haml
+++ b/app/views/admin/stats/_tickets.html.haml
@ -1,5 +1,22 @@
- if @tickets
-  %h2
-    = "Non-Free Tickets(#{@tickets.count})"
-.span4#tickets_time
-= render :partial => "tickets_time"
+- if @tickets.length > 0
+  .row-fluid
+    .span12
+      %h2
+        = "Non-Free Tickets (#{@tickets.count})"
+  .row-fluid
+    .span4
+      %h4 Ticket distribution
+      .row-fluid
+        .span12#tickets_distribution
+          = render :partial => "tickets_distribution"      
+  .row-fluid
+    .span10
+      %h4 Ticket sales over time
+      .row-fluid
+        .span12#tickets_time
+          = render :partial => "tickets_time"
+- else
+  - if @conference.use_supporter_levels
+    %h5 No tickets have been bought yet.
+  - else
+    %h5 There are no tickets set for this conference.