Move print button, solves #191

hpi-swt2 · Jan 16, 2017 · 448737f · 448737f
1 parent 31602f4
commit 448737f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/app/views/events/participants.html.erb b/app/views/events/participants.html.erb
@@ -3,15 +3,16 @@
   <h1><%=t '.title', :default => model_class.model_name.human.titleize %> (<%= @event.kind.humanize %>)</h1>
 </div>
 <% if can? :view_participants, Event %>
+  <%= render :partial => 'participants_modal' %>
   <%= render :partial => 'show_event' %>
-  
+
   <h1><%= t '.participants' %></h1>
   <%= form_tag(event_path(@event) + "/participants/agreement_letters") do %>
     <table class="table table-striped">
       <tr>
         <th><%= t 'activerecord.attributes.profile.name' %></th>
         <th><%= t 'activerecord.attributes.profile.email' %></th>
-    	  <th><%= t 'agreement_letters.agreement_letter' %></th>
+        <th><%= t 'agreement_letters.agreement_letter' %></th>
         <% if can? :print_agreement_letters, Event and @has_agreement_letters %>
           <th>
             <label>
@@ -20,11 +21,11 @@
             </label>
           </th>
         <% end %>
-      </tr>  
-    
+      </tr>
+
       <% @participants.each do |participant| %>
       <tr>
-        
+
         <td>
         <%= participant.name %>
         </td>
@@ -48,14 +49,16 @@
       </tr>
       <% end %>
     </table>
+
+    <button class="btn btn-default" type="button" data-toggle="modal" data-target="#print_participant_modal" id="open_print_modal">Teilnehmerliste (PDF)</button>
     <% if can? :print_agreement_letters, Event and @has_agreement_letters %>
       <div id="participants_download_submit_button">
-      <%= submit_tag t('events.agreement_letters_download.download_all_as'), name: "download_all" %>
+      <%= submit_tag t('events.agreement_letters_download.download_all_as'), name: "download_all", class: "btn btn-default" %>
       <%= select_tag :download_type, options_for_select([['pdf'], ['zip']]) %>
       </div>
     <% end %>
   <% end %>
   <br>
   <%= link_to t('.back', :default => t('helpers.links.back')),
               event_path(@event), :class => 'btn btn-default'  %>
-<% end %>
+<% end %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
@@ -1,7 +1,4 @@
 <%- model_class = Event -%>
-<% if can? :view_participants, Event %>
-  <%= render :partial => 'participants_modal' %>
-<% end %>
 <div class="page-header">
   <h1><%=t '.title', :default => model_class.model_name.human.titleize %> (<%= @event.kind.humanize %>)</h1>
 </div>
@@ -28,5 +25,4 @@
 <% if can? :view_participants, Event %>
   <%= link_to t('events.participants.show_participants'),
               event_path(@event) + "/participants" , :class => 'btn btn-default'  %>
-  <button class="btn btn-default" data-toggle="modal" data-target="#print_participant_modal" id="open_print_modal">Teilnehmerliste (PDF)</button>
 <% end %>
diff --git a/config/locales/de.events.yml b/config/locales/de.events.yml
@@ -52,7 +52,7 @@ de:
         no_participants_selected: "Keine Teilnehmer ausgewählt"
         no_agreement_letters: "Keiner der gewählten Teilnehmer hat eine Einverständniserklärung"
       select_all: "Alle auswählen"
-      download_all_as: "Alle herunterladen als"
+      download_all_as: "Einverständniserklärungen herunterladen als"
     kinds:
      workshop: "Workshop"
      camp: "Camp"

diff --git a/spec/views/events/participants.html.erb_spec.rb b/spec/views/events/participants.html.erb_spec.rb
@@ -49,4 +49,10 @@
     expect(rendered).to have_text(t(:unnecessary, scope:'events.participants'))
   end
 
+  it "contains a modal to print participant lists" do
+    render
+    expect(rendered).to have_css('div#print_participant_modal')
+    expect(rendered).to have_css('button#open_print_modal')
+    expect(rendered).to have_css('input#print_participant_list')
+  end
 end
diff --git a/spec/views/events/show.html.erb_spec.rb b/spec/views/events/show.html.erb_spec.rb
@@ -59,14 +59,6 @@
     expect(rendered).to have_link(t(:print_all, scope: 'events.applicants_overview'))
   end
 
-  it "contains an modal to print participant lists" do
-    render
-    expect(rendered).to have_css('div#print_participant_modal')
-    expect(rendered).to have_css('button#open_print_modal')
-    expect(rendered).to have_css('input#print_participant_list')
-  end
-
-
   it "displays print badges button" do
     render
     expect(rendered).to have_link(t(:print_button_label, scope: 'events.badges'))