andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into calendar

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-12 13:31:47 +02:00
parent 350dc6d8c2 501a4f3903
commit 2d82aa79f6
13 changed files with 76 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/lvas/_form.html.erb
View File

@@ -8,8 +8,11 @@
<div class="span9">
<div class="form-group">
<div class="row-fluid">
<%= f.input :name, :wrapper_html=>{:class=>'span5'}%>
<%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>Lva::ERLAUBTE_TYPEN, :wrapper_html=>{:class=>'span2'}%>
<%= f.input :name, :wrapper_html=>{:class=>'span10'}%>
</div>
<div class="row-fluid">
<div class="span7"%>
<div class="row-fluid">
<%= f.input :lvanr, :wrapper_html=>{:class=>'span4'}%>

2
app/views/lvas/show.html.erb
View File

@@ -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 %>