From 784319bb61aa906ca9aa4e63559f617f0403760b Mon Sep 17 00:00:00 2001
From: Sai <sai@fet.at>
Date: Wed, 12 Mar 2014 14:56:35 +0100
Subject: [PATCH 01/15] Typos

---
 app/views/home/index.html.erb | 5 ++---
 config/locales/de.yml         | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 50c915a..01cb0a1 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,6 +1,5 @@
 <div class="content-wrap content-column">
-  <h1><%= I18n.t('home.willkommen') %></h1>
-  <p><%= I18n.t('home.hallobeiderfet') %></p>
+  <h1><%= I18n.t('home.willkommen') %></h1></p>
       <ul class="unstyled linkbox-list" style="max-width:70em">
 	<% @neuigkeiten.each do |n| %>
 	<li><%= render n if can?(:show, n) %> </li>
@@ -11,7 +10,7 @@
 </p>
   <div class="alert">
     <h2>Beta Test</h2>
-    <p>Die Webseite befindet sich derzeit in einem Entsicklungsstadium,
+    <p>Die Webseite befindet sich derzeit in einem Entwicklungsstadium,
       volle Funktionsfähigkeit ist noch nicht erreicht. Bitte Featurerequests und
       Fehlermeldungen auf GitHub melden.
     </p>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1f17239..e22d410 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -14,7 +14,7 @@ de:
   home:
     mtitle: "Menu"
     willkommen: "Willkommen bei der Fachschaft Elektrotechnik"
-    hallobeiderfet: "auf der Seite der Fachschaft Elektrotechnik an der TU Wien. Wir sind die offizielle Vertretung aller Studierenden auf der Fakultät für Elektrotechnik und Informationstechnik. Wir vertreten eure Interessen in den offiziellen Gremien der Universität. Wir sind bemüht euch in Anliegen des Studiums bestmöglich zu unterstützen und beraten. Außerdem bieten wir ein Rahmenprogramm zum Studium in Form von Veranstaltungen und Festln. Wir freuen uns über Feedback und Anregungen, insbesondere von jenen, die gleich Nägel mit Köpfen machen und unser Team verstärken wollen oder ihre Themen und Meinungen in eine unserer Sitzungen einbringen möchten."
+    hallobeiderfet: "auf der Seite der Fachschaft Elektrotechnik an der TU Wien. Wir sind die offizielle Vertretung aller Studierenden Auf der Fakultät für Elektrotechnik und Informationstechnik. Wir vertreten eure Interessen in den offiziellen Gremien der Universität. Wir sind bemüht euch in Anliegen des Studiums bestmöglich zu unterstützen und beraten. Außerdem bieten wir ein Rahmenprogramm zum Studium in Form von Veranstaltungen und Festln. Wir freuen uns über Feedback und Anregungen, insbesondere von jenen, die gleich Nägel mit Köpfen machen und unser Team verstärken wollen oder ihre Themen und Meinungen in eine unserer Sitzungen einbringen möchten."
     home: "Startseite"
     studien: "Studien"
     news: "Neuigkeiten"
@@ -85,4 +85,4 @@ de:
               blank: "Wählen Sie zumindest eine Modulgruppe aus"
   support:
     array:
-      two_words_connector: ', '	
\ No newline at end of file
+      two_words_connector: ', '	

From 4db3056e6a89567e539f9dd05dabf9b3d674790d Mon Sep 17 00:00:00 2001
From: Miriam <miriam@fet.at>
Date: Fri, 11 Apr 2014 11:44:12 +0200
Subject: [PATCH 02/15] #96 fixed

---
 app/views/themengruppen/_form.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/themengruppen/_form.html.erb b/app/views/themengruppen/_form.html.erb
index 8022d0b..e8c5f15 100644
--- a/app/views/themengruppen/_form.html.erb
+++ b/app/views/themengruppen/_form.html.erb
@@ -8,6 +8,7 @@
   <% end %>
 
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+   	<%= f.action :submit, :as => :input %>
+	<%= f.action :cancel,:label => I18n.t("common.back"), :as => :link %>
   <% end %>
 <% end %>

From 838534887b3d696768ae2b824bc60144f991fa98 Mon Sep 17 00:00:00 2001
From: Miriam <miriam@fet.at>
Date: Fri, 11 Apr 2014 12:07:20 +0200
Subject: [PATCH 03/15] gitignore

---
 .gitignore   | 2 +-
 Gemfile.lock | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0747299..55a9769 100755
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,4 @@
 console
 /server
 /public/uploads/
