pagination bootstrap update layout

This commit is contained in:
2014-08-21 16:29:29 +05:30
parent bfb4d54244
commit c87ce13045
20 changed files with 129 additions and 54 deletions

View File

View File

@@ -1,5 +1,20 @@
<% if defined?(wrap_in) && !wrap_in.blank? %>
<%= content_tag wrap_in do %>
www
<% c =[:linkbox] %>
<% c << "color-"+neuigkeit.rubrik.color.to_s+"-dark" unless neuigkeit.rubrik.color.nil? %>
<%= link_to [neuigkeit.rubrik,neuigkeit], {class: c} do %>
<%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> neuigkeit} %>
<% end %>
<% end %>
<% else %>
<% c =[:linkbox] %>
<% c << "color-"+neuigkeit.rubrik.color.to_s+"-dark" unless neuigkeit.rubrik.color.nil? %>
<%= link_to [neuigkeit.rubrik,neuigkeit], {class: c} do %>
<%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> neuigkeit} %>
<% end %>
<% end %>

View File

@@ -1,11 +1,11 @@
<li>
<%= link_to nlink_list.link do %>
<div class="contentbox" >
<div class="contentbox" style="height:9em">
<% p = nlink_list.link_type.downcase.pluralize+"/nlink" %>
<%= raw(strip_links(render :partial=>p, :object=>nlink_list.link )) %>
</div>
<% end %>
</li>

View File

@@ -0,0 +1,5 @@
<div id="nlink_list_search">
<ul class="unstyled">
<%= render partial: "nlink_list_search", collection: nlink_list_search_whole %>
</ul>
</div>

View File

@@ -0,0 +1,15 @@
<div id="nlink_list">
<%= I18n.t("neuigkeit.sieheauch") %>
<div class="container-fluid">
<% nlink_list_whole.each_slice(2) do |row| %>
<div class="row-fluid">
<% row.each do |nl| %>
<div class="span6">
<%= render partial: "nlink_list", object: nl %>
</div>
<% end %>
</div>
<% end %>
</div>
</div>

View File

@@ -1,2 +1,2 @@
$('#nlink_list_search').html("");
$('#nlink_list').html("<%= escape_javascript( render partial:"nlink_list", collection: @nlinks )%>");
$('#nlink_list').replaceWith("<%= escape_javascript( render partial:"nlink_list_whole", object: @nlinks )%>");

View File

@@ -0,0 +1 @@
$('#nlink_list_search').replaceWith("<%= escape_javascript( render partial:"nlink_list_search_whole", object: @nlink_search )%>");

View File

@@ -27,18 +27,10 @@
<% end %>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div>
<%= I18n.t("neuigkeit.sieheauch") %>
<ul class="unstyled">
<div id="nlink_list">
<%= render partial: "nlink_list", collection: @neuigkeit.nlinks %>
</div>
<div id="nlink_list_search">
<%= render partial: "nlink_list_search", collection: @nlink_search %>
</div>
</ul>
<%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %>
<%= render partial: 'nlink_list_search_whole', object: @nlink_search %>
<% if can? :find_link, @neuigkeit %>
<%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} do |f| %>
<%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} , :remote=> true do |f| %>
<%= f.input :query, :input_html => { :name => 'query' },:label=>false %>
<% end %>
<% end %>