From 6a4d2ff536a1d6dc4231635a3375a348a8b4f888 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 4 Oct 2014 09:49:19 +0200
Subject: [PATCH] meta tags neuigkeit

---
 Gemfile                                |  4 ++--
 Gemfile.lock                           | 29 ++++++++++++++++++--------
 app/controllers/rubriken_controller.rb |  2 +-
 app/views/neuigkeiten/show.html.erb    | 12 +++++++++++
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index c7dd22e..c89b9cc 100755
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ gem "tinymce-rails" , '~>4.1.0'
 gem "globalize" ,'~>3.0.4'#,:git =>'git://github.com/globalize/globalize.git'
 gem 'globalize-versioning'
 # Version controll
-gem "paper_trail" , '~>3.0.5', :git=>'git://github.com/airblade/paper_trail.git'
+gem "paper_trail" , '~>3.0.5'#, :git=>'git://github.com/airblade/paper_trail.git'
 
 # User management
 gem "devise" ,'~>2.2.3'
@@ -63,7 +63,7 @@ gem "omniauth-facebook"
 gem "omniauth-ldap"
 
 gem "fb_graph"
-
+gem "meta-tags"
 # Roles for users
 gem "rolify"
 # Abilities
diff --git a/Gemfile.lock b/Gemfile.lock
index b4e46ea..b85cb39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
 GIT
-  remote: git://github.com/airblade/paper_trail.git
-  revision: 802b7d4ead71703860fcb9befc2c9b2ee05a8b9f
+  remote: git://github.com/matenia/bootstrap-kaminari-views.git
+  revision: 411876644d4231433ed73af8655affa33a35eadc
   specs:
-    paper_trail (3.0.0)
-      activerecord (>= 3.0, < 5.0)
-      activesupport (>= 3.0, < 5.0)
+    bootstrap-kaminari-views (0.0.5)
+      kaminari (>= 0.13)
+      rails (>= 3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -94,8 +94,8 @@ GEM
       railties (>= 3.2, < 5.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    formtastic-bootstrap (2.1.3)
-      formtastic (~> 2.2)
+    formtastic-bootstrap (3.0.0)
+      formtastic (>= 2.2)
     git (1.2.6)
     github-markup (0.7.5)
     gitlab-grit (2.6.0)
@@ -136,10 +136,15 @@ GEM
     json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
+    kaminari (0.16.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    meta-tags (2.0.0)
+      actionpack (>= 3.0.0)
     mime-types (1.25.1)
     mini_portile (0.5.2)
     multi_json (1.8.4)
@@ -168,6 +173,9 @@ GEM
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
     orm_adapter (0.5.0)
+    paper_trail (3.0.5)
+      activerecord (>= 3.0, < 5.0)
+      activesupport (>= 3.0, < 5.0)
     paperclip (3.4.2)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
@@ -277,6 +285,7 @@ DEPENDENCIES
   annotate (>= 2.5.0)
   awesome_nested_set
   bootstrap-addons-rails
+  bootstrap-kaminari-views!
   bootstrap-sass (~> 2.3.2.1)
   cancan
   carrierwave (~> 0.9.0)
@@ -287,7 +296,7 @@ DEPENDENCIES
   fb_graph
   font-awesome-rails
   formtastic (~> 2.2.1)
-  formtastic-bootstrap (~> 2.1.3)
+  formtastic-bootstrap (~> 3.0.0)
   git
   globalize (~> 3.0.4)
   globalize-versioning
@@ -297,11 +306,13 @@ DEPENDENCIES
   jquery-fileupload-rails
   jquery-rails
   jquery-ui-rails (~> 4.1.1)
+  kaminari
+  meta-tags
   mysql2
   omniauth
   omniauth-facebook
   omniauth-ldap
-  paper_trail (>= 2.7.0)!
+  paper_trail (~> 3.0.5)
   paperclip (~> 3.4.0)
   rails (= 3.2.13)
   rmagick
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 0ccc5fe..8f8857b 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -33,7 +33,7 @@ class RubrikenController < ApplicationController
     if can?(:showunpublished, Neuigkeit)
       @neuigkeiten = @rubrik.neuigkeiten.page(params[:page]).per(3)
     else
-      @neuigkeiten = @rubrik.neuigkeiten.published..page(params[:page]).per(3)
+      @neuigkeiten = @rubrik.neuigkeiten.published.page(params[:page]).per(3)
     end
     @toolbar_elements << {:text=>I18n.t('neuigkeit.new.title'), :path=> new_rubrik_neuigkeit_path(@rubrik),:hicon=>'icon-plus-sign'} if can? :verwalten, @rubrik
     @toolbar_elements << {:text=>I18n.t('common.verwalten'), :path=>verwalten_rubrik_path(@rubrik),:icon=>:pencil} if can? :verwalten, @rubrik
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 66b2e13..0f6d05f 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -1,3 +1,15 @@
+<%= content_for :header do %>
+<title>Fetsite - <%=  @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>)</title>
+<% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) %>
+<% set_meta_tags :og => {
+    :image => @neuigkeit.picture.url.to_s,
+    :title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")",
+    :type => "article"
+}
+%>
+<%= display_meta_tags %>
+<% end %>
+
 <%= render 'rubriken/tabs' %>
 <div class="content-column content-wrap">
 <p id="notice"><%= notice %></p>