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

Merge remote-tracking branch 'thomasb/master'

Browse Source 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
This commit is contained in:
Andreas Stephanides
2013-08-12 11:11:59 +02:00
parent a02a99b307 0736320be6
commit 4aca98c0f5
44 changed files with 791 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,44 @@
<%= semantic_form_for @lva do |f| %>
<%= f.inputs do %>
<%= f.input :semester, :collection=>Semester.all.sort_by{|n| [:name]}%>
<%= f.input :modul %>
<%= f.input :name %>
<%= f.input :ects %>
<%= f.input :stunden %>
<%= f.input :desc %>
<%= f.input :lvanr %>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<%= semantic_form_for @lva do |f| %>
<div class="row-fluid">
<%= f.inputs do %>
<div class="span9">
<div class="row-fluid">
<div class="span9">
<div class="form-group">
<div class="row-fluid">
<%= f.input :name, :wrapper_html=>{:class=>'span5'}%>
<div class="span7"%>
<div class="row-fluid">
<%= f.input :lvanr, :wrapper_html=>{:class=>'span4'}%>
<%= f.input :ects, :wrapper_html=>{:class=>'span4'} %>
<%= f.input :stunden, :wrapper_html=>{:class=>'span4'} %>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="row-fluid">
<%= f.input :desc %>
</div></div>
</div>
<div class="span3">
<h1> BILD </h1>
<%= f.input :modul, :as=>:check_boxes%>
</div>
</div>
</div>
<div class="span3">
<%= f.input :semester, :as=>:check_boxes%>
</div>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>

5
app/views/lvas/_lva_semester.html.erb
View File

@@ -1,10 +1,9 @@
<p class="lva_semester">
<div class="lva-semester">
<b><%= link_to lva.name, lva_path(lva)%></b><br>
Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
<br>
<%="LVa-Nr " + lva.lvanr.to_s %>
<%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
<%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %>
</p class="lva_semester">
<% #toolbar_html(@toolbar_elements) %>
</div class="lva-semester">

8
app/views/lvas/index.html.erb
View File

@@ -1,8 +1,10 @@
<div class="container-fluid">
<%= render :partial=>'layouts/topbar', :object=>@tb %>
<h1><%= I18n.t("lva.list")%></h1>
<ul>
<div class="row-fluid">
<% @lvas.each do |l| %>
<li><%= render :partial => 'lvas/lva_semester', :locals=> {:lva => l} %>
<div><%= render :partial => 'lvas/lva_semester', :locals=> {:lva => l} %></div>
<%end%>
</ul>
</div>
<%= render 'layouts/pretty_toolbar' %>
</div>

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

@@ -1,10 +1,17 @@
<%= render 'layouts/topbar'%>
<p id="notice"><%= notice %></p>
<p>
<div class="container-fluid">
<%= render 'studien/tabs'%>
<p id="notice"><%= notice %></p>
<h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
</p>
<div class="row-fluid">
<div class="span8">
<h1><%= @lva.name %></h1>
<h2>Beschreibung</h2>
<div class="lva-beschreibung">
<%= @lva.desc %>
</div>
<div class="row-fluid">
<h2>Beispiele</h2>
<p><h4>Beschreibung</h4>
<%= @lva.desc %>
@@ -15,22 +22,35 @@
<ul>
<% @lva.beispiele.each do |b|%>
<li><%= render b%></li>
<% end %>
</ul>
<h4>Module</h4>
<ul>
<% @lva.modul.each do |modul| %>
<li><b><%= link_to modul.name , modul_path(modul)%></b>
<%= render b%>
<% end %>
</div>
</div>
<div class="span4">
<div class="lva-sidebar">
<ul>
<% modul.modulgruppen.each do |g| %>
<li><b>LVA-Nummer:</b> <%=@lva.lvanr %></li>
<li><b>ECTS:</b> <%=@lva.ects %></li>
<li><b>Stunden:</b> <%=@lva.ects %></li>
</ul>
<h2>Module</h2>
<ul>
<% @lva.modul.each do |modul| %>
<li><b><%= link_to modul.name , modul_path(modul)%></b>
<ul>
<% modul.modulgruppen.each do |g| %>
<li><%= link_to g.studium.name , studium_semesteransicht_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
<% end %>
</ul>
</li>
<% end %>
</ul>
<%= render 'layouts/pretty_toolbar' %>
<li><%= link_to g.studium.name , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
<% end %>
</ul>
</li>
<% end %>
</ul>
</div>
</div>
</div>
<%= render 'layouts/pretty_toolbar' %>
</div>