-
+/vendor/*
diff --git a/Gemfile.lock b/Gemfile.lock
index 515aca0..47be881 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -261,6 +261,7 @@ DEPENDENCIES
   paper_trail (>= 2.7.0)!
   paperclip (~> 3.4.0)
   rails (= 3.2.13)
+  remotipart!
   rmagick
   rolify
   rspec-rails

From c226eb86134e8ccf537f1ba80457f4bf622b6e23 Mon Sep 17 00:00:00 2001
From: Sai <sai@fet.at>
Date: Fri, 11 Apr 2014 12:34:55 +0200
Subject: [PATCH 04/15] added dropdown menu

---
 app/views/layouts/menu.html.erb | 15 +++++++++++++--
 config/locales/de.yml           |  1 +
 config/locales/en.yml           |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb
index 1702221..36066d2 100644
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -23,12 +23,23 @@
 	    <%= link_to 'Admin' , config_path%>
 	  </li>
 	</ul>
-	<span class="pull-right"><%if I18n.locale == :en %>
+	<ul class="nav navbar-nav">
+	<li class="dropdown">
+	  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>
+	<ul class="dropdown-menu">	 
+	<li><%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> </li>
+	
+	<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
+	
+	</ul>
+	</li>
+	</ul>
+	<!--<span class="pull-right"><%if I18n.locale == :en %>
 	  <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
 	  <% elsif I18n.locale == :de %>
 	  <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
 	  <%end %>
-	</span>
+	</span>-->
 	
       </div>
     </div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index fd7e12d..310d8d8 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -12,6 +12,7 @@ de:
     back: "Zurück"
     sure_del: "Sicher endgültig löschen?"
   home:
+    sprache: "Deutsch"
     kontakt: "Kontakt"
     mtitle: "Menu"
     login: "FET Login"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 716e6a7..b09a833 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -8,6 +8,7 @@ en:
     edit: "Edit"
 
   home:
+    sprache: "English"
     mtitle: "Menu"
     hallobeiderfet: "This is the page of Fachschaft Elektrotechnik at TU Wien"
     home: "Home"

From 1ffbfe63067d2ae4f870d7fa321f614d56c4c823 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Fri, 11 Apr 2014 12:52:54 +0200
Subject: [PATCH 05/15] Added en.png

For all locales, a flag by the same name should be present.
---
 Gemfile.lock                    |   1 -
 app/views/layouts/menu.html.erb |   2 +-
 public/flaggen/png/en.png       | Bin 0 -> 599 bytes
 3 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 public/flaggen/png/en.png

diff --git a/Gemfile.lock b/Gemfile.lock
index f01eff7..5267261 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -258,7 +258,6 @@ DEPENDENCIES
   paper_trail (>= 2.7.0)!
   paperclip (~> 3.4.0)
   rails (= 3.2.13)
-  remotipart!
   rmagick
   rolify
   rspec-rails
diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb
index 36066d2..b647dcf 100644
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -25,7 +25,7 @@
 	</ul>
 	<ul class="nav navbar-nav">
 	<li class="dropdown">
-	  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>
+	  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>
 	<ul class="dropdown-menu">	 
 	<li><%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> </li>
 	
diff --git a/public/flaggen/png/en.png b/public/flaggen/png/en.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff701e19f6d2c0658fb23b1d94124cba4ce60851
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz`AI}URCwBAoHTQvnvLG!L$_YOVPIhR
z`}g19iWuE1ZBzdL{i|D>U(k2*|8J(R-+sudaynhucHbwAMTnor{mwqO^w7JHzaBsT
z{O^B8RYf5+LvDs&KmRKVd78=o{`1#HTiEo_OolaGleS)G+IQ#sUI`b*<ttPkoQ(BX
zdH(z-BO?RD#k&lb?f@B&-u_Q#y`y({1!HORg0(k0n@%tR-SPDK`}#L}kNztCZEmQ{
z)B=hyeE-bw{X3BEzCWGY&E{rcl9ShpD>pv<`1zCJ=H0jd{{2S>p`ri%{LsXJ%FbMS
z$#S`6f|?OG!^Jxczkf6Q`UNF{l0Sd`ad7zm>({^EzyAS6{{CgrkluOb3l1A>ZU2~A
zK+FZ=zkmP!`TOVhpFbzBzF<mgJlZ$!LUj7htJgj-ynFjAB?0L4|6jiYZ2)<O;r}yd
zr$cjg$jHr$OxbL1*Ua?e#~*QFwxu)O<=6CooI5XBFdeAs-_M^w$1wc=Z|$&LWbZyx
z#upb{59yi8GyMC*6cei&?XU5pqw<n{Y~wd`A)deg|1&UZN;7Io039Q%E))~L=CG!%
z=$tv3r|Yv5ZCRebeml)AZM~}fxupkx|M~vs@885Q)osT={QvXE{ra1g8}~B&`@4GU
lArU#j%I>aPmD2$N3;+$pK?>zdet`f0002ovPDHLkV1gy;I?Vt8

literal 0
HcmV?d00001


From 73bba9bc6f2eece360151e42f627e187503f9a9c Mon Sep 17 00:00:00 2001
From: Miriam <miriam@fet.at>
Date: Fri, 11 Apr 2014 13:01:17 +0200
Subject: [PATCH 06/15] =?UTF-8?q?faqs=20oberfl=C3=A4che?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/application.html.erb  |  2 +-
 app/views/themen/_form.html.erb         |  2 +-
 app/views/themengruppen/faqs.html.erb   | 37 +++++++++--------
 app/views/themengruppen/index.html.erb  |  2 +-
 app/views/themengruppen/index.html.erb~ | 54 +++++++++++++++----------
 5 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5f41239..6730427 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -27,7 +27,7 @@
        <div class="span10 ">
 	 <div class="header_wrap" style="background:7070a0">
 	   <div class="header">
-	     <%= image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
+	     <%= link_to image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}),home_index_path %>
 	     <h1 style="display:block"></h1>
 	   </div>
 	   
diff --git a/app/views/themen/_form.html.erb b/app/views/themen/_form.html.erb
index b1d62dd..63f9808 100644
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -21,7 +21,7 @@
 </div>
 
 <%= f.actions do %>
-<%= f.action :submit, :as => :button, :label=>"Sdf"+raw(fa_icon("save"))%> 
+<%= f.action :submit, :as => :button %> 
 
 <%= f.action :cancel, :as => :link %>
 <% end %> 
diff --git a/app/views/themengruppen/faqs.html.erb b/app/views/themengruppen/faqs.html.erb
index c38f315..d3a7ab0 100644
--- a/app/views/themengruppen/faqs.html.erb
+++ b/app/views/themengruppen/faqs.html.erb
@@ -1,19 +1,24 @@
-<% @themengruppen.each do |tg| %>
-<a name="themengruppe_<%=tg.id.to_s%>">
-<h2><%= tg.title%></h2></a>
-<ul>
-<% tg.themen.order(:priority).reverse.each do |t| %>
-<li><%= t.title %>
+<div class="content-wrap content-column">
+	<% @themengruppen.each do |tg| %>
+		<div class="contentbox">
+		<a name="themengruppe_<%=tg.id.to_s%>"></a>
+		<h2> <%= tg.title%></h2>
+		<ul>
+			<% tg.themen.order(:priority).reverse.each do |t| %>
+			<li> <%= t.title %>
+				<ul> <% t.fragen.each do |f| %>
+					<li>
+						<b> <%= f.title %></b>
+						<p> <%= f.text %></p>
+					</li>
 
+						<% end %>
+				</ul>
 
+			</li>
+			<% end %>
+		</ul>
 
-<ul>
-<% t.fragen.each do |f| %>
-<li><b> <%= f.title %></b><p> <%= f.text %></p></li>
-<% end %>
-</ul>
-
-</li>
-<% end %>
-</ul>
-<% end %>
+		</div>
+	<% end %>
+</div>
diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb
index 95ae611..2bcb394 100644
--- a/app/views/themengruppen/index.html.erb
+++ b/app/views/themengruppen/index.html.erb
@@ -1,5 +1,5 @@
 <div class="content-wrap content-column">
-<p>  <%= link_to "FAQS", faqs_themengruppen_path %></p>
+<p>  <%= link_to "FAQS", faqs_themengruppen_path,class: :btn %></p>
 <ul class="unstyled linkbox-list">
   <li>  
     <% @themengruppen.each do |themengruppe| %>
diff --git a/app/views/themengruppen/index.html.erb~ b/app/views/themengruppen/index.html.erb~
index f4655e1..201480f 100644
--- a/app/views/themengruppen/index.html.erb~
+++ b/app/views/themengruppen/index.html.erb~
@@ -1,25 +1,35 @@
-<h1>Listing themengruppen</h1>
+<div class="content-wrap content-column">
+<p>  <%= link_to "FAQS", faqs_themengruppen_path,class=btn %></p>
+<ul class="unstyled linkbox-list">
+  <li>  
+    <% @themengruppen.each do |themengruppe| %>
+ 
+    
+    
+      <div class="container-fluid">
+	<%= render themengruppe %>
+	<br/>
+	<div class="row-fluid">
+	  <!--
+	  <%= link_to 'Edit', edit_themengruppe_path(themengruppe) %>
+	  -->
+	</div>
+      </div>
+    
+    
+  <% end %>
+  </li>
+</ul>
 
-<table>
-  <tr>
-    <th>Title</th>
-    <th>Text</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
+<br/>
+</div>
+<script class="hidden-phone">
 
-<% @themengruppen.each do |themagruppen| %>
-  <tr>
-    <td><%= themagruppen.title %></td>
-    <td><%= themagruppen.text %></td>
-    <td><%= link_to 'Show', themagruppen %></td>
-    <td><%= link_to 'Edit', edit_themagruppen_path(themagruppen) %></td>
-    <td><%= link_to 'Destroy', themagruppen, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
-<% end %>
-</table>
+<!-- make_equal_height();
+-->
+</script>
 
-<br />
-
-<%= link_to 'New Themengruppe', new_themagruppen_path %>
+<%= render :partial=>'layouts/pretty_toolbar' %>
+<!--
+<%= link_to 'New Themengruppe', new_themengruppe_path %>
+-->

From e9be76d6e4df0bd669d3aef27daf38c82f7591f6 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Fri, 11 Apr 2014 13:02:00 +0200
Subject: [PATCH 07/15] small fixes rubriken und themen

---
 app/controllers/neuigkeiten_controller.rb |  5 ++
 app/controllers/rubriken_controller.rb    | 17 ++++--
 app/models/ability.rb                     |  1 +
 app/models/lva.rb                         | 10 ++--
 app/views/rubriken/_tabs.html.erb         |  2 +-
 app/views/rubriken/show.html.erb          |  2 +-
 app/views/themen/verwalten.html.erb       |  2 +
 app/views/themengruppen/show.html.erb     | 66 +++++++++++------------
 8 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index 31d371e..f08759a 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -9,6 +9,11 @@ class NeuigkeitenController < ApplicationController
   def show
     @neuigkeit = Neuigkeit.find(params[:id])
     @rubrik=@neuigkeit.rubrik    
+    if can?(:shownonpublic, Rubrik)
+      @rubriken = Rubrik.all
+    else
+      @rubriken = Rubrik.where(:public=>true)
+    end   
 
     if  !params[:version].nil?
       @neuigkeit.assign_attributes(@neuigkeit.translation.versions.reverse[params[:version].to_i].reify.attributes.select{|k,v| @neuigkeit.translated_attribute_names.include? k.to_sym })
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 0ff05ff..4e44a20 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -2,14 +2,25 @@ class RubrikenController < ApplicationController
   before_filter {@toolbar_elements=[]}
    load_and_authorize_resource
   def index
-    @rubriken = Rubrik.all
-    @neuigkeiten = Neuigkeit.recent
-    @calentries= Calentry.public
+    if can?(:shownonpublic, Rubrik)
+      @rubriken = Rubrik.all
+    else
+      @rubriken = Rubrik.where(:public=>true)
+    end   
+    @neuigkeiten = @rubriken.collect(&:neuigkeiten).map(&:recent).flatten
+    @calentries= @rubriken.collect(&:calendar).collect(&:calentries).flatten
   end
  
   def show
+    if can?(:shownonpublic, Rubrik)
+      @rubriken = Rubrik.all
+    else
+      @rubriken = Rubrik.where(:public=>true)
+    end   
+
     @rubrik = Rubrik.find(params[:id])
     @moderatoren=User.with_role(:newsmoderator,@rubrik)
+    @calentries= @rubrik.calentries
     if can?(:showunpublished, Neuigkeit)
       @neuigkeiten = @rubrik.neuigkeiten
     else
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 1dcb42b..86f364a 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -76,6 +76,7 @@ class Ability
    if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser") 
 	  can :manage, Rubrik
 	  can :manage, Neuigkeit
+          can :shownonpublic, Rubrik
           can :showunpublished, Neuigkeit
    end
   
diff --git a/app/models/lva.rb b/app/models/lva.rb
index 5ca8e97..5a0f5d5 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -36,14 +36,18 @@
 
 class Lva < ActiveRecord::Base
   ERLAUBTE_TYPEN = ['VO', 'UE', 'VU', 'LU', 'SE', 'andere'];
+  
   has_paper_trail :ignore=>[:desc, :pruefungsinformation]# Versionsverfolgung
+  translates :desc,:pruefungsinformation,  :fallbacks_for_empty_translations => true, :versioning=>true
+
   attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids, :pruefungsinformation, :lernaufwand, :typ, :lecturer_ids
+
   has_and_belongs_to_many :modul,:uniq=>true # Gehört zu einem Modul
   has_and_belongs_to_many :semester
-  #Gehört zu einem Semester( derzeit nicht implementiert)
   has_many :beispiele , :class_name => "Beispiel"
   has_and_belongs_to_many :lecturers
-  translates :desc,:pruefungsinformation,  :fallbacks_for_empty_translations => true, :versioning=>true
+  has_many :nlinks, as: :link
+  
   scope :search, ->(query) {where("name like ? or lvas.desc like ?", "%#{query}%", "%#{query}%")} 
   
   validates :lvanr,:format=>{ :with => /^[0-9][0-9][0-9]\.[0-9A][0-9][0-9]$/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht 
@@ -53,7 +57,7 @@ class Lva < ActiveRecord::Base
   validates_presence_of :stunden # Stunden Eingetragen?
   validates_presence_of :modul # Zugehöriges Modul eingetragen?
   # (zumindest eines)
- has_many :nlinks, as: :link
+ 
  
   def title
     self.name
diff --git a/app/views/rubriken/_tabs.html.erb b/app/views/rubriken/_tabs.html.erb
index 99d7f09..4478b08 100644
--- a/app/views/rubriken/_tabs.html.erb
+++ b/app/views/rubriken/_tabs.html.erb
@@ -1,7 +1,7 @@
 <ul class="nav nav-tabs">
  <li <%=  'class="active"'.html_safe if (request.fullpath == rubriken_path)%> >
  <%= link_to I18n.t('rubriken.alle') , rubriken_path %> </li>
-<% for r in Rubrik.all %>
+<% for r in @rubriken  %>
 <% if can?(:show, r) %>
   <li <%= (!@rubrik.nil? && r == @rubrik) ? 'class="active"'.html_safe : '' %> title="<%= r.name %>">
     <%= link_to r.name, r %>
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index 4709ee7..85a4afa 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -31,7 +31,7 @@
 
 </div>
 <div class="span3">
-<%= render 'calendars/calentries', :object=>@rubrik.calendar.calentries %>
+<%= render 'calendars/calentries', :object=>@calentries %>
 <%= link_to "ics-format", calendar_path(@rubrik.calendar,:format=>:ics) %>
 </div>
 
diff --git a/app/views/themen/verwalten.html.erb b/app/views/themen/verwalten.html.erb
index 041efab..70177ca 100644
--- a/app/views/themen/verwalten.html.erb
+++ b/app/views/themen/verwalten.html.erb
@@ -20,5 +20,7 @@
 <h2><%= I18n.t('attachment.title')%>:</h2>
 <div id="attachmentform">
 </div>
+
 <%= link_to new_thema_attachment_path(@thema) ,:remote=>true do %> new Attachment <% end %>
 <%= render :partial => "themen/select", :object => @thema, :locals=>{:editor => :false} %>
+<%= link_to I18n.t('common.back'), themengruppen_path, :class=>:btn %>
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index 0cf1a92..d6b4f02 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -1,38 +1,38 @@
 <div class="content-wrap content-column" >
-<%= link_to fa_icon("arrow-circle-left 2x")+" Alle Themengruppen", themengruppen_path, :class=>"linkbox" %>
-<%= link_to fa_icon("question 2x")+" Häufige Fragen", faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
-<h1><%= @themengruppe.title %></h1>
-<p>
-  <%= @themengruppe.text %>
-</p>
-<ul class="unstyled linkbox-list" >
-  <% @themengruppe.themen.each do |thema| %>
-  <li>
-    <div class="contentbox">	
-      <%= render :partial => 'themen/small', :object => thema %>
-tools:
-      <% 
-	 @small_elements2 = []
-	 @small_elements2 << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('common.verwalten'), :path=>verwalten_thema_path(thema)} if can? :edit, thema 
+  <%= link_to fa_icon("arrow-circle-left 2x")+" Alle Themengruppen", themengruppen_path, :class=>"linkbox" %>
+  <%= link_to fa_icon("question 2x")+" Häufige Fragen", faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
+  <h1><%= @themengruppe.title %></h1>
+  <p>
+    <%= @themengruppe.text %>
+  </p>
+  <ul class="unstyled linkbox-list" >
+    <% @themengruppe.themen.each do |thema| %>
+    <li>
+      <div class="contentbox">	
+	<%= render :partial => 'themen/small', :object => thema %>
+	tools:
+	<% 
+	   @small_elements2 = []
+	   @small_elements2 << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('common.verwalten'), :path=>verwalten_thema_path(thema)} if can? :edit, thema 
 
-   %>
+	%>
 	<%= render :partial=>'layouts/pretty_toolbar', :object=>@small_elements2 unless @small_elements2.empty? %>
-<ul class="unstyled">
-	<% unless thema.gremium.nil? %>
-	
-	<li>
-	<%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
-  </li>
-      <% end %>		
-     
-      <% thema.nlinks.each do |l| %> 
-<li><%= render l.neuigkeit %></li>
-      <% end %>
-</ul>
-    </div>
-  </li>
-  <% end %>
-</ul>
+	<ul class="unstyled">
+	  <% unless thema.gremium.nil? %>
+	  
+	  <li>
+	    <%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
+	  </li>
+	  <% end %>		
+	  
+	  <% thema.nlinks.each do |l| %> 
+	  <li><%= render l.neuigkeit %></li>
+	  <% end %>
+	</ul>
+      </div>
+    </li>
+    <% end %>
+  </ul>
 
-<%= render :partial=>'layouts/pretty_toolbar' %>
+  <%= render :partial=>'layouts/pretty_toolbar' %>
 </div>

From e56c1c3ce4c91123e478d7764ba238402c225cbc Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Fri, 11 Apr 2014 13:04:11 +0200
Subject: [PATCH 08/15] gemfile-lock ignore

---
 .gitignore   | 2 +-
 Gemfile.lock | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2210f4a..271cf26 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,4 @@ console
 /vendor/*
 /bak/*
 *#
-
+Gemfile.lock
diff --git a/Gemfile.lock b/Gemfile.lock
index f01eff7..5267261 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -258,7 +258,6 @@ DEPENDENCIES
   paper_trail (>= 2.7.0)!
   paperclip (~> 3.4.0)
   rails (= 3.2.13)
-  remotipart!
   rmagick
   rolify
   rspec-rails

From ae6125571fb54178d085edb704494c5c3aef80d1 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Fri, 11 Apr 2014 13:10:37 +0200
Subject: [PATCH 09/15] =?UTF-8?q?Deutsche=20flagge=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/flaggen/png/de.png     | Bin 545 -> 403 bytes
 public/flaggen/png/de.png.bak | Bin 0 -> 545 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 public/flaggen/png/de.png.bak

diff --git a/public/flaggen/png/de.png b/public/flaggen/png/de.png
index ac4a977362738ca7daa20784717f10f9617136b4..0f15f34f2883c4b4360fc871d7105309f1533282 100755
GIT binary patch
delta 323
zcmV-J0lfa91d{`hS$`!-L_t(|+G70AfB^qc*;o-k0Gj03000n#0T`%X^A)$b(H3=Z
z$&&Rl;?j~!MmA`K0}~ik4fJ<s9svZ_!0`Y7lczwXAl1KrLr5t41tfp{|Md&VW|Wl$
z+5iwhEDWZm|24H3M8$zt0F42u23hh4gy4)ne}4V?#U?KPZ-4uCfB<5A`SPWxs3_Q$
z{|sP=27pQ-BsVwr+qZ840tn(Hs46%EI{?c91P}{C5mxh&)&B>E%RhhsV*IVI&sbRa
z|MhDIBo_k%>i=I9ZvbT(#l_#WwE+YW%fE{knU5X&fA1axG+3Zv0wp1gKff7(VXdM9
zbPhlOu>eDg={)xz21!X!fC5E<a=;J-vHvhYNU-q`1XK(VK#X5eBN9&>LjXX40RRtt
VS6cG0UZ?;7002ovPDHLkV1kbLhXMcq

delta 466
zcmV;@0WJQM1EB<vS%0%hL_t(|+G6zaac21Yo#Ed<24<FDfByaY{pbI`-wX`@7;pf9
z0Al(5`+IS5Igs@a4F3N8^Y<@=`~wBQfB*Rlrhflkw{A5+0I@JJF#%PdIC%*q0T%uR
z1V2F#4u1Uj0mS|RPC%6a0mLH9z##DNpDbAQpI^T~I)45HB7dN+-#>o*`uPK>;rI6+
zK>ZSbfKFuq2tZ;S+yDTAKoI1C7150SH{l%!Xf)YOR%g&MEu!7~OWq1B;thJS93!@h
z90A1g|M#!|fB!N7)&2VYAE@HjuYXVtVAVkM{X0ZINF@UUKmf4-F~i?K2!nx)A3uPq
zq1u3|fBpOmRDTT=|NHwd0|P(+vHZ4TU{L%2pZVYazyJRI2BN<Z#(z-o0!fCyzyAZt
ze?ZcN@yB5XfB<6ougCCT=HGuopehjh4<vyWf<pKYB$$C>U@pUdVa9*13;+Sd!tjgX
zKhXQEMobL97(p6<<R6CrzyE{SK=RN3|3DpoK(_q)!%Os)0U&@_e!OMaGjGyApf+ZP
zpWi_-{GX43=?B9<U_dZ4{QU)Dure|H`@z7#%<%0O13-WQ0C#kV$r!C)SO5S307*qo
IM6N<$f{U=|MF0Q*

diff --git a/public/flaggen/png/de.png.bak b/public/flaggen/png/de.png.bak
new file mode 100755
index 0000000000000000000000000000000000000000..ac4a977362738ca7daa20784717f10f9617136b4
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzvq?ljRCwBA
z^zm_K`1_sV-#-RsmS2DV{rdgq|G(c14F4E#0Du5u`ThHQadA12^$!gG{{8d!FNFL9
z1;2m)`3t6g|6aFlH9!EdFflO!Ri8L{2_yj){sja-K@bjp{P+RH{sB%vl>h<6BFn%a
z@b8~2SoNP@zd$;E{sbbRuHQd?{QCI=sNwhbA3*&Qe}GP900=;09NYi^f<O@Dffdn=
z{Wswq2xv6fOjc*mGA*Lr`%B&mEaDA%u^c0|iW~vN^8fd*|9}570M-5a{U4~}*ROw2
z4Pezk^!+<TKS(7513&<=05QYgKL~??j2}OMs-fC|s(=0b3semh|NHwd0|P(+vHZ4T
zU{L%2pZVYazyJRI2BN<Z#(z-o0!fCyzyAZte?ZcN@yB5XfB<6ougCCT=HGuopehjh
z4<vyWf<pKYB$$C>U@pUdVa9*13;+Sd!tjgXKhXQEMobL97(p6<<R6CrzyE{SK=RN3
z|3DpoK(_q)!}OH_Ab?nYyk*!kZ_+=YHfDyO-$60_pO1m*2g5&LKrl1>{RLvMGBN!7
j!N9=G@a-1^K!5=NcXWu!7_DDe00000NkvXXu0mjfeQx^H

literal 0
HcmV?d00001


From 5a4e6d59469056d1bf2de949bc928ee869beb32f Mon Sep 17 00:00:00 2001
From: Miriam <miriam@fet.at>
Date: Fri, 11 Apr 2014 13:24:20 +0200
Subject: [PATCH 10/15] =?UTF-8?q?verdoppelung=20gel=C3=B6scht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Verdoppelung in der Bildergalerie gelöst
---
 app/views/galleries/index.html.erb | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/app/views/galleries/index.html.erb b/app/views/galleries/index.html.erb
index ed4bb87..68a8a8f 100644
--- a/app/views/galleries/index.html.erb
+++ b/app/views/galleries/index.html.erb
@@ -25,27 +25,6 @@
 	</p>
       </div>
     </div>
-    <div class="media gallery-block">
-      <div class="pull-left" href="#">
-	<%= if(gallery.fotos.empty?)
-	    image_tag "no_image_128.png", {:class => "img-rounded"}
-	    else
-	    image_tag gallery.fotos.sample.datei.big_thumb.url, {:class => "img-rounded"}
-	    end %>
-      </div>
-      <div class="media-body">
-	<small class="pull-left"><%= gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> </small>
-	<small class="pull-right"><%=I18n.l(gallery.try(:datum).try(:to_date)) unless gallery.try(:datum).try(:to_date).nil? %></small></br>
-	<h1><%= gallery.name %></h1>
-	<p>
-	  <%= if gallery.desc.split.size > Gallery::WORD_COUNT
-	  gallery.desc.split[0..Gallery::WORD_COUNT].join(" ") + " ..."
-	  else
-	  gallery.desc
-	  end%>
-	</p>
-      </div>
-    </div>
     <% end %> <!-- end link -->
   </div> <!-- close span6 -->
   <% end %> <!-- end row -->

From 3b6a964ae61c2af325f12b2d118e8331a698d07a Mon Sep 17 00:00:00 2001
From: Sai <sai@fet.at>
Date: Fri, 11 Apr 2014 14:11:36 +0200
Subject: [PATCH 11/15] add_favicon

---
 app/views/layouts/application.html.erb |   2 ++
 public/favicon.ico                     | Bin 0 -> 2238 bytes
 2 files changed, 2 insertions(+)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6730427..3841dce 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,6 +3,8 @@
 
  <head>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="shortcut icon" href="./public/favicon.ico"> 
+ <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
   <title>Fetsite</title>
 
  
diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..dec4c2cdc198cd26625ab3531c9591c345577915 100755
GIT binary patch
literal 2238
zcmeH|_fu3?6vw|0f=FzbC~;k2*Ijlci6}&hAOsL4mV}6vzT#2>vMfbNmStIbQy6fh
zqaeLVQ5o9M!9o!f7(`HH00(CHCHc`ACogX;5rO3&NY0z@nS0OYzWd%e_q=%kL0wEH
zD8C+M>j5<Y+LWjeEGWt1Yni>hJscby;OOWGCnqO3J3GV0#RaaeuHf_eaC38mySqC)
zJUrm(=?O0{FL--<!^g)50)YU&zP=C&h4A<HM?gRT0s{jP6cmKu;9!VEB7}s5Kr9v`
zG&B?vi3DL`VUS9t2oDcOL_`E4BO?(N6@}>NXvD<CAT~A@adB~okB>(}LIM&K6LICr
z6<ob~6-h}+NKQ^hN=gb+Q&Vy6+BICiejRCPX-H2`M@B{lGBY!gm6e6;>}=%Z<RCXU
z7dLL)z|EUCk(ZZ;{QP{}x^)W$1qCQ9EJRUJ5sHh8QBqQZ($Z3tm6f5qyc`u36{xJN
z#O>R+QB_ri>gsCL)YPE1wib8p+`-+ucX99DJ=E3Jp}xKz4Gj%wY-~hRQxlq-o6*wJ
zg4Whnw6(RNy}cbB9UbWG>_k^r7rMK<(bLm|`}gnT!Gi~Q`0ybfJ$i)R-d^<e^`XDN
z9|Hpec>MS=1_uW*G&F=KPoCiE)2A379>&PX2u4RoF*Y`aXV0Ete0&_wpFhXM!~`ZM
zC-LIN3%q>!5>r!Cc=hTPrl+SdGc$wP*;&lZ&EfUy*O;H5$HKw_78e)SYLEZff2RV+
zglp%@u~?fk_RHsCfSB{We9k%nUp7lVXBdG`rvcpKtF964)`8<!bbz71D*uhe!ny4l
z5{cICRk_nQG}yA~moG7?Jyx+ZTQ$PZn0@Q#vP)+L4dR8shH1&?@pu8}cs!rw3;4uO
zII3?zP^M>dQfWn!5@H_?S?Cg9vRI~82HUn^`{#8OtI%M2#Dp;P;`y4HXe&7E(fsfT
zKS<ffaBk;%$>o#Qgif&gX>+R|iGw@Y9x%270yk~mx}PaD(j}BN-K;k%Dx2FHA3aZ4
z8gY&u)Y0Cc^208}{hL^9rU~)I#t3tDLTTSAgI_!d!{f$u#`YZs`liNenqtGf9Bbl8
zP=t{lA^hDz&-RiM`=Z@m4v$A;*vVc)w2dVuxGsLK)`TtJ)7dBRYt_&Q)`3q&@OQ&z
z1s0e4E1|;W>ezEPC~`l~4>&BV&Chh1cV9=jb)W8jHxl!xzmvd~a*iTznP0{Qh6ixk
zis^UWOvfL(hnG=m%G8GqS3T&AhI%m02CU>-XK_kRBg~#U<(2S##7>oti#w<elw%iY
zGzeG>ITY}wI#8_jom~D0cMqVsyfRCcQ#pWRxg@Y`$fno@@v`8O>4}wjlYdLee>F#q
z-^r6Cdt_36uMTDMt%c$TDM;U1KuT4ZyJTnlNqu*304e!Vsw(YdiV8`lY$3_N7)z8#
Kl5akWB>w>!Yo1*I

literal 0
HcmV?d00001


From 2a54145a521d890b9df43589b18e33df0f88a1e8 Mon Sep 17 00:00:00 2001
From: Miriam <miriam@fet.at>
Date: Fri, 11 Apr 2014 14:58:15 +0200
Subject: [PATCH 12/15] back button studien

---
 app/views/studien/_form.html.erb | 1 +
 app/views/studien/new.html.erb   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/studien/_form.html.erb b/app/views/studien/_form.html.erb
index d9ad5a0..3640757 100755
--- a/app/views/studien/_form.html.erb
+++ b/app/views/studien/_form.html.erb
@@ -40,6 +40,7 @@
   <%= tinymce %>
   <%= f.actions do %>
   <%= f.action :submit, :as => :input %>
+  <%= link_to 'Back', studien_path, :data=>{:locale=>I18n.locale}, class: :btn%>
   <% end %>
   <% end %>
 </div>
diff --git a/app/views/studien/new.html.erb b/app/views/studien/new.html.erb
index ae37fef..12a41b1 100755
--- a/app/views/studien/new.html.erb
+++ b/app/views/studien/new.html.erb
@@ -2,4 +2,6 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', studien_path , :data=>{:locale=>I18n.locale}%>
+
+
+<!--<%= link_to 'Back', studien_path , :data=>{:locale=>I18n.locale}, class: :btn%>-->

From 7fff32bab1afd3d68742ce692bf1ceffd1ed9672 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 12 Apr 2014 18:03:10 +0200
Subject: [PATCH 13/15] getting started updated

---
 app/views/home/setup_fetsite_dev.html.erb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/home/setup_fetsite_dev.html.erb b/app/views/home/setup_fetsite_dev.html.erb
index 2d7dc0e..fb62ea4 100644
--- a/app/views/home/setup_fetsite_dev.html.erb
+++ b/app/views/home/setup_fetsite_dev.html.erb
@@ -17,9 +17,12 @@ Im angelegten Verzeichnis den bundle installer ausführen.
 <pre>sudo gem install bundler</pre>
 ImageMagick,sqlite3 installieren
 <pre>sudo apt-get install libmagickwand-dev libsqlite3-dev nodejs</pre>
+
+
+<pre>sudo apt-get install libmysql-ruby libmysqlclient-dev</pre>
 gegebenenfalls g++ installieren
 <pre>cd fetsite
-sudo bundle install
+  sudo bundle install
 </pre>
 Falls Fehler auftreten je nach Fehlermeldung Pakete mit <code>apt-get</code> nach installieren (zB sqlite, ...) - google!
 

From f96c3dee9a0bceed6f00b9024013d0483c64b2c5 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 12 Apr 2014 18:03:39 +0200
Subject: [PATCH 14/15] studium_edit_lvas added

---
 app/controllers/studien_controller.rb  | 20 +++++++++++++++++---
 app/models/neuigkeit.rb                |  3 ++-
 app/models/studium.rb                  | 10 ++++++++--
 app/views/galleries/index.html.erb     |  9 +++++++--
 app/views/lvas/_nested_fields.html.erb | 21 +++++++++++++++++++++
 app/views/moduls/edit_lvas.html.erb    | 25 +------------------------
 app/views/neuigkeiten/_form.html.erb   | 25 ++++++++++++-------------
 app/views/studien/edit_lvas.html.erb   | 15 +++++++++++++++
 config/routes.rb                       |  9 ++++++---
 9 files changed, 89 insertions(+), 48 deletions(-)
 create mode 100644 app/views/lvas/_nested_fields.html.erb
 create mode 100644 app/views/studien/edit_lvas.html.erb

diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index 35f80d3..79de843 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -34,6 +34,7 @@ class StudienController < ApplicationController
     
     @toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) },
                        {:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)},
+                       {:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_lvas_studium_path(@studium)},
                        {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>'Sure?' }]
 
     @toolbar_modulgruppen =[ {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)},
@@ -57,6 +58,15 @@ class StudienController < ApplicationController
     @toolbar_elements<<{:text =>I18n.t('studien.allestudien'),:path=>studien_path(@studium)}
   end
 
+  def edit_lvas
+    @studium = Studium.find(params[:id])
+    @lvas=@studium.lvas
+    @semester=@studium.semester 
+    @toolbar_elements=[{:text => I18n.t('studien.anzeigen') , :path => url_for(@studium) }]
+    @toolbar_elements<<{:text =>I18n.t('studien.allestudien'),:path=>studien_path(@studium)}
+
+  end
+
   def create
     @studium = Studium.new(params[:studium])
     
@@ -73,9 +83,13 @@ class StudienController < ApplicationController
 
   def update
     @studium = Studium.find(params[:id])
-
-    if @studium.update_attributes(params[:studium])
-      redirect_to url_for(@studium), notice: 'Studium was successfully updated.' 
+    logger.info "params: #{params[:studium].inspect}"
+    if @studium.update_attributes(params[:studium]) 
+      if @studium.lvas.map(&:valid?).all?
+        redirect_to url_for(@studium), notice: 'Studium was successfully updated.' 
+      else
+        render action: "edit" 
+      end
     else
       render action: "edit" 
       
diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index e5b710b..e894dc9 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -23,6 +23,7 @@ class Neuigkeit < ActiveRecord::Base
 
   has_many :calentries, as: :object
   mount_uploader :picture, PictureUploader
+
   scope :published, -> {where("datum <= ? AND datum IS NOT NULL", Time.now.to_date).order(:datum).reverse_order}
   scope :recent, -> { published.limit(15)}
   scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
@@ -32,7 +33,7 @@ class Neuigkeit < ActiveRecord::Base
   accepts_nested_attributes_for :calentries, :allow_destroy=>true , :reject_if=> lambda{|a| a[:start].blank?}
   before_validation :sanitize
   has_many :nlinks
-
+  
   def datum_nilsave
 	self.datum.nil? ? Time.now + 42.years : self.datum
   end
diff --git a/app/models/studium.rb b/app/models/studium.rb
index 51afdf1..044ae08 100755
--- a/app/models/studium.rb
+++ b/app/models/studium.rb
@@ -27,18 +27,24 @@
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 class Studium < ActiveRecord::Base
-  attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache, :qualifikation,:struktur, :jobmoeglichkeiten
+  attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache, :qualifikation,:struktur, :jobmoeglichkeiten, :lvas_attributes
   has_many :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy
     scope :search, ->(query) {where("name like ? or studien.desc like ?", "%#{query}%", "%#{query}%")} 
   has_many :moduls, :through=>:modulgruppen
   has_many :lvas, :through=>:moduls
   has_many :semester, :dependent => :destroy
-  validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
+  
+validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
   validates :typ, :inclusion => {:in => ["Bachelor","Master"] }
   validates :name, :uniqueness => true, :presence=>true
   validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true 
+
   mount_uploader :picture, PictureUploader
+
+  accepts_nested_attributes_for :lvas #, :allow_destroy=>true # , :reject_if=> lambda{|a| a[:name].blank?}
+
   translates :desc,:shortdesc, :qualifikation,:struktur, :jobmoeglichkeiten, :versioning =>true,:fallbacks_for_empty_translations => true
+
   def title_context
     return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung
   end
diff --git a/app/views/galleries/index.html.erb b/app/views/galleries/index.html.erb
index 68a8a8f..258fd23 100644
--- a/app/views/galleries/index.html.erb
+++ b/app/views/galleries/index.html.erb
@@ -13,8 +13,13 @@
 	    end %>
       </div>
       <div class="media-body">
-	<small class="pull-left"><%= gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> </small>
-	<small class="pull-right"><%=I18n.l(gallery.try(:datum).try(:to_date)) unless gallery.try(:datum).try(:to_date).nil? %></small></br>
+	<small class="pull-left">
+	  <%= gallery.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> 
+	</small>
+	<small class="pull-right">
+	  <%=I18n.l(gallery.try(:datum).try(:to_date)) unless gallery.try(:datum).try(:to_date).nil? %>
+	</small>
+        </br>
 	<h1><%= gallery.name %></h1>
 	<p>
 	  <%= if gallery.desc.split.size > Gallery::WORD_COUNT
diff --git a/app/views/lvas/_nested_fields.html.erb b/app/views/lvas/_nested_fields.html.erb
new file mode 100644
index 0000000..ed6ff9d
--- /dev/null
+++ b/app/views/lvas/_nested_fields.html.erb
@@ -0,0 +1,21 @@
+<tr>
+  <td>
+    <h4><%= %></h4>
+    <%= f.semantic_errors :state %>
+    <%= f.input :id, :as=>:hidden %>
+  </td>
+  
+  <td><%= f.input :lvanr , :input_html => { "style"=>"width:7em" }%></td>
+  <td><%= f.input :name %></td>
+  <td>
+    <%= f.input :ects, :input_html => { "style"=>"width:4em" },:size=>5 %>
+    <%= f.input :stunden, :input_html => { "style"=>"width:4em" }%></td>
+  <td><%= f.input :typ, :input_html => { "style"=>"width:4em" }%></td>
+  <td>
+    <% f.input :semester , :input_html=>{:style=>"height:8em"},:collection=>@semester%>
+  </td>
+
+  <td><%= f.input :pruefungsinformation,:input_html=>{:rows=>5} %></td>
+
+  <td><%= f.input :desc, :input_html=>{:rows=>4}%></td>
+</tr>
diff --git a/app/views/moduls/edit_lvas.html.erb b/app/views/moduls/edit_lvas.html.erb
index 40a6338..9fdea1c 100644
--- a/app/views/moduls/edit_lvas.html.erb
+++ b/app/views/moduls/edit_lvas.html.erb
@@ -3,33 +3,10 @@
 <% i = 0 %>
 <% @lvas.each do |lva|%>
 <% i = i +1 %>
-<tr>
 <%= semantic_fields_for "lvas[#{i}]", lva  do |f|%>
-<td>
-<h4><%= lva.name %></h4>
-<%= f.semantic_errors :state %>
-<%= f.input :id, :as=>:hidden %></td>
-<td><%= f.input :lvanr , :input_html => { "style"=>"width:7em" }%></td>
-
-
-<td><%= f.input :name %></td>
-<td><%= f.input :ects, :input_html => { "style"=>"width:4em" },:size=>5 %>
-<%= f.input :stunden, :input_html => { "style"=>"width:4em" }%></td>
-<td><%= f.input :typ, :input_html => { "style"=>"width:4em" }%></td>
-<td>
-<%= f.input :semester , :input_html=>{:style=>"height:8em"},:collection=>@semester%></td>
-
-<td><%= f.input :pruefungsinformation,:input_html=>{:rows=>4} %></td>
-
-<td><%= f.input :desc, :input_html=>{:rows=>4}%></td>
-<td>
-<%= lva.valid? %>
-
-</td>
+      <%= render 'lvas/nested_fields', :f => f,:lva=>lva %> 
 
 <% end%>
-
-</tr>
 <% end %>
 
 <%= ff.actions do %>
diff --git a/app/views/neuigkeiten/_form.html.erb b/app/views/neuigkeiten/_form.html.erb
index 0712bab..480709e 100755
--- a/app/views/neuigkeiten/_form.html.erb
+++ b/app/views/neuigkeiten/_form.html.erb
@@ -9,23 +9,22 @@
 </div>  
 </div>
 <div class="row-fluid">
-<div class="span6">
-  <%  f.input :datum,   :as=> :datepicker      %>
+  <div class="span6">
+    <%  f.input :datum,   :as=> :datepicker      %>
     <%= f.input :rubrik,  :as=> :radio, :collection=>Rubrik.all %>
+  </div>  
+  <div class="span6">  
+    <%= f.input :author,  :as=> :select           %>
+  </div>  
 </div>  
-<div class="span6">  
-  <%= f.input :author,  :as=> :select           %>
-</div>  </div>  
 <div class="row-fluid">
-<div class="span12"> 
-   <%= f.input :picture, :as=> :file            %>
-  </div>  </div>  
+  <div class="span12"> 
+    <%= f.input :picture, :as=> :file            %>
+  </div>  
+</div>  
 
-  
-
- 
-      <%= f.semantic_fields_for :calentries , @calentries do |calentry| %>
-      <%= render 'calentries/nested_fields', :f => calentry %> 
+<%= f.semantic_fields_for :calentries , @calentries do |calentry| %>
+<%= render 'calentries/nested_fields', :f => calentry %> 
       <% end %>
    
   <% end %>
diff --git a/app/views/studien/edit_lvas.html.erb b/app/views/studien/edit_lvas.html.erb
new file mode 100644
index 0000000..08ac65a
--- /dev/null
+++ b/app/views/studien/edit_lvas.html.erb
@@ -0,0 +1,15 @@
+<%= semantic_form_for @studium do |ff|%>
+
+<table>
+
+  <%= ff.semantic_fields_for  :lvas, @lvas  do |f|%>
+  <%= render 'lvas/nested_fields', :f => f %> 
+  <% end %>
+  
+  <%= ff.actions do %>
+  <%= ff.action :submit, :as => :button %>
+  <%= ff.action :cancel, :as => :link %>
+  <% end %>
+      
+</table>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 404b381..0644b99 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,9 +25,12 @@
      # Studien 
     
      scope '(:ansicht)' do
-       resources :studien, :only=>[:new,:edit,:update,:destroy]
-       resources :studien, :only=>[:show]
-     end
+       resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do
+           member do
+             get :edit_lvas
+           end
+         end
+       end
      
      resources :modulgruppen,:only =>[:create,:index] do
        end

From b6e69925db27ea239e022d386117abe6acd79ff5 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 12 Apr 2014 18:03:48 +0200
Subject: [PATCH 15/15] webrick update

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index 9bde7ec..ec3165b 100755
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '3.2.13'
 gem 'sprockets', '2.2.2'
+gem 'webrick', '1.3.1'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
   gem 'mysql2'