show.html.erb in decidim-0.6.0

- old
+ new

@@ -18,12 +18,22 @@
           <%= l meeting.start_time, format: "%d" %> <span class="extra__month"><%= l meeting.start_time, format: "%B" %></span>
         </div>
         <div class="extra__time">
           <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
         </div>
+        <% if !meeting.closed? && meeting.registrations_enabled? %>
+          <% if meeting.has_registration_for? current_user %>
+            <%= action_authorized_button_to :leave, t('.going'), meeting_registration_path(meeting), method: :delete, class: "button expanded button--sc success" %>
+          <% else %>
+            <%= action_authorized_button_to :join, meeting.has_available_slots? ? t('.join') : t('.no_slots_available'), "", class: "button expanded button--sc", disabled: !meeting.has_available_slots?, data: { toggle: current_user.present? ? "meeting-registration-confirm" : "loginModal" } %>
+          <% end %>
+          <% if meeting.available_slots.positive? %>
+            <span><%= t(".remaining_slots", count: meeting.remaining_slots) %></span>
+          <% end %>
+        <% end %>
+        <%= render partial: "decidim/shared/follow_button", locals: { followable: meeting } %>
       </div>
-      </div>
       <% if meeting.closed? %>
         <div class="card card--secondary extra definition-data">
           <% if meeting.contributions_count && meeting.contributions_count.positive? %>
             <div class="definition-data__item definition-data__item--double">
               <span class="definition-data__title"><%= t(".attendees") %></span>
@@ -43,10 +53,11 @@
             <span class="definition-data__title"><%= t(".organizations") %></span>
             <span class="definition-data__text"><%= meeting.attending_organizations %></span>
           </div>
         </div>
       <% end %>
+    </div>
     <%= feature_reference(meeting) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
@@ -64,8 +75,11 @@
     <%= linked_resources_for meeting, :proposals, "proposals_from_meeting" %>
     <%= linked_resources_for meeting, :results, "meetings_through_proposals" %>
   </div>
 </div>
 <%= attachments_for meeting %>
+<%= comments_for meeting %>
+
+<%= render partial: "registration_confirm" %>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>