diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index 9156f16..da15ac6 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -32,13 +32,13 @@ class StudienController < ApplicationController
@studienphasen << {:modulgruppen=>modulgruppen, :phase => ph}.merge(opts)
end
@toolbar_elements=[]
- @toolbar_elements<<{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) } if can? :new, Studium
+
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)} if can? :edit, Studium
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('lva.editlvas'),:path => edit_lvas_studium_path(@studium)} if can? :edit_lvas, Studium
@toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>'Sure?' } if can? :delete, Studium
@toolbar_modulgruppen =[]
@toolbar_modulgruppen << {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)} if can? :new, Modulgruppe
- @toolbar_modulgruppen << {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path} if can? :index, Modulgruppe
+ #@toolbar_modulgruppen << {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path} if can? :index, Modulgruppe
case params[:ansicht]
when 'semesteransicht'
when 'infoansicht'
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index 22423e1..9a3105d 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -1,3 +1,12 @@
+<%= content_for :header do %>
+
<%= "Fetsite - "+I18n.t('home.mitarbeiter') %>
+<% set_meta_tags :og => {
+:title => "Fetsite - "+I18n.t('home.mitarbeiter'),
+:url=> themengruppen_path(:theme=>nil)
+}
+%>
+<%= display_meta_tags %>
+<% end %>
<%= render 'fetprofiles/tabs' %>
diff --git a/app/views/studien/_semesteransicht.html.erb b/app/views/studien/_semesteransicht.html.erb
index 37a9d1b..5cd2dd1 100644
--- a/app/views/studien/_semesteransicht.html.erb
+++ b/app/views/studien/_semesteransicht.html.erb
@@ -1,10 +1,6 @@
-<% if params[:info].true? %>
+
<%= raw(@studium.desc) %>
-<% else %>
-<%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
-<% end %>
-
<% @studium.semester.each_slice(2) do |row| %>
diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb
index 2a72e1d..2a36167 100755
--- a/app/views/studien/index.html.erb
+++ b/app/views/studien/index.html.erb
@@ -1,3 +1,15 @@
+
+<%= content_for :header do %>
+
<%= "Fetsite - "+I18n.t('home.studien') %>
+<% set_meta_tags :og => {
+:title => "Fetsite - "+I18n.t('home.studien'),
+:url=> themengruppen_path(:theme=>nil)
+}
+%>
+<%= display_meta_tags %>
+<% end %>
+
+
<%= render 'studien/tabs' %>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 020cec1..064ccc6 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -7,7 +7,13 @@
<%= notice %>
<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
+
+
+
+ <%= render 'layouts/pretty_toolbar' %>
+<%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+
<%= link_to I18n.t("studien.ansicht.semester"), studium_path(@studium, :ansicht=>"semesteransicht"), :class=>"btn" unless params[:ansicht]=='semesteransicht' %>
<%= link_to I18n.t("studien.ansicht.modulgruppe"), studium_path(@studium, :ansicht=>"modulgruppenansicht"), :class=>"btn" unless params[:ansicht]=='modulgruppenansicht' %>
@@ -29,7 +35,4 @@
<% end %>
<% end %> <% end %>
- <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
-
- <%= render 'layouts/pretty_toolbar' %>
diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb
index f2cc8a9..7d71d9c 100644
--- a/app/views/themengruppen/index.html.erb
+++ b/app/views/themengruppen/index.html.erb
@@ -1,3 +1,14 @@
+<%= content_for :header do %>
+
<%= "Fetsite - "+I18n.t('home.info') %>
+<% set_meta_tags :og => {
+:title => "Fetsite - "+I18n.t('home.info'),
+:url=> themengruppen_path(:theme=>nil)
+}
+%>
+<%= display_meta_tags %>
+<% end %>
+
+
<%= render :partial=>'layouts/pretty_toolbar' %>