studien

app/controllers/gremien_controller.rb

@@ -94,7 +94,7 @@ class GremienController < ApplicationController
             @memberships<< Membership.new
             @memberships<< Membership.new
             render action: "edit", notice: 'gremium was successfully updated.'
-
+          end
           }
         format.json { head :no_content }
       else
@@ -105,7 +105,8 @@ class GremienController < ApplicationController
   end
 
   # DELETE /gremien/1
-  # DELETE /gremien/1.json
+  # 
+  #
   def destroy
     @gremium = Gremium.find(params[:id])
     @gremium.destroy

app/controllers/studien_controller.rb

@@ -34,7 +34,7 @@ class StudienController < ApplicationController
     @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('common.edit'),:path => edit_lvas_studium_path(@studium)} if can? :edit_lvas, 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

app/views/studien/_semesteransicht.html.erb

@@ -16,4 +16,4 @@
   </div>
   <% end %>
 </div>
- <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
+

app/views/studien/show.html.erb

@@ -22,12 +22,10 @@
   </p>
   <% else %>
   <%= render partial: 'semesteransicht' %>
+  <% end %> 
+  <% end %> <% end %>
 
-
-    
-
-    <% end %>  <% end %>  <% end %>
-
-  <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
+  <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+  <br>
   <%= render 'layouts/pretty_toolbar' %>
 </div>

app/views/themengruppen/_themengruppe.html.erb

@@ -1,4 +1,4 @@
-<%= link_to themengruppe,{:class=>'linkbox color-4-dark'} do %>
+<%= link_to themengruppe,{:class=>'linkbox color-1-dark'} do %>
 <div class="row-fluid">
   <div class="span12">
     <div class="media">

config/locales/studien.de.yml

@@ -18,6 +18,7 @@ de:
   lva:
     add: "Lva hinzufügen"
     addrem: "Lva hinzufügen/entfernen"
+    editlvas: "Lvas bearbeiten"
     list: "Alle Lvas"
   modulgruppe:
     typ: "Typ"