merged in changes from live version

[selectricity-live] / app / views / election / _candidate_line_edit.rhtml

diff --git a/app/views/election/_candidate_line_edit.rhtml b/app/views/election/_candidate_line_edit.rhtml
index 0fd5b67ecceb0a842979c9e4a76ed1897f108c98..bcb7cd92809eb2731549dd1cd584746bb9c4c0ec 100644 (file)
--- a/app/views/election/_candidate_line_edit.rhtml
+++ b/app/views/election/_candidate_line_edit.rhtml
@@ -1,5 +1,7 @@
 <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}')",
@@ -7,22 +9,6 @@
                       :id => @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>