bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merge layout formular moduls & studien

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-10 14:29:36 +02:00
parent c31c530e62
commit 116446ff63
2 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/views/moduls/_form.html.erb
View File

@@ -1,15 +1,30 @@
<div class="container-fluid">
<%= semantic_form_for @modul do |f| %>
<%= semantic_form_for @modul do |f| %>
<%= f.inputs do %> <%= f.inputs do %>
<% # f.input :modulgruppen,:as => :select, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}] %> <div class="row-fluid">
<%= f.input :modulgruppen %> <div class="span9">
<%= f.input :name ,:hint=>true%> <%= f.input :name ,:hint=>true%>
<%= f.input :desc, :as=>:tinymce_text %> <div class="row-fluid">
<%= f.input :depend %> <div class="span8">
<%= f.input :desc, :as=>:tinymce_text %>
</div>
<div class="span4">
<%= f.input :depend %>
</div>
</div>
</div>
<div class="span3">
<%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
</div>
</div>
<% end %> <% end %>
<%= f.actions do %> <%= f.actions do %>
<%= f.action :submit, :as => :input %> <%= f.action :submit, :as => :input %>
<% end %> <% end %>
<% end %>
<% end %>
</div>
<%= tinymce %> <%= tinymce %>

29
app/views/studien/_form.html.erb
View File

@@ -1,13 +1,28 @@
<div class="container-fluid">
<%= tinymce_assets %> <%= tinymce_assets %>
<%= semantic_form_for @studium do |f| %> <%= semantic_form_for @studium do |f| %>
<div class="span9">
<%= f.inputs do %> <%= f.inputs do %>
<%= f.input :zahl %>
<%= f.input :name,:append=>"NAME" %> <div class="row-fluid">
<div class="span6">
<%= f.input :name,:append=>"NAME" %>
</div>
<div class="span3">
<%= f.input :zahl %>
</div>
<div class="span3">
<%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>["Bachelor","Master"]%>
</div>
</div>
<div class="row-fluid">
<%= f.input :desc, :as=>:tinymce_text %> <%= f.input :desc, :as=>:tinymce_text %>
<%= f.input :typ, :as=>:radio, :collection=>["Bachelor","Master"]%> </div>
<% end %> <% end %>
<%= tinymce %> <%= tinymce %>
<%= f.actions do %> <%= f.actions do %>
<%= f.action :submit, :as => :input %> <%= f.action :submit, :as => :input %>
<% end %> <% end %>
<% end %> </div>
<% end %>
</div>