rebuild session#show

app/views/comments/create.js.coffee

@@ -2,6 +2,6 @@
   $("#comment_error").append('<%= j(render "error") %>')
   $("#comment_error").find(".alert").alert()
 <% else %>
-  $("#comments").append('<%= j(render(@comment)) %>')
+  $("#comments-container").prepend('<%= j(render(@comment)) %>')
   $("#comment_body").val("")
 <% end %>

app/views/session/applicants/_error.html.haml

@@ -0,0 +1,6 @@
+.alert.alert-error
+  %a.close{href: "#", "data-dismiss" => "alert"} ×
+  %h4.alert-heading Error
+  %ul
+    - @applicant.errors.full_messages.each do |msg|
+      %li= msg

app/views/session/applicants/create.js.coffee

@@ -1,7 +1,7 @@
 <% if @applicant.errors.any? %>
-  $("#applicant_error").append('<%= j(render "error") %>')
-  $("#applicant_error").find(".alert").alert()
+  $("#applicant-error").append('<%= j(render "error") %>')
+  $("#applicant-error").find(".alert").alert()
 <% else %>
-  $("#applicants").append('<%= j(render(@applicant)) %>')
+  $("#applicants-container").append('<%= j(render(@applicant)) %>')
   $("#entry-modal").modal("hide")
 <% end %>

app/views/session/applicants/new.html.haml

@@ -1,3 +1,3 @@
 = simple_form_for([@world, @applicant], :remote => true, :html => { :class => 'form-horizontal' }) do |f|
-  = f.input :character_id, as: :select, collection: @characters
+  = f.input :character_id, as: :select, collection: @characters, :include_blank => false
   = f.input :comment

app/views/sessions/show.html.haml

@@ -39,22 +39,17 @@
   .well
     ~ markdown @session.description
 
-.form-actions
-  - if !@session.fix_applicant? && can?(:create, @applicant)
-    = link_to t('buttons.entry-session'), new_world_session_applicant_path(@session.world, @session), role: "button", class: "btn btn-primary", "data-toggle" => "modal", "data-target" => "#entry-modal"
-  = link_to 'Back', @session.world, class: "btn"
-
-
 %div(id="entry-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="entry-modal-label" aria-hidden="true" style="display: none;")
   .modal-header
     %button(type="button" class="close" data-dismiss="modal" aria-hidden="true")x
-    %h3#entry-modal-label Header
+    %h3#entry-modal-label
+      = t '.entry-session'
   .modal-body
   .modal-footer
     %button(class="btn" data-dismiss="modal" aria-hidden="true")Close
     %button(id="entry-button" class="btn btn-primary")Entry
 
-%h3 Listing Session Rooms
+%h3= t("general.session-rooms")
 
 %table.table.table-striped
   %tr
@@ -63,20 +58,29 @@
     %th CreatedAt
   = render @session.rooms
 
-- if @session.fix_applicant?
-  %h3= t'.entry-characters'
-  #characters
-    = render @session.applicants.approved
+%ul.nav.nav-tabs
+  %li.active= link_to t('.comments'), "#comments", "data-toggle" => "tab"
+  - if @session.fix_applicant?
+    %li= link_to t('.participants'), "#participants", "data-toggle" => "tab"
+  - else
+    %li= link_to t('.applicants'), "#applicants", "data-toggle" => "tab"
 
-- unless @session.fix_applicant?
-  %h3= t '.applicants'
-  #applicants
-    = render @session.applicants
+.tab-content
+  #comments.tab-pane.active
+    #comment_error
+    = simple_form_for [@session, @comment], :html => {class: "well form-inline"}, :remote => true do |f|
+      = f.input_field :body, placeholder: "Comment", class: "span7"
+      = f.button :submit, class: "btn-success", id: "new_comment_submit"
+    #comments-container
+      = render @session.comments.reverse
+  - if @session.fix_applicant?
+    #participants.tab-pane
+      = render @session.applicants.approved
+  - else
+    #applicants.tab-pane
+      - if !@session.fix_applicant? && can?(:create, @applicant)
+        #applicant-error
+        = link_to t('buttons.entry-session'), new_world_session_applicant_path(@session.world, @session), role: "button", class: "btn btn-success btn-block", "data-toggle" => "modal", "data-target" => "#entry-modal"
+      #applicants-container
+        = render @session.applicants
 
-%h3 Session Comments
-#comments
-  = render @session.comments
-#comment_error
-= simple_form_for [@session, @comment], :html => {class: "well form-inline"}, :remote => true do |f|
-  = f.input_field :body, placeholder: "Comment", class: "span9"
-  = f.button :submit, class: "btn-success", id: "new_comment_submit"