merged changes back from live

[selectricity] / app / views / election / _candidate_line.rhtml

diff --git a/app/views/election/_candidate_line.rhtml b/app/views/election/_candidate_line.rhtml
index 870a2de03d6bb977c9776abd745f7bd66c671d2a..6b5b5530735ad8048f98d0cbb5f2f27a68d0b324 100644 (file)
--- a/app/views/election/_candidate_line.rhtml
+++ b/app/views/election/_candidate_line.rhtml
@@ -1,19 +1,17 @@
-<% -%>
 <div id="cand<%= @current_candidate.id %>">
   <li><%=h @current_candidate.name -%>
-    <% if @show_details %>
-      (<%= link_to_remote "Hide Details",
-                         :update => "cand#{@current_candidate.id}",
-                         :url => { :action => :lessinfo_candidate, :id => @current_candidate.id } %>)
-      <br />
-      <blockquote>
-      <%= h(@current_candidate.description) %>
-      </blockquote>
-    <% else %>
-      (<%= link_to_remote "Show Details",
-                         :update => "cand#{@current_candidate.id}",
-                         :url => { :action => :moreinfo_candidate,
-                        :id => @current_candidate.id } %>)
-    <% end %>
+    <span id="show_candidate_link_<%= @current_candidate.id %>">
+    (<%= link_to "Show Details", "#",
+         :onclick => "show_candidate_info(#{@current_candidate.id}); return false;"  %>)
+    </span>
+    <span style="display: none;" id="hide_candidate_link_<%= @current_candidate.id %>">
+    (<%= link_to "Hide Details", "#",
+         :onclick => "hide_candidate_info(#{@current_candidate.id}); return false;" %>)
+    <br />
+
+    <div style="display: none;" id="candidate_description_<%= @current_candidate.id %>">
+    <%=h (@current_candidate.description) %>
+    </>
+    </span>
   </li>
 </div>