forked from bofh/fetsite
88ba8fa1c2
Conflicts: app/assets/stylesheets/formtastic-changes.css.scss app/controllers/beispiele_controller.rb app/views/studien/_form.html.erb config/locales/de.yml config/routes.rb
42 lines
895 B
Plaintext
Executable File
42 lines
895 B
Plaintext
Executable File
<div class="container-fluid">
|
|
<%= tinymce_assets %>
|
|
<%= semantic_form_for @studium do |f| %>
|
|
<<<<<<< HEAD
|
|
|
|
<%= f.inputs do %>
|
|
=======
|
|
<div class="span9">
|
|
<%= f.inputs do %>
|
|
|
|
>>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
|
|
<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 %>
|
|
</div>
|
|
<<<<<<< HEAD
|
|
|
|
=======
|
|
>>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
|
|
<% end %>
|
|
<%= tinymce %>
|
|
<%= f.actions do %>
|
|
<%= f.action :submit, :as => :input %>
|
|
<% end %>
|
|
<<<<<<< HEAD
|
|
|
|
=======
|
|
</div>
|
|
>>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
|
|
<% end %>
|
|
</div>
|