Merge branch 'master' into calendar

2013-08-12 13:31:47 +02:00
parent 350dc6d8c2 501a4f3903
commit 2d82aa79f6
13 changed files with 76 additions and 55 deletions
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -3,7 +3,7 @@
  <p id="notice"><%= notice %></p>
  <div class="row-fluid">
    <div class="span8">
-      <h1><%= @lva.name %></h1>
+      <h1><%=@lva.typ.to_s + ' ' +  @lva.name %></h1>
      <h2>Prüfungsinformation</h2>
      <div class="lva-beschreibung">
 	<%= @lva.pruefungsinformation %>