forked from bofh/fetsite
pagination bootstrap update layout
This commit is contained in:
@@ -12,12 +12,17 @@
|
||||
|
||||
<div class="span9">
|
||||
|
||||
<ul class="unstyled linkbox-list" style="max-width:70em">
|
||||
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
|
||||
<% @neuigkeiten.each do |n| %>
|
||||
<li><%= render n if can?(:show, n) %> </li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<div id="infinite-scrolling">
|
||||
<%= will_paginate @neuigkeiten %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="span3">
|
||||
<%= render 'calendars/calentries', :object=>@calentries %>
|
||||
</div>
|
||||
|
||||
@@ -19,16 +19,18 @@
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="span9">
|
||||
<% @neuigkeiten.each_slice(1) do |row| %>
|
||||
<ul class="unstyled" style="max-width:70em">
|
||||
<% row.each do |neuigkeit| %>
|
||||
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
|
||||
<% @neuigkeiten.each do |neuigkeit| %>
|
||||
|
||||
<li>
|
||||
<%= render neuigkeit %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<div id="infinite-scrolling">
|
||||
<%= will_paginate @neuigkeiten %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<%= render 'calendars/calentries', :object=>@calentries %>
|
||||
|
||||
7
app/views/rubriken/show.js.erb
Normal file
7
app/views/rubriken/show.js.erb
Normal file
@@ -0,0 +1,7 @@
|
||||
$('#neuigkeiten').append('<%= j render @neuigkeiten, :locals => { :wrap_in => :li} %>');
|
||||
<% if @neuigkeiten.next_page %>
|
||||
$('.pagination').replaceWith('<%= j will_paginate @neuigkeiten %>');
|
||||
<% else %>
|
||||
$(window).off('scroll');
|
||||
$('.pagination').remove();
|
||||
<% end %>
|
||||
Reference in New Issue
Block a user