Remove table from diary edit and refactor using new form styles

[rails.git] / app / views / changeset / list.html.erb

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 14bbeae1ac7b8d4752fdfebce14b889290747e28..ee8610574be79dfb4c58e553c44571cc15bdeab1 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,27 +1,37 @@
-<h1><%= @heading %></h1>
-<p><%= raw(@description) %></p>
+<% content_for :head do -%>
+  <%= javascript_include_tag "changeset" %>
+<% end -%>
+
+<% content_for :heading do %>
+
+  <h1><%= @heading %></h1>
+  <ul class='secondary-actions clearfix'>
+    <li><%= raw(@description) %></li>
+    <% unless params[:friends] or params[:nearby] -%>
+      <li><%= atom_link_to params.merge({ :page => nil, :action => :feed }) %></li>
+    <% end -%>
+  </ul>

 
 

-<% if @edits.size > 1 %>
-  <%= render :partial => 'changeset_paging_nav' %>
-<% elsif @user and @user.display_name == params[:display_name] %>
-  <%= raw t('changeset.list.empty_user') %>
-<% else %>
-  <%= raw t('changeset.list.empty_anon') %>

 <% end %>
 
 <% end %>
 

-<div id="changeset_list_container">
-  <%= render :partial => 'map' %>
-  <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
-</div>
+<%= render :partial => 'changeset_paging_nav' %>

 
 

-<% if @edits.size > 1 %>
+<% if @edits.size > 0 %>
+  <div id='changeset_list_map_wrapper'>
+    <%= render :partial => 'map' %>
+  </div>
+  <div class='column-1'>
+    <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+  </div>

   <%= render :partial => 'changeset_paging_nav' %>
   <%= render :partial => 'changeset_paging_nav' %>

+<% elsif @user and @user.display_name == params[:display_name] %>
+  <h4><%= t('changeset.list.empty_user_html') %></h4>
+<% else %>
+  <h4><%= t('changeset.list.empty_anon_html') %></h4>

 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>

-<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>
-
-<% content_for :head do -%>
-<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
-<% end -%>
-<% end -%>
+  <% content_for :head do -%>
+    <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
+  <% end -%>
+<% end -%>
\ No newline at end of file