diff --git a/.gitignore b/.gitignore
index 987aa9b..30e4cc6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ console
/public/uploads/
/vendor/*
/bak/*
+/solr/*
*#
Gemfile.lock
/config/database.yml
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f15c483..e2b42f1 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -15,6 +15,7 @@
//= require jquery.ui.all
// require jquery.ui.draggable
// require jquery.ui.sortable
+// require jquery.ui.gallery
// require jquery.sortable
// require jquery-ui
//= require_tree .
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 530d4e9..ba86a56 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -55,7 +55,7 @@ class Ability
#-----------------------------------------------------
# Rechteverwaltung fuer Fotos
- can [:show,:index], Gallery
+# can [:show,:index], Gallery
if loggedin
end
if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index 866cb66..9b33949 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -1,3 +1,23 @@
+<%= content_for :header do %>
+
diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index 5a38c19..88ddcc2 100644
--- a/app/views/galleries/show.html.erb
+++ b/app/views/galleries/show.html.erb
@@ -75,5 +75,9 @@
+
+
+
+
diff --git a/app/views/home/search.html.erb b/app/views/home/search.html.erb
index c8051e6..58a4d2e 100644
--- a/app/views/home/search.html.erb
+++ b/app/views/home/search.html.erb
@@ -1,6 +1,6 @@
-
-<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form",:class=>"navbar-search", :method=>'get'} do |f| %>
+
+<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %>
<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
@@ -8,13 +8,10 @@
<% end %>
-
-
+
+
<%= render :partial=>"home/search_results" %>
-
-
-
diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb
index 423f661..04b795c 100644
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -15,7 +15,9 @@
<%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %>
<%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %>
+<% if can? :index, Gallery %>
<%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %>
+<% end %>
<%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
<%= link_to I18n.t("home.search"), search_home_index_path %>
<%= link_to I18n.t("home.kontakt"), kontakt_home_index_path %>
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 80140bf..9e13231 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -6,6 +6,7 @@
:title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")",
:type => "article",
:description =>@neuigkeit.text_first_words,
+:url=>neuigkeit_path(:theme=>nil),
:article=> {
:author=>@neuigkeit.author.text
}
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 1a58ce4..5e86fde 100755
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -1,5 +1,12 @@
<%= content_for :header do %>
Fetsite - <%= I18n.t('home.news') %>
+<% set_meta_tags :og => {
+:title => "Fetsite - "+I18n.t('home.news'),
+:url=> rubriken_path(:theme=>nil)
+}
+%>
+<%= display_meta_tags %>
+
<% end %>
<%= render 'tabs' %>
<%= notice %>
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index 5a6e478..8a2f395 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -1,5 +1,12 @@
<%= content_for :header do %>
Fetsite - <%= @rubrik.name %>
+<% set_meta_tags :og => {
+:title => @rubrik.name.to_s,
+:url=> rubrik_path(@rubrik,:theme=>nil)
+}
+%>
+<%= display_meta_tags %>
+
<% end %>
<%= render 'tabs' %>
<%= notice %>
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index 3764af0..31f4f67 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -1,3 +1,15 @@
+<%= content_for :header do %>
+
Fetsite - <%= @themengruppe.title %>
+<% set_meta_tags :og => {
+:title => @themengruppe.title.to_s,
+:url=> themengruppe_path(@themengruppe,:theme=>nil,:locale=>nil)
+}
+%>
+<%= display_meta_tags %>
+
+
+<% end %>
+
<% if @themengruppe.public %>