Fix lines of signup-sheet table to handle bookmarks in

reasonably sized columns
expertiza · Mar 18, 2014 · c82aebe · c82aebe
1 parent 2f0d0e4
commit c82aebe
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/app/views/sign_up_sheet/_actions.html.erb b/app/views/sign_up_sheet/_actions.html.erb
@@ -1,4 +1,3 @@
-<%= link_to image_tag('Check-icon.png', :border => 0, :title => 'Signup', :align => 'middle'), :controller=>'sign_up_sheet', :action=> 'sign_up', :id => topic.id, :assignment_id => params[:id] %>
 <%= link_to :controller=>'bookmarks', :action=> 'view_topic_bookmarks', :id => topic.id , :assignment_id => params[:id] do %>
   <span class="fa-stack fa-md" title='View topic bookmarks'>
     <i class="fa fa-bookmark fa-stack-1x fa-2x"></i>
@@ -11,3 +10,5 @@
   </span>
 <% end %>
 
+<%= render :partial => 'reserve_topic', :locals => {:i=>i, :topic=>topic} %>
+
diff --git a/app/views/sign_up_sheet/_table_header.html.erb b/app/views/sign_up_sheet/_table_header.html.erb
@@ -6,6 +6,7 @@
 <th width="5%">Num. of slots</th>
 <th width="5%">Available slots</th>
 <th width="5%">Num. on waitlist</th>
+<th width="10%">Bookmarks</th>
 <th width="10%">Actions</th>
 <% if @assignment.staggered_deadline == true %>
   <th width="5%">Dependencies</th>

diff --git a/app/views/sign_up_sheet/_table_line.html.erb b/app/views/sign_up_sheet/_table_line.html.erb
@@ -9,7 +9,7 @@
 <%= render :partial => '/sign_up_sheet/available_slots', :locals => {:topic=>topic} %>
 
 <%= render :partial => '/sign_up_sheet/num_waiting', :locals => {:topic=>topic} %>
-<td align="center"><%= render :partial => '/sign_up_sheet/actions', :locals => {:topic=>topic} %></td>
+<td align="center"><%= render :partial => '/sign_up_sheet/actions', :locals => {:i=>i,:topic=>topic} %></td>
 
 <% if @assignment.has_partner_ads?(params[:id]) %>
   <td align="center">

diff --git a/app/views/sign_up_sheet/list.html.erb b/app/views/sign_up_sheet/list.html.erb
@@ -31,7 +31,7 @@
           <% end %>
 
           <%= render :partial => 'table_line', :locals => {:i=>i, :topic=>topic} %>
-          <%= render :partial => 'reserve_topic', :locals => {:i=>i, :topic=>topic} %>
+
 
         </tr>
         <% i=i+1 %>

diff --git a/app/views/student_task/view.html.erb b/app/views/student_task/view.html.erb
@@ -7,7 +7,7 @@
 <% end %>
 <ul>
   <%if SignUpTopic.find_by_assignment_id(@assignment.id)%>
-    <li> <%= link_to 'Signup sheet', :controller=>'sign_up_sheet', :action => 'add_signup_topics', :id => @participant.parent_id%>
+    <li> <%= link_to 'Signup sheet', :controller=>'sign_up_sheet', :action => 'sign_up', :id => @participant.parent_id%>
     (Sign up for a topic)
   </li>
 <%end%>