Work on changeset display
This commit is contained in:
parent
d7c2152d3a
commit
ea6926d3de
6 changed files with 44 additions and 51 deletions
|
@ -1079,8 +1079,18 @@ nav.secondary {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Rules for the changeset list shown by the history tab etc */
|
/* Rules for the changeset list shown by the history tab */
|
||||||
|
|
||||||
|
#sidebar .changesets {
|
||||||
|
li {
|
||||||
|
padding: $lineheight;
|
||||||
|
border-bottom: $keyline;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Rules for the data browser */
|
/* Rules for the data browser */
|
||||||
|
|
||||||
|
|
|
@ -12,39 +12,32 @@
|
||||||
end
|
end
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
|
<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
|
||||||
<li>
|
<%= link_to(changeset.id, changeset_path(changeset.id), :class => :changeset_id) %>
|
||||||
|
|
||||||
<span class="changeset_id">
|
<span class='date'>
|
||||||
<%=
|
<% if changeset.closed_at > DateTime.now %>
|
||||||
link_to(changeset.id,
|
<%= t 'changeset.changeset.still_editing' %>
|
||||||
{:controller => 'browse', :action => 'changeset', :id => changeset.id},
|
<% else %>
|
||||||
{:title => t('changeset.changeset.view_changeset_details')})
|
<%= l changeset.closed_at, :format => :long %>
|
||||||
%>
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<span class='date'>
|
|
||||||
<% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
|
|
||||||
<% else %><%= l changeset.closed_at, :format => :long %><% end %>
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<%if showusername %>
|
|
||||||
<span class="user">
|
|
||||||
<% if changeset.user.data_public? %>
|
|
||||||
<%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %>
|
|
||||||
<% else %>
|
|
||||||
<i><%= t'changeset.changeset.anonymous' %></i>
|
|
||||||
<% end %>
|
|
||||||
</span>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</span>
|
||||||
|
|
||||||
<li class="comment deemphasize">
|
<% unless params.key?(:display_name) %>
|
||||||
|
<span class="user">
|
||||||
|
<% if changeset.user.data_public? %>
|
||||||
|
<%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
|
||||||
|
<% else %>
|
||||||
|
<i><%= t 'changeset.changeset.anonymous' %></i>
|
||||||
|
<% end %>
|
||||||
|
</span>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<p class="comment deemphasize">
|
||||||
<% if changeset.tags['comment'].to_s != '' %>
|
<% if changeset.tags['comment'].to_s != '' %>
|
||||||
<%= linkify(h(changeset.tags['comment'])) %>
|
<%= linkify(h(changeset.tags['comment'])) %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= t'changeset.changeset.no_comment' %>
|
<%= t 'changeset.changeset.no_comment' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</p>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
<ul class='secondary-actions pager clearfix'>
|
|
||||||
<% if @page > 1 %>
|
|
||||||
<li><%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %></li>
|
|
||||||
<% else %>
|
|
||||||
<li><%= t('changeset.changeset_paging_nav.previous') %></li>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<li><%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %></li>
|
|
||||||
|
|
||||||
<% if @edits.size < @page_size %>
|
|
||||||
<li><%= t('changeset.changeset_paging_nav.next') %></li>
|
|
||||||
<% else %>
|
|
||||||
<li><%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %></li>
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
|
@ -1,4 +0,0 @@
|
||||||
<% showusername = true if showusername.nil? %>
|
|
||||||
<div id="changeset_list">
|
|
||||||
<%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %>
|
|
||||||
</div>
|
|
|
@ -11,8 +11,17 @@
|
||||||
<h2><%= @heading %></h2>
|
<h2><%= @heading %></h2>
|
||||||
|
|
||||||
<% if @edits.size > 0 %>
|
<% if @edits.size > 0 %>
|
||||||
<%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
|
<ol class="changesets">
|
||||||
<%= render :partial => 'changeset_paging_nav' %>
|
<%= render :partial => 'changeset',
|
||||||
|
:collection => @edits %>
|
||||||
|
</ol>
|
||||||
|
|
||||||
|
<div class="search_more">
|
||||||
|
<div class="inner12 search_results_entry">
|
||||||
|
<%= link_to t('geocoder.results.more_results'), '#', :class => "button" %>
|
||||||
|
</div>
|
||||||
|
<%= image_tag "searching.gif", :class => ["search_searching", "hidden"] %>
|
||||||
|
</div>
|
||||||
<% elsif @user and @user.display_name == params[:display_name] %>
|
<% elsif @user and @user.display_name == params[:display_name] %>
|
||||||
<h4><%= t('changeset.list.empty_user_html') %></h4>
|
<h4><%= t('changeset.list.empty_user_html') %></h4>
|
||||||
<% else %>
|
<% else %>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<li id="view_tab">
|
<li id="view_tab">
|
||||||
<%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
|
<%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
|
||||||
</li><li id="history_tab">
|
</li><li id="history_tab">
|
||||||
<%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
|
<%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %>
|
||||||
</li><li id="export_tab">
|
</li><li id="export_tab">
|
||||||
<%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %>
|
<%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %>
|
||||||
</li><li id="edit_tab">
|
</li><li id="edit_tab">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue