diff --git a/app/assets/stylesheets/formtastic-changes.css.scss b/app/assets/stylesheets/formtastic-changes.css.scss index bd015db..35dfec3 100644 --- a/app/assets/stylesheets/formtastic-changes.css.scss +++ b/app/assets/stylesheets/formtastic-changes.css.scss @@ -6,16 +6,6 @@ width:90%; height:20em; } - -div.form-group { -border-width: 1px; -border-style: none; -padding: 10px; -// border-radius: 10px; +form.formtastic .input label.control-label { +font-weight:bold; } -div.verwalten-block { -border-width: 1px; -border-style: solid; -padding: 5px; -border-radius:10px; -} \ No newline at end of file diff --git a/app/assets/stylesheets/lvas.css.scss b/app/assets/stylesheets/lvas.css.scss index 797b72c..32979e8 100755 --- a/app/assets/stylesheets/lvas.css.scss +++ b/app/assets/stylesheets/lvas.css.scss @@ -1,3 +1,11 @@ // Place all the styles related to the lvas controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +div.lva-semester { +border: solid; +border-width: 1px; +margin: 1px; +padding: 5px; +border-color: green; +} \ No newline at end of file diff --git a/app/assets/stylesheets/studien.css.scss b/app/assets/stylesheets/studien.css.scss index 7b5973a..5c788c2 100755 --- a/app/assets/stylesheets/studien.css.scss +++ b/app/assets/stylesheets/studien.css.scss @@ -1,3 +1,18 @@ // Place all the styles related to the studia controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +div.verwalten-block { +border-width: 1px; +border-style: solid; +padding: 5px; +border-radius:10px; +margin: 2px; +} +div.studien-semester { +border-width: 1px; +border-style: solid; +padding: 5px; +border-radius:10px; +border-color: blue; +margin: 2px; +} diff --git a/app/views/lvas/_form.html.erb b/app/views/lvas/_form.html.erb index 8692e8e..d43f386 100755 --- a/app/views/lvas/_form.html.erb +++ b/app/views/lvas/_form.html.erb @@ -28,13 +28,13 @@

BILD

- <%= f.input :modul,:label=>'Modul'.html_safe, :as=>:check_boxes%> + <%= f.input :modul, :as=>:check_boxes%>
- <%= f.input :semester, :label=>'Semester'.html_safe, :as=>:check_boxes%> + <%= f.input :semester, :as=>:check_boxes%>
<% end %> diff --git a/app/views/lvas/_lva_semester.html.erb b/app/views/lvas/_lva_semester.html.erb index a60029d..8e92fd7 100755 --- a/app/views/lvas/_lva_semester.html.erb +++ b/app/views/lvas/_lva_semester.html.erb @@ -1,10 +1,9 @@ -

+

<%= link_to lva.name, lva_path(lva)%>
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 %>
<%="LVa-Nr " + lva.lvanr.to_s %> <%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%>
<%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %> -

-<% #toolbar_html(@toolbar_elements) %> +
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb index ee4d588..abf692a 100644 --- a/app/views/studien/semesteransicht.html.erb +++ b/app/views/studien/semesteransicht.html.erb @@ -11,16 +11,16 @@ <% @studium.semester.each do |sem| %>
-
+

<%= sem.name %>

- <% sem.lvas.each_slice(2) do |row| %> + <% sem.lvas.each_slice(4) do |row| %>
<% row.each do |l| %> -
+
<%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
<% end %> diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index f991b3f..a7b7d4b 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -5,7 +5,7 @@

<%= I18n.t("studien.verwaltung") %>

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

Studien

+

Studien

| @@ -24,15 +24,16 @@ <% end %> - <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%> +
+ <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
-

Modulgruppen

+

Modulgruppen

<% @modulgruppen.each do |mg| %> <%= link_to mg.name, mg %> | <%= (mg.valid?) ? "Gültig" : "Problemfall" %>
@@ -50,14 +51,16 @@
  • <%= link_to mg.name, studien_verwalten_path(:mg_verw=>mg)%>
    • <% end %> - <%= link_to "Neue Modulgruppe", new_studium_modulgruppe_path(Studium.first), :class=>"btn" unless Studium.first.nil?%> -
    + +
    + <%= link_to "Neue Modulgruppe", new_studium_modulgruppe_path(Studium.first), :class=>"btn" unless Studium.first.nil?%> +
    -

    Module

    +

    Module

    @@ -78,14 +81,14 @@
  • <%= link_to m.name, studien_verwalten_path(:m_verw=>m)%>
    • <% end %> - <%= link_to "Neues Modul", new_modul_path, :class=>"btn"%> +
    - + <%= link_to "Neues Modul", new_modul_path, :class=>"btn"%>
    -

    Lvas

    +

    Lvas

    @@ -95,20 +98,22 @@ <% end %>
    -
    - - <%= params[:lva_verw].nil? ? I18n.t("filter.lva") : Lva.find(params[:lva_verw]).name %> +
    + + <%= params[:lva_verw].nil? ? I18n.t("filter.lva") : Lva.find(params[:lva_verw]).name %> - - -
      -
    • <%= link_to 'Alle Lvas', studien_verwalten_path(:lva_verw=>nil) %>
      • - <% for lva in @lvas %> -
    • <%= link_to lva.name, studien_verwalten_path(:lva_verw=>lva)%>
      • - <% end %> -
    - <%= link_to "Neue LVa", new_lva_path, :class=>'btn'%> -
    + + +
      +
    • <%= link_to 'Alle Lvas', studien_verwalten_path(:lva_verw=>nil) %>
      • + <% for lva in @lvas %> +
    • <%= link_to lva.name, studien_verwalten_path(:lva_verw=>lva)%>
      • + <% end %> +
    + +
    + <%= link_to "Neue LVa", new_lva_path, :class=>'btn'%> +
    @@ -128,8 +133,8 @@ <%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%> @@ -141,21 +146,23 @@ <% @beispiele.each do |b| %> <%= link_to b.name, b %> <% end %> -
    -
    - - <%= params[:b_verw].nil? ? I18n.t("filter.beispiel") : Beispiel.find(params[:b_verw]).name %> +
    +
    + + <%= params[:b_verw].nil? ? I18n.t("filter.beispiel") : Beispiel.find(params[:b_verw]).name %> - - -
      -
    • <%= link_to 'Alle Beispiele', studien_verwalten_path(:b_verw=>nil) %>
      • - <% for b in @beispiele %> -
    • <%= link_to b.name, studien_verwalten_path(:b_verw=>b)%>
      • - <% end %> -
    + + +
      +
    • <%= link_to 'Alle Beispiele', studien_verwalten_path(:b_verw=>nil) %>
      • + <% for b in @beispiele %> +
    • <%= link_to b.name, studien_verwalten_path(:b_verw=>b)%>
      • + <% end %> +
    + +
    <%= link_to "Neues Beispiel", new_beispiel_path, :class=>"btn"%> -
    +