andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:fetsite/fetsite

Browse Source 
Conflicts:
	app/controllers/application_controller.rb
This commit is contained in:
Andreas Stephanides
2014-11-10 20:23:47 +01:00
parent 24c76a7f5d 9f61769425
commit 02eba03439
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@@ -22,6 +22,7 @@
stored_location_for(resource) || root_path stored_location_for(resource) || root_path
end end
end end
rescue_from CanCan::AccessDenied do |exception| rescue_from CanCan::AccessDenied do |exception|
if user_signed_in? if user_signed_in?
@@ -37,6 +38,7 @@
end end
def get_theme def get_theme
if ThemesForRails.available_theme_names.include?(params[:theme]) if ThemesForRails.available_theme_names.include?(params[:theme])
params[:theme] params[:theme]

7
app/views/neuigkeiten/show.html.erb
View File

@@ -1,8 +1,13 @@
<%= content_for :header do %> <%= content_for :header do %>
<title>Fetsite - <%= @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>)</title> <title>Fetsite - <%= @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>)</title>
<% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %> <% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %>
<% unless @neuigkeit.picture.url.nil?
picture_url=URI(root_url)
picture_url.path=@neuigkeit.picture.url
end
%>
<% set_meta_tags :og => { <% set_meta_tags :og => {
:image => image_url(@neuigkeit.picture.to_s,:theme=>nil), :image => picture_url.to_s,
:title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")", :title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")",
:type => "article", :type => "article",
:description =>@neuigkeit.text_first_words, :description =>@neuigkeit.text_first_words,