forked from bofh/fetsite
Merge remote-tracking branch 'thomasb/master'
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:
@@ -1 +1,4 @@
|
||||
<%=link_to beispiel.name, beispiel.beispieldatei.url%>
|
||||
<div class="lva-beispiele">
|
||||
<h4><%=link_to beispiel.name, beispiel.beispieldatei.url%></h4>
|
||||
<%= beispiel.desc %>
|
||||
</div>
|
||||
|
||||
@@ -1,13 +1,25 @@
|
||||
<%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
|
||||
<%= f.inputs do %>
|
||||
<%= f.input :name %>
|
||||
<%= f.input :desc %>
|
||||
<%= f.file_field :beispieldatei %>
|
||||
<%= f.hidden_field :beispieldatei_cache %>
|
||||
<%= f.input :lva, :as=>:select, :collection => Lva.all%>
|
||||
<% end %>
|
||||
|
||||
<%= f.actions do %>
|
||||
<%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
|
||||
|
||||
<%= f.inputs do %>
|
||||
<%= f.hidden_field :beispieldatei_cache %>
|
||||
|
||||
<%= f.file_field :beispieldatei, :wrapper_html=>{:class=>"span4"}%>
|
||||
<div class="row-fluid">
|
||||
<%= f.input :name, :wrapper_html=>{:class=>'span6'} %>
|
||||
<%= f.input :lva, :as=>:select, :collection => Lva.all, :wrapper_html=>{:class=>'span6'}%>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row-fluid">
|
||||
<%= f.input :desc %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= f.actions do %>
|
||||
<%= f.action :submit, :as => :input %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% end %>
|
||||
|
||||
<% end %>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<h1><%= I18n.t("beispiele.list")</h1>
|
||||
<h1><%= I18n.t("beispiele.list") %></h1>
|
||||
<ul>
|
||||
<% @beispiele.each do |beispiel| %>
|
||||
<li>
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
<%= @beispiel.desc %>
|
||||
<%= @beispiel.beispieldatei.url %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<%= @beispiel.lva.name %>
|
||||
</p>
|
||||
|
||||
<%= link_to 'Edit', edit_beispiel_path(@beispiel) %> |
|
||||
<%= link_to 'Back', beispiele_path %>
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
<!--
|
||||
Verwendung: Aufruf mit
|
||||
< % = render 'layouts/pretty_toolbar % > verwendet die Elemente die im Controller per @toolbar_elements vorgegeben werden. Sonst kann man über
|
||||
< % = render :partial=>'layouts/pretty_toolbar', :object=>@foo % > einen beliebigen array @foo übergeben
|
||||
|
||||
-->
|
||||
<% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
|
||||
<span class="label"><%= I18n.t("common.actions")%></span>
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
<!--
|
||||
Verwendung: Aufruf mit
|
||||
< % = render 'layouts/topbar % > verwendet die Elemente die im Controller per @topbar_elements vorgegeben werden. Sonst kann man über
|
||||
< % = render :partial=>'layouts/topbar', :object=>@foo % > einen beliebigen array @foo übergeben
|
||||
|
||||
-->
|
||||
|
||||
|
||||
<% topbar = !topbar.nil? ? topbar : @topbar_elements %>
|
||||
<ul class="breadcrumb">
|
||||
<% topbar.each do |tb| %>
|
||||
|
||||
@@ -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 %>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -1,13 +1,29 @@
|
||||
<%= semantic_form_for @modulgruppe do |f| %>
|
||||
<%= f.inputs do %>
|
||||
<%= f.input :studium_id, :as =>:select, :collection => Studium.all %>
|
||||
<%= f.input :typ ,:as => :radio, :collection=>["Pflicht","Vertiefungspflicht","Wahl"]%>
|
||||
<%= f.input :phase,:as => :radio,:collection=>1..3 %>
|
||||
<%= f.input :name %>
|
||||
<%= f.input :desc,:input_html=>{:rows=> 3 }%>
|
||||
<% end %>
|
||||
<%= f.inputs do %>
|
||||
<div class="span8">
|
||||
|
||||
<%= f.actions do %>
|
||||
<%= f.action :submit, :as => :input %>
|
||||
<div class="row-fluid">
|
||||
<%= f.input :name, :wrapper_html=>{:class=>"span12"}%>
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
<%= f.input :studium_id, :as =>:select, :collection => Studium.all, :wrapper_html=>{:class=>"span4"} %>
|
||||
<%= f.input :typ, :collection=>["Pflicht","Vertiefungspflicht","Wahl"], :wrapper_html=>{:class=>"span4"}%>
|
||||
<%= f.input :phase, :as=>:select, :collection=>1..3, :wrapper_html=>{:class=>"span4"} %>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row-fluid">
|
||||
<%= f.input :desc %>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="span4">
|
||||
<%= f.input :moduls, :as=>:check_boxes %>
|
||||
</div>
|
||||
<% end %>
|
||||
<%= f.actions do %>
|
||||
<%= f.action :submit, :as => :input %>
|
||||
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
1
app/views/modulgruppen/_kurz.html.erb
Normal file
1
app/views/modulgruppen/_kurz.html.erb
Normal file
@@ -0,0 +1 @@
|
||||
<b><%=link_to modulgruppe.name, modulgruppe %></b> <%= ' ( ' + modulgruppe.studium.name + ')' unless modulgruppe.studium.nil? %>
|
||||
@@ -8,10 +8,5 @@
|
||||
|
||||
<% link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_modulgruppe_path(modulgruppe) %>
|
||||
<!-- dropdown menu links -->
|
||||
|
||||
</ul>
|
||||
|
||||
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
<% @modulgruppe.moduls.each do |modul| %>
|
||||
<%= render modul%>
|
||||
<%= render 'moduls/kurz', :modul=>modul%>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,26 +1,23 @@
|
||||
<div style="border: solid 1px; padding:2px"><p>
|
||||
<b><%=
|
||||
if modul.name.nil?
|
||||
name=""
|
||||
else
|
||||
name=modul.name
|
||||
end
|
||||
link_to "Modul "+name , modul_path(modul) %> </b>
|
||||
</p>
|
||||
|
||||
<h1><%=@modul.name %></h1>
|
||||
|
||||
|
||||
<h2>Beschreibung </h2>
|
||||
<p>
|
||||
<%= raw(modul.desc) %>
|
||||
<%= raw(@modul.desc) %>
|
||||
</p>
|
||||
LVAs:
|
||||
|
||||
<ul>
|
||||
|
||||
<% modul.lvas.each do |lv| %>
|
||||
<li>
|
||||
<%= link_to lv.name.to_s, lva_path(lv.id) %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
|
||||
<% # @toolbar_elements << {:icon=>:pencil,:text=>I18n.t("common.edit"),:path=> edit_modul_path(modul)} %>
|
||||
<h2>Lvas</h2>
|
||||
<% @modul.lvas.each_slice(3) do |row| %>
|
||||
<div class="row-fluid">
|
||||
<% row.each do |lv| %>
|
||||
<div class="span4">
|
||||
<%= render 'lvas/lva_semester', :lva=>lv%>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
<h2>Modulgruppen</h2>
|
||||
<% @modul.modulgruppen.each do |mg| %>
|
||||
<%= render 'modulgruppen/kurz', :modulgruppe=>mg %><br>
|
||||
<% end %>
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
<div class="container-fluid">
|
||||
|
||||
<%= render 'layouts/topbar' %>
|
||||
<h1><%= I18n.t("modul.list") %></h1>
|
||||
|
||||
<div class="fluid-row">
|
||||
<%= render :partial=>'moduls/lang', :collection=>@moduls, :as=>:modul%>
|
||||
|
||||
<br>
|
||||
</div>
|
||||
<%= render 'layouts/pretty_toolbar'%>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
<%= render 'layouts/topbar'%>
|
||||
<%= render 'layouts/topbar', :topbar=>@tb%>
|
||||
|
||||
<%= render 'studien/tabs'%>
|
||||
<p id="notice"><%= notice %></p>
|
||||
<%= render @modul %>
|
||||
|
||||
<%= render 'layouts/pretty_toolbar' %>
|
||||
<% # link_to 'Add LVA', %>
|
||||
<% # link_to '<i class="icon-pencil"></i>'.html_safe+ I18n.t("common.edit") , edit_modul_path(@modul) %>
|
||||
<% # link_to "Loeschen", [@modul],:method=>:delete ,:data => {:confirm =>"Are you sure" } %>
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
<%= semantic_form_for @semester do |f| %>
|
||||
<%= f.inputs do %>
|
||||
<%= f.input :name %>
|
||||
<%= f.input :nummer %>
|
||||
<%= f.input :ssws %>
|
||||
<%= f.input :lvas %>
|
||||
<%= f.input :lvas, :as=>:check_boxes%>
|
||||
<% end %>
|
||||
|
||||
<%= f.actions do %>
|
||||
<%= f.action :submit, :as => :input %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<%= link_to 'Zurück',@studium, :class=>"btn"%>
|
||||
x
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
<h1>Editing semester</h1>
|
||||
<h1><%=@semester.name%></h1>
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= link_to 'Show', @semester %> |
|
||||
<%= link_to 'Back', semesters_path %>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="container-fluid">
|
||||
<%= tinymce_assets %>
|
||||
<%= semantic_form_for @studium do |f| %>
|
||||
<div class="span9">
|
||||
|
||||
<%= f.inputs do %>
|
||||
|
||||
<div class="row-fluid">
|
||||
@@ -18,11 +18,12 @@
|
||||
<div class="row-fluid">
|
||||
<%= f.input :desc, :as=>:tinymce_text %>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
<%= tinymce %>
|
||||
<%= f.actions do %>
|
||||
<%= f.action :submit, :as => :input %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
<div class="studium">
|
||||
<h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%></h2>
|
||||
<ul>
|
||||
<li><b><%= studium.typ%> </b></li>
|
||||
<li><b>Beschreibung:</b><br>
|
||||
<%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%></li>
|
||||
<li><%=link_to "Link zur Modulgruppenansicht",studium_path(studium) %> </li>
|
||||
</ul>
|
||||
<h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_path(studium, :ansicht=>'semesteransicht')%></h2> <p><b><%= studium.typ%> </b></p>
|
||||
<p><b>Beschreibung:</b><br>
|
||||
<%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%></p>
|
||||
|
||||
</div>
|
||||
|
||||
24
app/views/studien/_tabs.html.erb
Normal file
24
app/views/studien/_tabs.html.erb
Normal file
@@ -0,0 +1,24 @@
|
||||
<ul class="nav nav-tabs">
|
||||
<% if request.fullpath == studien_path%>
|
||||
<li class="active">
|
||||
<% else %>
|
||||
<li>
|
||||
<% end %>
|
||||
<%= link_to "Alle Studien", studien_path %> </li>
|
||||
<% for s in Studium.all %>
|
||||
<% if !@studium.nil? && s == @studium %>
|
||||
<li class="active">
|
||||
<%= link_to s.name, s %>
|
||||
</li>
|
||||
<% else %>
|
||||
<li> <%= link_to s.name, s %></li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if request.fullpath == studien_verwalten_path %>
|
||||
<li class="active">
|
||||
<% else %>
|
||||
<li>
|
||||
<% end %>
|
||||
<%= link_to "Verwaltung", studien_verwalten_path %>
|
||||
</li>
|
||||
</ul>
|
||||
0
app/views/studien/_verwalten_menu.html.erb
Normal file
0
app/views/studien/_verwalten_menu.html.erb
Normal file
@@ -1,14 +1,18 @@
|
||||
<%= render 'layouts/topbar' %>
|
||||
<h1><%= I18n.t("studien.list") %></h1>
|
||||
<div class="container-fluid">
|
||||
<%= render 'studien/tabs' %>
|
||||
<div class="row-fluid">
|
||||
<h1><%= I18n.t("studien.list") %></h1>
|
||||
|
||||
|
||||
<% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
|
||||
<ul>
|
||||
<li><%= render studium%></li>
|
||||
</ul>
|
||||
<% end %>
|
||||
<% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
|
||||
<div class="span5">
|
||||
<%= render studium%>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
|
||||
<br>
|
||||
<%= render :partial=>'layouts/pretty_toolbar'%>
|
||||
<% #toolbar_html(@toolbar_elements) %>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
<%= render :partial=>'layouts/pretty_toolbar'%>
|
||||
</div>
|
||||
|
||||
@@ -1,17 +1,40 @@
|
||||
<%= render :partial=>'layouts/topbar'%>
|
||||
|
||||
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
|
||||
<%= raw(@studium.desc) %>
|
||||
<% @studium.semester.each do |sem| %>
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<h2><%= sem.name %></h2>
|
||||
<div class="span<%= sem[:width]%> min-width:13em;">
|
||||
<ul>
|
||||
<% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
|
||||
<li><%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
|
||||
<% end %>
|
||||
</ul>
|
||||
<%= render 'studien/tabs' %>
|
||||
<div class="span6"> <h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1></div>
|
||||
<div class="span3 pull-right"><div class="pull-right"> <%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %></div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= raw(@studium.desc) %>
|
||||
|
||||
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
|
||||
<% @studium.semester.each do |sem| %>
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<div class="studien-semester">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div class="span8">
|
||||
<h2><%= sem.name %></h2>
|
||||
</div>
|
||||
<div class="span4"><div class="pull-right"><%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem), :class=>"btn"%></div>
|
||||
</div></div>
|
||||
<% sem.lvas.each_slice(4) do |row| %>
|
||||
<div class="row-fluid">
|
||||
<% row.each do |l| %>
|
||||
|
||||
<div class="span3">
|
||||
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
|
||||
</div>
|
||||
|
||||
@@ -1,23 +1,27 @@
|
||||
<%= render 'layouts/topbar'%>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<%= render 'studien/tabs' %>
|
||||
|
||||
<p id="notice"><%= notice %></p>
|
||||
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
|
||||
<div class="span6"> <h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1></div>
|
||||
<div class="span3 pull-right"><div class="pull-right"><%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %></div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<%= raw(@studium.desc) %>
|
||||
<% @studienphasen.each do |sp| %>
|
||||
<% sp[:modulgruppen].each do |row| %>
|
||||
<div class="row-fluid">
|
||||
<% row.each do |modulgruppe| %>
|
||||
<div class="span<%= sp[:width]%> min-width:13em;">
|
||||
<%= render modulgruppe %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
<%= raw(@studium.desc) %>
|
||||
<% @studienphasen.each do |sp| %>
|
||||
<% sp[:modulgruppen].each do |row| %>
|
||||
<div class="row-fluid">
|
||||
<% row.each do |modulgruppe| %>
|
||||
<div class="span<%= sp[:width]%> min-width:13em;">
|
||||
<%= render modulgruppe %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
|
||||
</div>
|
||||
</div>
|
||||
<%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
|
||||
<%= render 'layouts/pretty_toolbar' %>
|
||||
</div>
|
||||
|
||||
171
app/views/studien/verwalten.html.erb
Normal file
171
app/views/studien/verwalten.html.erb
Normal file
@@ -0,0 +1,171 @@
|
||||
<div class="container-fluid">
|
||||
<%= render 'studien/tabs'%>
|
||||
<div class="row-fluid">
|
||||
<div class="span9">
|
||||
|
||||
<h1><%= I18n.t("studien.verwaltung") %></h1> <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %>
|
||||
<%= I18n.t("filter.explanation").html_safe %>
|
||||
<h2>Studien </h2>
|
||||
<div class="verwalten-block">
|
||||
|
||||
|
|
||||
<% @studien.each do |s| %>
|
||||
<%= link_to s.name, s %> <%= (s.valid?) ? "Gültig" : "Problemfall" %> | <% end %>
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<%= params[:std_verw].nil? ? I18n.t("filter.studium") : Studium.find(params[:std_verw]).name %>
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li> <%= link_to 'Alle Studien', studien_verwalten_path(:std_verw=>nil) %></li>
|
||||
<% for s in @studien %>
|
||||
<li> <%= link_to s.name, studien_verwalten_path(:std_verw=>s)%> </li>
|
||||
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="span4">
|
||||
<h2>Modulgruppen </h2>
|
||||
<div class="verwalten-block">
|
||||
<% @modulgruppen.each do |mg| %>
|
||||
<%= link_to mg.name, mg %> | <%= (mg.valid?) ? "Gültig" : "Problemfall" %><br>
|
||||
<% end %>
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<%= params[:mg_verw].nil? ? I18n.t("filter.modulgruppe") : Modulgruppe.find(params[:mg_verw]).name %>
|
||||
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li> <%= link_to 'Alle Modulgruppen', studien_verwalten_path(:mg_verw=>nil) %></li>
|
||||
<% for mg in @modulgruppen %>
|
||||
<li> <%= link_to mg.name, studien_verwalten_path(:mg_verw=>mg)%> </li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<%= link_to "Neue Modulgruppe", new_studium_modulgruppe_path(Studium.first), :class=>"btn" unless Studium.first.nil?%>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h2>Module </h2>
|
||||
<div class="verwalten-block">
|
||||
|
||||
|
||||
<% @module.each do |m| %>
|
||||
<%= link_to m.name, m %>
|
||||
| <%= (m.valid?) ? "Gültig" : "Problemfall" %><br>
|
||||
<% end %>
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<%= params[:m_verw].nil? ? I18n.t("filter.modul") : Modul.find(params[:m_verw]).name %>
|
||||
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li> <%= link_to 'Alle Module', studien_verwalten_path(:m_verw=>nil) %></li>
|
||||
<% for m in @module %>
|
||||
<li> <%= link_to m.name, studien_verwalten_path(:m_verw=>m)%> </li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<%= link_to "Neues Modul", new_modul_path, :class=>"btn"%>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h2>Lvas </h2>
|
||||
<div class="verwalten-block">
|
||||
|
||||
|
||||
<% @lvas.each do |lva| %>
|
||||
<%= link_to lva.name, lva %> |
|
||||
<%= (lva.valid?) ? "Gültig" : "Problemfall" %><br>
|
||||
|
||||
<% end %>
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<%= params[:lva_verw].nil? ? I18n.t("filter.lva") : Lva.find(params[:lva_verw]).name %>
|
||||
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li> <%= link_to 'Alle Lvas', studien_verwalten_path(:lva_verw=>nil) %></li>
|
||||
<% for lva in @lvas %>
|
||||
<li> <%= link_to lva.name, studien_verwalten_path(:lva_verw=>lva)%> </li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<%= link_to "Neue LVa", new_lva_path, :class=>'btn'%>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<h2>Error Log</h2>
|
||||
<ul>
|
||||
<li><b>Red</b>: Error, Solve immediately</li>
|
||||
<li><b>Black</b>: Warning, should be solved</li>
|
||||
<li><b>Green</b>: Everything is fine</li>
|
||||
</ul>
|
||||
<div class="verwalten-block">
|
||||
<ul>
|
||||
<% @messages.flatten.each do |m| %>
|
||||
<% if !m.strip.empty? %>
|
||||
<li><%= m.html_safe %></li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</ul>
|
||||
<b><font color="green"><%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%></font></b>
|
||||
</div>
|
||||
<h2>Beispiele </h2>
|
||||
<div class="verwalten-block">
|
||||
|
||||
|
||||
<% @beispiele.each do |b| %>
|
||||
<%= link_to b.name, b %>
|
||||
<% end %>
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<%= params[:b_verw].nil? ? I18n.t("filter.beispiel") : Beispiel.find(params[:b_verw]).name %>
|
||||
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li> <%= link_to 'Alle Beispiele', studien_verwalten_path(:b_verw=>nil) %></li>
|
||||
<% for b in @beispiele %>
|
||||
<li> <%= link_to b.name, studien_verwalten_path(:b_verw=>b)%> </li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<%= link_to "Neues Beispiel", new_beispiel_path, :class=>"btn"%>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user