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

.gitignore

@@ -32,6 +32,7 @@ console
 /public/uploads/
 /vendor/*
 /bak/*
+/solr/*
 *#
 Gemfile.lock
 /config/database.yml

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 .

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"))

app/views/fetprofiles/show.html.erb

@@ -1,3 +1,23 @@
+<%= content_for :header do %>
+<title>Fetsite - <%=  @fetprofile.name %></title>
+
+<% set_meta_tags :og => {
+    :image => @fetprofile.picture.portrait.url.to_s,
+    :title => @fetprofile.name.to_s ,
+    :type => "profile",
+    :url=>fetprofile_path(@fetprofile,:theme=>nil),
+:profile=> {
+  :first_name=>@fetprofile.vorname,
+  :last_name=>@fetprofile.nachname
+  }
+}
+%>
+<% set_meta_tags :og=>{:article=> {:published_time=>I18n.l(@neuigkeit.try(:datum).try(:to_date)) }} unless @neuigkeit.try(:datum).try(:to_date).nil? %>
+
+<%= display_meta_tags %>
+<% end %>
+
+
 <%= render 'fetprofiles/tabs' %>
 <p id="notice"><%= notice %></p>
 <div style="max-width:70em">

app/views/galleries/show.html.erb

@@ -75,5 +75,9 @@
 <script src="js/load-image.js"></script>
 <script src="js/bootstrap-image-gallery.js"></script>
 <script type="text/javascript">
-  //$('#modal-gallery.fade').css('top', '50%');
+  $('#modal-gallery.fade').css('top', '50%');
 </script>
+
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+<script src="//blueimp.github.io/Gallery/js/jquery.blueimp-gallery.min.js"></script>
+<script src="js/bootstrap-image-gallery.min.js"></script>

app/views/home/search.html.erb

@@ -1,6 +1,6 @@
 <div class="content-wrap content-column">
-<p>
+<div>
-<%= 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 %>
 
-</p>
+</div>
-<p>
+
 
 <div id="searchresults">
 <%= render :partial=>"home/search_results" %>
 </div>
-
-
-</p>
 </div>

app/views/layouts/menu.html.erb

@@ -15,7 +15,9 @@
 	    
 	  <li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
 	  <li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %></li>
+<% if can? :index, Gallery %>
 	  <li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %></li>
+<% end %>
 	  <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
 	  <li> <%= link_to I18n.t("home.search"), search_home_index_path %></li>
 <li> <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path %></li>

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
   }

app/views/rubriken/index.html.erb

@@ -1,5 +1,12 @@
 <%= content_for :header do %>
 <title>Fetsite - <%= I18n.t('home.news') %></title>
+<% set_meta_tags :og => {
+:title => "Fetsite - "+I18n.t('home.news'),
+:url=> rubriken_path(:theme=>nil)
+}
+%>
+<%= display_meta_tags %>
+
 <% end %>
 <%= render 'tabs' %>
 <p id="notice"><%= notice %></p>

app/views/rubriken/show.html.erb

@@ -1,5 +1,12 @@
 <%= content_for :header do %>
 <title>Fetsite - <%= @rubrik.name %></title>
+<% set_meta_tags :og => {
+:title => @rubrik.name.to_s,
+:url=> rubrik_path(@rubrik,:theme=>nil)
+}
+%>
+<%= display_meta_tags %>
+
 <% end %>
 <%= render 'tabs' %>
 <p id="notice"><%= notice %></p>

app/views/themengruppen/show.html.erb

@@ -1,3 +1,15 @@
+<%= content_for :header do %>
+<title>Fetsite - <%= @themengruppe.title %></title>
+<% set_meta_tags :og => {
+:title => @themengruppe.title.to_s,
+:url=> themengruppe_path(@themengruppe,:theme=>nil,:locale=>nil)
+}
+%>
+<%= display_meta_tags %>
+
+
+<% end %>
+
 <div class="content-wrap content-column" >
   <ul class="linklist">
     <% if @themengruppe.public %>