merged back from live

[selectricity] / 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 78f8580655b79453930bcdf8638fcb18fed840c3..0fd5b67ecceb0a842979c9e4a76ed1897f108c98 100644 (file)
--- a/app/views/election/_candidate_line_edit.rhtml
+++ b/app/views/election/_candidate_line_edit.rhtml
@@ -1,29 +1,28 @@
-<% -%>
-<div id="cand<%= @current_candidate.id %>">
-<p><strong><%= @current_candidate.name %></strong>
-  (<%= link_to_remote "Delete",
+<div class="candidate_box" id="cand<%= @current_candidate.id %>">
+  <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,
                        :complete => "Element.remove('cand#{@current_candidate.id}')",
                        :url => { :action => :delete_candidate,

-                      :id => @current_candidate.id } %> |
-    <%= link_to "Edit", :action => 'edit_candidate', :id =>
-    @current_candidate.id %>)<br />
-    <blockquote>
-    <table><tr><td valign="top">
-      <% if @current_candidate.picture? %>
-      <img src="<%= url_for :action => 'candidate_picture',
-                            :id => @current_candidate.id %>"
-           align="top" width="80px" />
-      <% end %>
-      </td>
-      <% if @current_candidate.description.length > 0 %>
-      <td valign="top">
-        <em>Description:</em><br />
-         <%= h(@current_candidate.description) %>
-      </td>
-      <% else %>
-      <td></td>
-      <% end %>
-    </tr></table>
-    </blockquote>
+                      :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>

 </p>
 </div>
 </p>
 </div>