]> projects.mako.cc - selectricity-live/blobdiff - app/views/election/_candidate_line_edit.rhtml
merged in from code from the other master
[selectricity-live] / app / views / election / _candidate_line_edit.rhtml
index 0fd5b67ecceb0a842979c9e4a76ed1897f108c98..0260a6a7176091ad10dbd2b540da10ea019b40d8 100644 (file)
@@ -1,28 +1,14 @@
 <div class="candidate_box" id="cand<%= @current_candidate.id %>">
-  <div class="candidate_box_name"><%=h @current_candidate.name %></div>
+  <div class="candidate_box_name">
+  
+  <%=h @current_candidate.name %></div>
   <div class="candidate_box_menu">
   <%= link_to_remote "Delete",
                        :complete => "Element.remove('cand#{@current_candidate.id}')",
                        :url => { :action => :delete_candidate,
-                      :id => @current_candidate.id } %>
+                      :id => @election.id, :candidate => @current_candidate.id } %>
    </div>
    <div class="clear-div"></div>
-
-   <div class="candidate_box_info">
-     <div class="candidate_box_picture">
-       <% if @current_candidate.picture? %>
-       <img src="<%= url_for :action => 'candidate_picture',
-                             :id => @current_candidate.id %>" />
-       <% end %>
-     </div>
-     <div class="candidate_box_description">
-       <% if @current_candidate.description.length > 0 %>
-          <%= h(@current_candidate.description) %>
-       <% else %>
-         <!-- no description -->
-       <% end %>
-     </div>
-     <div class="clear-div"></div>
-  </div>
+   <%= render :partial => 'candidate_box_info' %>
 </p>
 </div>

Benjamin Mako Hill || Want to submit a patch?