Merge with master

app/views/admin/conference/new.html.haml

@@ -1,14 +1,17 @@
 .row
   .col-md-6.col-md-offset-3
     = semantic_form_for(@conference, :url => admin_conference_index_path) do |f|
-      = f.inputs "Basic Information" do
-        = f.input :title, :hint => "The name of your conference as it shall appear throughout the site. Example: 'OpenSUSE Conference 2013'"
-        = f.input :short_title, :hint => "A short and unique handle for your conference, using only lower-case letters, numbers and underscores. This will be used to identify your conference in URLs etc. Example: 'froscon2011'"
-        = f.input :social_tag, :hint => "The hashtag you'll use on Twitter and Google+.  Don't include the '#' sign!'"
-        = f.input :contact_email, :hint => "Contact email address for your conference. Will be used as reply-to address in emails sent out by the system."
-      = f.inputs "Scheduling" do
-        = f.input :timezone, :as => :time_zone, :hint => "Please select in what time zone your conference will take place."
-        = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
-        = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
+      = f.inputs 'Basic Information' do
+        = f.input :title, hint: "The name of your conference as it shall appear throughout the site. Example: 'OpenSUSE Conference 2013'",
+                          input_html: { required: 'required' }
+        = f.input :short_title, hint: "A short and unique handle for your conference, using only lower-case letters, numbers and underscores. This will be used to identify your conference in URLs etc. Example: 'froscon2011'",
+                                input_html: { required: 'required' }
+        = f.input :social_tag, hint: "The hashtag you'll use on Twitter and Google+.  Don't include the '#' sign!'",
+                               input_html: { required: 'required' }
+        = f.input :contact_email, hint: 'Contact email address for your conference. Will be used as reply-to address in emails sent out by the system.'
+      = f.inputs 'Scheduling' do
+        = f.input :timezone, as: :time_zone, hint: 'Please select in what time zone your conference will take place.'
+        = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', readonly: 'readonly', required: 'required' }
+        = f.input :end_date, as: :string, input_html: { id: 'conference-end-datepicker', readonly: 'readonly', required: 'required'  }
       = f.actions do
-        = f.action :submit, :button_html => {:class => "btn btn-success pull-right"}
+        = f.action :submit, button_html: {class: 'btn btn-success pull-right'}

app/views/layouts/application.html.haml

@@ -1,4 +1,4 @@
-!!!
+%html{:xmlns => "http://www.w3.org/1999/html"}
 %html
   %head
     %meta{:charset => "utf-8"}

app/views/proposal/show.html.haml

@@ -6,6 +6,9 @@
         %br
         %small
           = @event.subtitle
+      = link_to "Schedule", conference_schedule_path(@conference.short_title), :class =>"btn btn-success pull-right"
+      - if has_role?(current_user, "admin")
+        = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
 .row
   .col-md-3
     %p
@@ -13,6 +16,12 @@
     %dl
       %dt Date:
       %dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
+      %dt Duration:
+      %dd= show_time(@event.event_type.length)
+      %dt Room:
+      %dd
+        - if @event.room_id
+          = @event.room.name
       %dt Conference:
       %dd= @event.conference.title
       %dt Language:
@@ -22,6 +31,13 @@
         - if @event.track_id
           %span.label{:style =>"background-color: #{@event.track.color};"}
             = @event.track.name
+      %dt Difficulty:
+      %dd
+        - if @event.difficulty_level_id
+          %span.label{:style =>"background-color: #{@event.difficulty_level.color};"}
+            = @event.difficulty_level.title
+    - if @event.require_registration
+      = link_to "Registration required!", register_conference_path(@conference.short_title), :class => "btn btn-xs btn-warning"
   .col-md-9
     .row
       .col-md-12
@@ -42,6 +58,9 @@
           %h3
             by
             = @speaker.public_name
+            (
+            = @speaker.email
+            )
             - if @speaker.company?
               %br
               %span.muted