diff --git a/Gemfile b/Gemfile index 1516b7f..c8cfa75 100644 --- a/Gemfile +++ b/Gemfile @@ -43,3 +43,4 @@ gem 'mm-multi-parameter-attributes' gem 'feedzirra' gem 'htmlentities' gem 'sorcery' +gem 'will_paginate', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8597b3e..3b01ee0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,6 +146,7 @@ GEM uglifier (1.2.5) execjs (>= 0.3.0) multi_json (~> 1.3) + will_paginate (3.0.3) PLATFORMS ruby @@ -163,3 +164,4 @@ DEPENDENCIES sass-rails (~> 3.2.3) sorcery uglifier (>= 1.0.3) + will_paginate (~> 3.0) diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 16331af..7c9c4cc 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -211,3 +211,12 @@ h2 { font-size: 0.9rem; } + +.pagination { + .current { + background-color: #00458F; + color: white; + font-style: normal; + padding: 3px; + } +} diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index 4cde975..77573f6 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -17,6 +17,7 @@ class FeedsController < ApplicationController # GET /feeds/1.json def show @feed = Feed.find(params[:id]) + @posts = @feed.posts.sort(:published.desc).paginate(:page => params[:page], :per_page => 20) respond_to do |format| format.html # show.html.erb diff --git a/app/views/feeds/show.html.haml b/app/views/feeds/show.html.haml index 3245673..fe65166 100644 --- a/app/views/feeds/show.html.haml +++ b/app/views/feeds/show.html.haml @@ -25,7 +25,7 @@ ago %table#feed - - @feed.posts.each do |p| + - @posts.each do |p| %tr %td= link_to p.title, p.url %td= link_to "Map", "https://maps.google.co.uk/maps?q=%s,%s&hl=en&z=18" % [ p.loc['lat'], p.loc['lng'] ], :target => "_blank" @@ -33,3 +33,4 @@ - unless p.published.nil? = p.published.strftime("%d %b %Y %H:%M") += will_paginate @posts