From aa2ef0955cf9ecfb7caf35cc60fe9c5a05525021 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 23 Feb 2014 14:26:01 +0100
Subject: [PATCH 01/56] gemfile fix

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

diff --git a/Gemfile b/Gemfile
index b306fd4..eeb2f0a 100755
--- a/Gemfile
+++ b/Gemfile
@@ -93,4 +93,4 @@ gem "seed_dump", "~> 0.5.3"
 #gem "themes_for_rails" ,:git =>'git://github.com/tkriplean/themes_for_rails.git'
 #gem "themes_for_rails", :git=> 'git://github.com/lucasefe/themes_for_rails.git'
 gem 'themes_for_rails'
-gem 'remotipart', :git =>'git://github.com/JangoSteve/remotipart.git'
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ca442a..8bbc7d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,22 +90,14 @@ GEM
       actionpack (>= 3.0)
     formtastic-bootstrap (2.1.3)
       formtastic (~> 2.2)
-<<<<<<< HEAD
-    git (1.2.5)
-=======
     git (1.2.6)
->>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
     globalize (3.0.4)
       activemodel (>= 3.0.0, < 4.0.0)
       activerecord (>= 3.0.0, < 4.0.0)
     globalize-versioning (0.1.0.alpha.1)
       globalize (>= 3, < 5)
       paper_trail (~> 3.0.0)
-<<<<<<< HEAD
-    haml (4.0.0)
-=======
     haml (4.0.5)
->>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
       tilt
     hashie (2.0.5)
     hike (1.2.3)
@@ -118,13 +110,9 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-<<<<<<< HEAD
     jquery-ui-rails (4.1.1)
       railties (>= 3.1.0)
     json (1.7.7)
-=======
-    json (1.8.1)
->>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
     jwt (0.1.8)
       multi_json (>= 1.5)
     libv8 (3.16.14.3)
@@ -159,13 +147,8 @@ GEM
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-<<<<<<< HEAD
-    orm_adapter (0.4.0)
-    paperclip (3.4.0)
-=======
     orm_adapter (0.5.0)
     paperclip (3.4.2)
->>>>>>> b910973ee64c28c5c881a6a0957bea7f114ca266
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)

From 6022491a2675b3e65080486c7324415886cd6b6d Mon Sep 17 00:00:00 2001
From: Andreas Deutschmann <philo@fet.at>
Date: Wed, 12 Mar 2014 17:58:49 +0100
Subject: [PATCH 02/56] FIX: Translations Gremien Issure #121

---
 app/controllers/gremien_controller.rb | 2 +-
 app/views/fetprofiles/index.html.erb  | 2 +-
 app/views/gremien/verwalten.html.erb  | 2 +-
 config/locales/fetprofile.de.yml      | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb
index 966cc4c..497163f 100644
--- a/app/controllers/gremien_controller.rb
+++ b/app/controllers/gremien_controller.rb
@@ -6,7 +6,7 @@ class GremienController < ApplicationController
   def verwalten
     @gremien = Gremium.all
     @gremientabs=Gremium.tabs
-    @toolbar_elements << {:text=>I18n.t('common.new'),:path=>new_gremium_path() ,:icon=>:plus} if can? :new, Gremium
+    @toolbar_elements << {:text=>I18n.t('gremium.new'),:path=>new_gremium_path() ,:icon=>:plus} if can? :new, Gremium
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @gremien }
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index a36b5b2..d80a255 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -41,7 +41,7 @@
 
 <div class="row-fluid">
   <div class="span12">
-    <%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %>
+    <%= link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
   </div>
 </div></div>
 </div>
diff --git a/app/views/gremien/verwalten.html.erb b/app/views/gremien/verwalten.html.erb
index 3348678..38a339e 100644
--- a/app/views/gremien/verwalten.html.erb
+++ b/app/views/gremien/verwalten.html.erb
@@ -39,7 +39,7 @@
 
 <br />
 <%= render 'layouts/pretty_toolbar' %>
-<%= link_to 'New Gremium', new_gremium_path %>
+
 
 
 
diff --git a/config/locales/fetprofile.de.yml b/config/locales/fetprofile.de.yml
index 335d99e..8d938b5 100644
--- a/config/locales/fetprofile.de.yml
+++ b/config/locales/fetprofile.de.yml
@@ -7,6 +7,7 @@ de:
     notactive_members: "Pension"
     new_profile: "Neues Profil anlegen"
   gremium:
+    new: "Neues Gremium"
     filter:
       berufung:
         title: "Berufungskommission"

From 1dd6f027a0cb5b7a79b492260d38f99eec3f4846 Mon Sep 17 00:00:00 2001
From: Andreas Deutschmann <philo@fet.at>
Date: Wed, 12 Mar 2014 22:07:03 +0100
Subject: [PATCH 03/56] FIX: Issue #117

---
 app/controllers/fetprofiles_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb
index 2f8a654..ad61588 100644
--- a/app/controllers/fetprofiles_controller.rb
+++ b/app/controllers/fetprofiles_controller.rb
@@ -28,7 +28,7 @@ class FetprofilesController < ApplicationController
    
      @toolbar_elements << {:hicon=>'icon-pencil', :text=> I18n.t('common.edit'),:path => edit_fetprofile_path(@fetprofile) } if can? :edit, @fetprofile
 
-      @toolbar_elements << {:hicon=>'icon-minus', :text => I18n.t('common.delete'), :method=>:delete, :confirm=>"Sure"}
+      @toolbar_elements << {:hicon=>'icon-minus', :text => I18n.t('common.delete'), :method=>:delete, :confirm=>"Sure"} if can? :destroy,@fetprofile
           
    
     respond_to do |format|

From 9fae6dae7f3030e7e428904dd221c1d445bf967e Mon Sep 17 00:00:00 2001
From: Andreas Deutschmann <philo@fet.at>
Date: Wed, 12 Mar 2014 22:20:04 +0100
Subject: [PATCH 04/56] FIX: Translation Missing Themengruppe verwalten

---
 app/controllers/themengruppen_controller.rb | 2 +-
 config/locales/themen.de.yml                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb
index aba10ca..07c0a06 100644
--- a/app/controllers/themengruppen_controller.rb
+++ b/app/controllers/themengruppen_controller.rb
@@ -22,7 +22,7 @@ class ThemengruppenController < ApplicationController
     @toolbar_elements = []
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('thema.add'), :path=>new_themengruppe_thema_path(@themengruppe)} if can? :new, Themengruppe
     @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('themengruppe.edit'), :path=>edit_themengruppe_path(@themengruppe)} if can? :edit, @themengruppe
-  @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.verwalten"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe
+  @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.manage"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe
   @toolbar_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('themengruppe.remove'), :path=>themengruppe_path(@themengruppe), :method=>:delete,:confirm=>I18n.t('themengruppe.sure')} if can? :delete, @themengruppe
 
 
diff --git a/config/locales/themen.de.yml b/config/locales/themen.de.yml
index 7430b27..3b0229b 100644
--- a/config/locales/themen.de.yml
+++ b/config/locales/themen.de.yml
@@ -5,6 +5,7 @@ de:
     edit: "Themengruppe bearbeiten"
     remove: "Themengruppe löschen"
     sure: "Sicher, dass Sie diese Themengruppe löschen möchten?"
+    manage: "Themengruppe verwalten"
   thema:
     add: "Thema hinzufügen"
     edit: "Thema bearbeiten"

From 4ac7b41a7fa291ffe966369203f653be54f2bfff Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 11:19:10 +0100
Subject: [PATCH 05/56] lecturer load lva load first steps

---
 app/controllers/lvas_controller.rb    | 11 +++++++++++
 app/controllers/moduls_controller.rb  |  1 +
 app/models/lecturer.rb                | 12 ++++++++++++
 app/models/lva.rb                     |  2 +-
 app/views/lecturers/_lec_lva.html.erb | 16 ++++++++--------
 app/views/lecturers/show.html.erb     |  3 +++
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb
index 8919adb..7f0bd65 100755
--- a/app/controllers/lvas_controller.rb
+++ b/app/controllers/lvas_controller.rb
@@ -36,6 +36,17 @@ class LvasController < ApplicationController
 
 
   end
+
+  def compare_tiss
+
+  end
+  
+  def load_tiss
+
+  end
+
+
+
   # POST /lvas
   # POST /lvas.json
   def create
diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb
index 624d536..ace786b 100755
--- a/app/controllers/moduls_controller.rb
+++ b/app/controllers/moduls_controller.rb
@@ -8,6 +8,7 @@ class ModulsController < ApplicationController
       if !params[:studium_id].nil?
         @studium=Studium.find_by_id(params[:studium_id])
       end
+
       @toolbar_elements = [{:hicon=>'icon-plus-sign', :text=>I18n.t("modul.add"), :path=>new_modul_path}]
       @topbar_elements =[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}]
       @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}
diff --git a/app/models/lecturer.rb b/app/models/lecturer.rb
index f860542..8195633 100644
--- a/app/models/lecturer.rb
+++ b/app/models/lecturer.rb
@@ -16,4 +16,16 @@ class Lecturer < ActiveRecord::Base
   has_and_belongs_to_many :lvas
   mount_uploader :picture, PictureUploader
   resourcify
+
+  def load_tissdata
+    url= "https://tiss.tuwien.ac.at/adressbuch/adressbuch/person_via_oid/"+self.oid.to_s+".xml"
+    hash=Hash.from_xml(open(url).read)["tuvienna"]
+    self.name=hash["person"]["firstname"]+" "+hash["person"]["lastname"]
+    if hash["person"]["employee"]["employment"].is_a? Array
+   self.email= hash["person"]["employee"]["employment"].first["emails"]["email"].first
+    else
+      self.email= hash["person"]["employee"]["employment"]["emails"]["email"].first
+    end
+    self.link= "https://tiss.tuwien.ac.at/adressbuch/adressbuch/person_via_oid/"+self.oid.to_s
+  end
 end
diff --git a/app/models/lva.rb b/app/models/lva.rb
index 241b4b6..4bf9bf8 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -87,7 +87,7 @@ class Lva < ActiveRecord::Base
   #  rescue OpenURI::HTTPError => e
  #   end 
     self.name=hash["course"]["title"][I18n.locale.to_s]
-    self.pruefungsinformation=  hash["course"]["examinationModalities"][I18n.locale.to_s]
+    self.pruefungsinformation =  hash["course"]["examinationModalities"][I18n.locale.to_s]
     self.desc= hash["course"]["objective"][I18n.locale.to_s]+hash["course"]["teachingContent"][I18n.locale.to_s]
     self.typ=hash["course"]["courseType"]
     self.stunden=hash["course"]["weeklyHours"]
diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb
index 21a9536..83cc332 100644
--- a/app/views/lecturers/_lec_lva.html.erb
+++ b/app/views/lecturers/_lec_lva.html.erb
@@ -1,11 +1,11 @@
 <div class="media">
-	<a class="pull-left" href="#">
-	  <img class="media-object img" src="<%= lec_lva.picture.thumb.url %>"/>
-	</a>
-	<div class="media-body">
-	  <h4><%= link_to lec_lva.name, lec_lva %></h4>
+  <a class="pull-left" href="#">
+    <img class="media-object img" src="<%= lec_lva.picture.thumb.url  unless lec_lva.picture.nil? %>"/>
+  </a>
+  <div class="media-body">
+    <h4><%= link_to lec_lva.name, lec_lva %></h4>
 	  	Email: <%= mail_to lec_lva.email %><br>
-        TISS: <%= link_to lec_lva.name, lec_lva.link %>
-	</div>
-      </div>
+    TISS: <%= link_to lec_lva.name, lec_lva.link %>
+  </div>
+</div>
 
diff --git a/app/views/lecturers/show.html.erb b/app/views/lecturers/show.html.erb
index 21e93cb..7f6cf37 100644
--- a/app/views/lecturers/show.html.erb
+++ b/app/views/lecturers/show.html.erb
@@ -1,5 +1,8 @@
 <p id="notice"><%= notice %></p>
 
+
+<%= render partial: "lec_lva", object: @lecturer %>
+
 <p>
   <b>Name:</b>
   <%= @lecturer.name %>

From e62416dde4f18766f593345a7e0b8a627c7afcab Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 11:19:18 +0100
Subject: [PATCH 06/56] remotipart fix

---
 app/assets/javascripts/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 3492931..06452cd 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -25,7 +25,7 @@
 //= require bootstrap/load-image.min
 //= require bootstrap/image-gallery.min
 //= require jquery-fileupload
-//= require jquery.remotipart
+// require jquery.remotipart
 function insertAttachment(url,name) {
     var ext = url.split('.').pop().toLowerCase();
     var img_ext = [ "jpg", "png", "bmp" , "jpeg" ];

From 35cb224fb67a2f1ac83a98d608406d49aa22275a Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 11:19:31 +0100
Subject: [PATCH 07/56] beuigkeiten reihenfolge fix

---
 app/models/neuigkeit.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index 2a0f582..1660869 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -24,7 +24,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.order(:datum).reverse_order.limit(15)}
+  scope :recent, -> { published.limit(15)}
   scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
   scope :public, ->{includes(:rubrik).where("rubriken.public"=>:true)}
   scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}

From 340c9a4455f88960f70e6f5ed29c578550544415 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 11:19:47 +0100
Subject: [PATCH 08/56] fetlogin translated

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

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 50c915a..67f30b9 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -7,7 +7,7 @@
 	<% end %>
       </ul>
 <p>
-<%= link_to "FET Login", user_omniauth_authorize_path(:ldap) %>
+<%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
 </p>
   <div class="alert">
     <h2>Beta Test</h2>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1f17239..7305808 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -13,6 +13,7 @@ de:
     sure_del: "Sicher endgültig löschen?"
   home:
     mtitle: "Menu"
+    login: "FET Login"
     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."
     home: "Startseite"

From dfe06c549563dbd68cbf24fd0f29f3f07a410675 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 11:20:04 +0100
Subject: [PATCH 09/56] remotipart removed

---
 Gemfile.lock | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 515aca0..c2a82fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,3 @@
-GIT
-  remote: git://github.com/JangoSteve/remotipart.git
-  revision: aadc29e996c35096ee971bdc6cbf7ab148077a3a
-  specs:
-    remotipart (1.2.1)
-
 GIT
   remote: git://github.com/airblade/paper_trail.git
   revision: 802b7d4ead71703860fcb9befc2c9b2ee05a8b9f

From dbf02ef3f8b693c62ad9bdaee98d839f5f65a03b Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 11:23:23 +0100
Subject: [PATCH 10/56] removed database.yml

---
 .gitignore                                    | 2 +-
 config/{database.yml => database.yml.example} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename config/{database.yml => database.yml.example} (100%)

diff --git a/.gitignore b/.gitignore
index 1b36e60..3bc8802 100755
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 /db/schema.rb
 /db/structure.sql
 /config/initializers/devise.rb
-
+Gemfile.lock
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
diff --git a/config/database.yml b/config/database.yml.example
similarity index 100%
rename from config/database.yml
rename to config/database.yml.example

From 34fe0739d623a626cb40f154017be39c650efe50 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 13:13:31 +0100
Subject: [PATCH 11/56] lecturers von tiss laden

---
 app/controllers/lvas_controller.rb | 19 +++++-
 app/models/lva.rb                  | 92 ++++++++++++++++++++++++++----
 app/views/lecturers/index.html.erb |  2 +-
 app/views/lvas/_lva.html.erb       | 41 ++++++-------
 config/routes.rb                   |  6 +-
 5 files changed, 121 insertions(+), 39 deletions(-)

diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb
index 7f0bd65..a76a7fa 100755
--- a/app/controllers/lvas_controller.rb
+++ b/app/controllers/lvas_controller.rb
@@ -18,6 +18,9 @@ class LvasController < ApplicationController
     @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)}
      @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
     @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('common.delete'), :path=> lva_path(@lva), :method=>:delete, :confirm=>'Sure?' }
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>"df", :path=> lva_compare_tiss_path(@lva)}
+
+
   end
 
   # GET /lvas/new
@@ -38,11 +41,21 @@ class LvasController < ApplicationController
   end
 
   def compare_tiss
-
+    @lva = Lva.find_by_id(params[:lva_id])
+    @lvatiss = Lva.new
+    @lvatiss.lvanr=@lva.lvanr
+    @lvatiss.load_tissdata("-2013W")
+ 
   end
   
   def load_tiss
-
+    @lva = Lva.find_by_id(params[:lva_id])
+    @lva.load_tissdata("-2013W")
+    if @lva.save
+      redirect_to @lva , notice: 'Lva von TISS geleaden.'
+    else
+      redirect_to @lva, action: :compare_tiss
+    end
   end
 
 
@@ -54,7 +67,7 @@ class LvasController < ApplicationController
  
     respond_to do |format|
       if @lva.save
-         @lva.add_semesters
+        @lva.add_semesters
         format.html { redirect_to @lva, notice: 'Lva was successfully created.' }
         
       else
diff --git a/app/models/lva.rb b/app/models/lva.rb
index 4bf9bf8..e963d0d 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -36,14 +36,14 @@
 
 class Lva < ActiveRecord::Base
   ERLAUBTE_TYPEN = ['VO', 'UE', 'VU', 'LU', 'SE', 'andere'];
-  has_paper_trail # Versionsverfolgung
+  has_paper_trail :ignore=>[:desc, :pruefungsinformation]# Versionsverfolgung
   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,  :fallbacks_for_empty_translations => true
+  translates :desc,:pruefungsinformation,  :fallbacks_for_empty_translations => true, :versioning=>true
   
   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 
   validates_presence_of :ects  # ECTS vorhanden?
@@ -72,10 +72,35 @@ class Lva < ActiveRecord::Base
 
   ##
   # Lade Daten aus TISS und füge diese in die Datenbank ein. 
+  def tisshash(semester)
+   url= "https://tiss.tuwien.ac.at/api/course/"+ lvanr.to_s.gsub(".","")+semester
+  hash=Hash.from_xml(open(url).read)["tuvienna"]
+  end
   def load_tissdata(semester)
-    url= "https://tiss.tuwien.ac.at/api/course/"+ lvanr.to_s.gsub(".","")+semester
-#    begin 
+    urlp="https://tiss.tuwien.ac.at/api/course/"+ lvanr.to_s.gsub(".","")+"-"
+    begin
+      url= urlp+Time.now.year.to_s+"W"
       hash=Hash.from_xml(open(url).read)["tuvienna"]
+    rescue OpenURI::HTTPError => e
+      begin
+        url= urlp+Time.now.year.to_s+"S"
+        hash=Hash.from_xml(open(url).read)["tuvienna"]
+      rescue OpenURI::HTTPError => e
+      begin
+        url= urlp+(Time.now.year-1).to_s+"W"
+        hash=Hash.from_xml(open(url).read)["tuvienna"]
+      rescue OpenURI::HTTPError => e
+        
+      end 
+        
+      end 
+      
+    end 
+ 
+
+
+#    begin 
+ 
   #    person=[] 
   #    if hash["course"]["lecturers"]["oid"].is_a? String
   #      person = @hash["course"]["lecturers"]["oid"]
@@ -84,15 +109,60 @@ class Lva < ActiveRecord::Base
   #        person << Hash.from_xml(open("https://tiss.tuwien.ac.at/adressbuch/adressbuch/person_via_oid/" + pid.to_s + ".xml").read)["tuvienna"]["person"]
   #      end
   #    end
-  #  rescue OpenURI::HTTPError => e
- #   end 
-    self.name=hash["course"]["title"][I18n.locale.to_s]
-    self.pruefungsinformation =  hash["course"]["examinationModalities"][I18n.locale.to_s]
-    self.desc= hash["course"]["objective"][I18n.locale.to_s]+hash["course"]["teachingContent"][I18n.locale.to_s]
+    self.name=hash["course"]["title"]["de"]
+    self.pruefungsinformation =  hash["course"]["examinationModalities"][I18n.locale.to_s].to_s
+    self.desc= hash["course"]["objective"][I18n.locale.to_s]+"<p></p>"+hash["course"]["teachingContent"][I18n.locale.to_s]
     self.typ=hash["course"]["courseType"]
     self.stunden=hash["course"]["weeklyHours"]
-  end
-  
+    #hash["course"]["url"]  
+    if hash["course"]["lecturers"]["oid"].is_a? Array
+      hash["course"]["lecturers"]["oid"].each do |oid|
+        lecturer= self.lecturers.where(:oid=>oid).first
+        if lecturer.nil?
+          lecturer=Lecturer.where(:oid=>oid).first
+          if lecturer.nil?
+            logger.debug "Neuen Lecturer laden"
+            lecturer=Lecturer.new
+            lecturer.oid=oid
+            lecturer.load_tissdata
+            if lecturer.save
+              self.lecturers << lecturer
+            else
+              logger.fatal "Invaliden Lecturer erzeugt"
+            end
+          else
+            logger.debug "Lecturer hinzufügen"
+            self.lecturers << lecturer
+          end
+        end
+      end
+    else
+      oid=  hash["course"]["lecturers"]["oid"]
+      lecturer= self.lecturers.where(:oid=>oid).first
+      if lecturer.nil?
+        lecturer=Lecturer.where(:oid=>oid).first
+        if lecturer.nil?
+          logger.info "Neuen Lecturer laden"
+          lecturer=Lecturer.new
+          lecturer.oid=oid
+            lecturer.load_tissdata
+          if lecturer.save
+            self.lecturers << lecturer
+          else
+            logger.fatal "Invaliden Lecturer erzeugt"
+          end
+        else
+          
+          logger.info "Lecturer hinzufügen"
+          lecturer.load_tissdata
+          lecturer.save
+          self.lecturers << lecturer
+        end
+      end
+    
 
+    end
+    
+  end
 
 end
diff --git a/app/views/lecturers/index.html.erb b/app/views/lecturers/index.html.erb
index fe977db..8595cc6 100644
--- a/app/views/lecturers/index.html.erb
+++ b/app/views/lecturers/index.html.erb
@@ -16,7 +16,7 @@
     <td><%= lecturer.name %></td>
     <td><%= lecturer.email %></td>
     <td><%= lecturer.oid %></td>
-    <td><%= lecturer.picture %></td>
+    <td><%= image_tag lecturer.picture.thumb %></td>
     <td><%= link_to 'Show', lecturer %></td>
     <td><%= link_to 'Edit', edit_lecturer_path(lecturer) %></td>
     <td><%= link_to 'Destroy', lecturer, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/lvas/_lva.html.erb b/app/views/lvas/_lva.html.erb
index e78e1f7..a49bb55 100755
--- a/app/views/lvas/_lva.html.erb
+++ b/app/views/lvas/_lva.html.erb
@@ -1,28 +1,25 @@
-<% @lva.modul.each do |modul| %>
-<% modul.modulgruppen.each do |g| %>
-<ul class="breadcrumb">
-<li><%= link_to g.studium.name , studium_path(g.studium)%>
-<span class="divider"></span></li>
-<li><%= link_to g.name , modulgruppe_path(g)%><span class="divider">/</span></li>
-<li><%= link_to modul.name , modul_path(modul)%></li>
-<% end %>
-</ul>
-<% end %>
-
 <p id="notice"><%= notice %></p>
+
+      <h1><%=lva.typ.to_s + ' ' +  lva.name %></h1>
+      <h2>Prüfungsinformation</h2>
+      <div class="">
+	<%= lva.pruefungsinformation.to_s.html_safe %>
+      </div>
+      <h2>Lernaufwand</h2>
+      <div class="">
+	<%= lva.lernaufwand %>
+      </div>
+      <h2>Beschreibung</h2>
+      <div class="">
+	<%= lva.desc.to_s.html_safe %>
+      </div>
+
+
 <p>
-	<%= @lva.lvanr %>
-	<b><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</b>
-	
+	<%= lva.lvanr %>
+	<b><%= lva.name %> <%= lva.ects %> ECTS/ <%= lva.stunden %> Std</b>
 </p>
 <p>
-  <%= @lva.desc %>
+
 </p>
-<ul>
-<% @lva.beispiele.each do |b|%>
 
-<li><%= render b%></li>
-
-<% end %>
-</ul>
-<%= toolbar_html(@toolbar_elements) %>
diff --git a/config/routes.rb b/config/routes.rb
index bdfe913..b97e959 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,9 +62,11 @@ end
        get 'load_tiss'
        post 'show_tiss'
      end
-resources :beispiele#, :only=>[:show,:index,:create]
-     resources :lvas  do 
      resources :beispiele#, :only=>[:show,:index,:create]
+     resources :lvas  do 
+       get 'compare_tiss'
+       get 'load_tiss'
+       resources :beispiele#, :only=>[:show,:index,:create]
      end 
      
      resources :fragen

From 3b8aee9e470a9bdb3e8f8586b2eee5383d77bdd0 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 13:32:09 +0100
Subject: [PATCH 12/56] searchresults themen fixed

---
 app/views/home/_search_results.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/home/_search_results.html.erb b/app/views/home/_search_results.html.erb
index 9989e84..b4153fb 100644
--- a/app/views/home/_search_results.html.erb
+++ b/app/views/home/_search_results.html.erb
@@ -28,10 +28,11 @@
 <% end %>
 
 <% @themen.each do |thema| %>
-<ul class="unstyled linkbox-list" style="max-width:70em">
-  <li><%= link_to thema,  {:class=>"linkbox"} do %>
+<ul class="unstyled content-list" style="max-width:70em">
+  <li><%= link_to thema.title,thema %>
+<div class="contentbox">
       <%= render :partial=>"themen/small", :object=>thema %>
-<% end %>
+</div>
   </li>
 </ul>
 <% end %>

From 286fb014d260525b331334aea149605d21f2d955 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 13:32:27 +0100
Subject: [PATCH 13/56] kontakt added

---
 app/controllers/home_controller.rb |  2 ++
 app/views/home/index.html.erb      |  4 ++--
 app/views/layouts/menu.html.erb    |  3 ++-
 config/locales/de.yml              |  1 +
 config/routes.rb                   | 14 ++++++++------
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 4333ec6..019cff1 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -6,6 +6,8 @@ class HomeController < ApplicationController
   end
   def dev
 
+  end
+  def kontakt
   end
   def startdev
   render 'setup_fetsite_dev'
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 67f30b9..87417d4 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -23,12 +23,12 @@
     </p>
     <p><%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %></p>
     <p>Um bei der Entwicklung mitzuhelfen braucht nur Ruby on Rails installiert werden</p>
-    <p><%= link_to "Getting Started" , home_startdev_path%></p>
+    <p><%= link_to "Getting Started" , startdev_home_index_path %></p>
     <p> Das Kalender Feature wird überarbeitet, in Zukunft soll folgender Link nicht mehr funktionieren 	  <%= link_to "Kalender", calendars_path %>
     </p>
 
   </div>
-  <%= link_to "Entwicklungsstatus" , home_dev_path %>
+  <%= link_to "Entwicklungsstatus" , dev_home_index_path %>
   <%= render 'beispiele' %>
 
 Verschiedene Styles
diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb
index d6ea8f5..1702221 100644
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -17,7 +17,8 @@
 	  <li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %></li>
 	  <li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %></li>
 	  <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
-<li> <%= link_to I18n.t("home.search"), search_home_index_path %></li>
+	  <li> <%= link_to I18n.t("home.search"), search_home_index_path %></li>
+<li> <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path %></li>
 	  <li>
 	    <%= link_to 'Admin' , config_path%>
 	  </li>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7305808..3005cde 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:
+    kontakt: "Kontakt"
     mtitle: "Menu"
     login: "FET Login"
     willkommen: "Willkommen bei der Fachschaft Elektrotechnik"
diff --git a/config/routes.rb b/config/routes.rb
index b97e959..9b08b5d 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -98,12 +98,14 @@ end
      # get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
      # get 'rubriken/verwalten',:controller=>:rubriken,:action=>:alle_verwalten, :as=>'rubriken_verwalten'
      
-     resources :home, :only=>[:index]
-     get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
-     get 'home/startdev', :controller=>:home, :action=>:startdev, :as=>'home_startdev'
-     get 'home/linksnotimplemented', :controller=>:home, :action=>:linksnotimplemented, :as=>'home_linksnotimplemented'
-     
-    
+     resources :home, :only=>[:index] do
+       collection do
+         get 'dev'
+         get 'startdev'
+         get 'linksnotimplemented'
+         get 'kontakt' 
+       end
+    end
     
      resources :themen do
        get :fragen

From 0959cb067dc2ea403549c392c526ea86ded51e1e Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:15:06 +0100
Subject: [PATCH 14/56] fixed insert issue

---
 app/assets/javascripts/application.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 06452cd..50fb36d 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -30,10 +30,20 @@ function insertAttachment(url,name) {
     var ext = url.split('.').pop().toLowerCase();
     var img_ext = [ "jpg", "png", "bmp" , "jpeg" ];
     
+ //   if ( img_ext.indexOf(ext) > -1) {
+//	tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<img src=\"" + url + "\" title=\"" + name + "\">");
+//    }
+//    else {
+//	tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<a href=\"" + url + "\">" + name +"</a>");
+//    }
+
+
     if ( img_ext.indexOf(ext) > -1) {
-	tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<img src=\"" + url + "\" title=\"" + name + "\">");
+	tinymce.activeEditor.execCommand('mceInsertContent', false, "<img src=\"" + url + "\" title=\"" + name + "\">");
     }
     else {
-	tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<a href=\"" + url + "\">" + name +"</a>");
+	tinymce.activeEditor.execCommand('mceInsertContent', false, "<a href=\"" + url + "\">" + name +"</a>");
     }
+
+
 }

From 2598fc28f9b253207fab2e2026337d4a3fe4ca04 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:15:24 +0100
Subject: [PATCH 15/56] button text lvas

---
 app/controllers/lvas_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb
index a76a7fa..2c96802 100755
--- a/app/controllers/lvas_controller.rb
+++ b/app/controllers/lvas_controller.rb
@@ -15,10 +15,10 @@ class LvasController < ApplicationController
   def show
     @lva = Lva.find_by_id(params[:id])
    @beispiel=Beispiel.new
-    @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)}
+#    @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)}
      @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
     @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('common.delete'), :path=> lva_path(@lva), :method=>:delete, :confirm=>'Sure?' }
-    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>"df", :path=> lva_compare_tiss_path(@lva)}
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>"Tissvergleichladen", :path=> lva_compare_tiss_path(@lva)}
 
 
   end

From 6d4c24742ac5bacb16af59c5192134b3ca4e488f Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:15:48 +0100
Subject: [PATCH 16/56] added some transations to thema

---
 app/controllers/themen_controller.rb |  2 ++
 app/views/themen/new.html.erb        |  5 +++--
 config/locales/de.yml                |  1 +
 config/locales/themen.de.yml         | 17 ++++++++++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb
index 4435ec6..566aa4b 100644
--- a/app/controllers/themen_controller.rb
+++ b/app/controllers/themen_controller.rb
@@ -56,9 +56,11 @@ class ThemenController < ApplicationController
       if @thema.save
         format.html { redirect_to @thema, notice: 'Thema was successfully created.' }
         format.json { render json: @thema, status: :created, location: @thema }
+        format.js   {render action: "update"}
       else
         format.html { render action: "new" }
         format.json { render json: @thema.errors, status: :unprocessable_entity }
+      format.js   { render action: "edit" }
       end
     end
   end
diff --git a/app/views/themen/new.html.erb b/app/views/themen/new.html.erb
index 5a0ff02..d2d719c 100644
--- a/app/views/themen/new.html.erb
+++ b/app/views/themen/new.html.erb
@@ -1,5 +1,6 @@
-<h1>New thema</h1>
 
+<div id="themaview">
+<h1><%= I18n.t("thema.add") %></h1>
 <%= render 'form' %>
-
+</div>
 <%= link_to 'Back', themen_path %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3005cde..0f0ae05 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -24,6 +24,7 @@ de:
     mitarbeiter: "Mitarbeiter"
     fotos: "Fotos"
     search: "Suche"
+
   formtastic:
     titles:
       modul: 
diff --git a/config/locales/themen.de.yml b/config/locales/themen.de.yml
index 3b0229b..1df9261 100644
--- a/config/locales/themen.de.yml
+++ b/config/locales/themen.de.yml
@@ -18,4 +18,19 @@ de:
     sure: "Sicher, dass Sie diese Frage löschen möchten?"
   attachment:
     title: "Anhang"
-    add: "Anhang hinzufügen"
\ No newline at end of file
+    add: "Anhang hinzufügen"
+  formtastic:
+    labels:
+      thema:
+        title: "Themen Name"
+        themengruppe: "Gruppe"
+    hints:
+      thema:
+        title: "Überschrift"
+  activerecord:
+    errors:
+      models:
+        thema:
+          attributes:
+            title:
+              blank: "Der Themen Name darf nicht leer sein!"

From 4eebaec13212ff8c4ec2d818b20477dd27231ed7 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:16:15 +0100
Subject: [PATCH 17/56] missing views & Migration

---
 app/views/home/kontakt.html.erb               |  1 +
 app/views/lvas/compare_tiss.html.erb          | 29 +++++++++++++++++++
 ...ruefungsinformation_to_lva_translations.rb |  5 ++++
 3 files changed, 35 insertions(+)
 create mode 100644 app/views/home/kontakt.html.erb
 create mode 100644 app/views/lvas/compare_tiss.html.erb
 create mode 100644 db/migrate/20140316120312_add_pruefungsinformation_to_lva_translations.rb

diff --git a/app/views/home/kontakt.html.erb b/app/views/home/kontakt.html.erb
new file mode 100644
index 0000000..48cb162
--- /dev/null
+++ b/app/views/home/kontakt.html.erb
@@ -0,0 +1 @@
+<%= I18n.t "home.kontakt" %>
diff --git a/app/views/lvas/compare_tiss.html.erb b/app/views/lvas/compare_tiss.html.erb
new file mode 100644
index 0000000..20f0a41
--- /dev/null
+++ b/app/views/lvas/compare_tiss.html.erb
@@ -0,0 +1,29 @@
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span6">
+      <p>&nbsp;</p>	
+      <p>&nbsp;</p>	
+      <%= render partial: "lva", object: @lva %>
+	<h2> <%= I18n.t "lecturers.lecturers" %> </h2>
+	<% @lva.lecturers.each do |lec| %>
+	<%= render :partial=>'lecturers/lec_lva', :object=>lec %>
+
+	<% end %>
+
+
+    </div>
+    <div class="span6">
+      <p> Tiss Version</p>
+      <%= link_to "Von Tiss laden", lva_load_tiss_path(@lva) %> 
+      <%= render partial: "lva", object: @lvatiss %>
+      
+      <h2> <%= I18n.t "lecturers.lecturers" %> </h2>
+      <% @lvatiss.lecturers.each do |lec| %>
+      <%= render :partial=>'lecturers/lec_lva', :object=>lec %>
+
+      <% end %>
+
+    </div>
+
+  </div>
+</div>
diff --git a/db/migrate/20140316120312_add_pruefungsinformation_to_lva_translations.rb b/db/migrate/20140316120312_add_pruefungsinformation_to_lva_translations.rb
new file mode 100644
index 0000000..58271df
--- /dev/null
+++ b/db/migrate/20140316120312_add_pruefungsinformation_to_lva_translations.rb
@@ -0,0 +1,5 @@
+class AddPruefungsinformationToLvaTranslations < ActiveRecord::Migration
+  def change
+    add_column :lva_translations, :pruefungsinformation,:text
+  end
+end

From 0411a71394a53b3b211d8818a85c9b29eada64bf Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:16:21 +0100
Subject: [PATCH 18/56] logos

---
 public/fet_innen-6.png | Bin 0 -> 7856 bytes
 public/fetlogo2.png    | Bin 0 -> 5338 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/fet_innen-6.png
 create mode 100644 public/fetlogo2.png

diff --git a/public/fet_innen-6.png b/public/fet_innen-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..5648955100fdb2cc5dc2ae273707464fc2e7370f
GIT binary patch
literal 7856
zcmW+*1z1yEAHQ@-BPk*Af|3)ElybyKK^g&Zq#zyAs5GOI4nbOBG}1_nl5%t-($YPF
zeb;Z#v+db-cJDdof6lK?)H7{Wa#Che0078gYEV7!y#suj5)*>2+wcep@D1NX38qgB
zJ_3lXBf-xku4*P80Dv3v?}=lkW$6lj$>gbQ?D^cq*3-wz-3IXS@ey)xcJzQ-x!MT1
zxZ7pz%Q6E1n;;CTsQ)&5FULQC&LFif_`;AkM`Bx+_?<oR=;0+FsSwBKJJE4p6v9=h
zc)#}rz3?<=?R8V(PAI@7>~pg=oMN?`%2}npcVF~jKWR){jEtNs^w~S&cH&R?oW2P}
z`Dk;m^Z3e#&KQ$-+^lu&c{*}s%@?_+dn4Osn@j#9O^C>s=qG&9T{x`-D?~tCPj9dJ
z?bhe`+&K3}C(pNaGKZ|2wwHA5fct3f6Mt2^P@~Eh8D)Ix+S5KmgjF9qS~C9l1Xmb*
zuc@gCc5-o%r&uvIF`0d0J}=19X?VMDi&(y~F(inxe*i=TRp=WUs+-S3Sj?_kvQ~pG
zKF}#g#c~(&sgs5rDd|pq|3IYb?J(-(w0<CDh_u+l7wJSACvk7nko`*geh~Z=YUFLO
z>=ZCFxU4lXJ#EL;zxl;su2ZcBQJsHl0~IT9^s|M(<PVnkE=4KcbrHj@0e$+Oj<UUq
zZT1oleys?-d8!}wkb&g9cc3j~e+K_M*gvk)BwF2`ME1@i#X&-gXD&{-;Fz*F3ItZq
zQ(SY_mmd?)Dh@vSvp!PU3$}i$e~j1V)l6Wbdqs|=J)gD9Gx2>rW8CxaLR#M{X(~U&
z?)-<Lai|H>0OFXvERYgkziMrQSNz*gS4l}a?Ql!3ytBL8%ZqX#9;77WSAINI4gR>r
z|04MQixOzU5LKlkPPUjcBRu2X@S70^aGoeVLesdnpXayg;4=^%X`Bd#(4xqxX9t(V
zBnuYb#k?CFR4*$p-(dsXj*gD7S232?1yXwc*|qce<vTDy5J);L5F=I>>|z|EdnM3r
zgUF%Te^XmRR;?ODrf*<y!`xX51T9WYoy(Bzq1~KcN^uPxGXdmE$rB>KUYX-jN4W<I
zc+aA68;(_126*!{39A(NnhkVQ6j!aeVKg7>bg_YYe6)KQ3aUhnZ#Sus^9olNn~Vt*
z=f6MvnXR41jbw<H3}NXWC@p{ZunOWHvl_E%7@*l=A>j*MZ>&+Yg;URO!~@h?q<XS!
zogVqtjBugv+Q{i(36itb9}Kl|k(pAP<e9}x%9Sgeth#hI1R*jwfBHv8+U>r-Ct%}u
zUzYfjDF4WZ=mGy7UIi#Rbl%EumhZCyx{f`9nj!DuXECi9>V3QyIXB>cr9x;fUy<xf
zyZwUNaAzFwgPjb4(EotK6fQ?c>V}!%cBjj~`q`Z;<h8%a5n9EEM1Cvav&x%7K(HKF
zSzYy5IdCB{4h{{~M)IYLGVu!wQ!*L$GtwG4AxK<mpRtbwKsFh&Pu6M#vb5b05NI?$
zSHZmwe>-2_reJ|;a;J65nEAcieAiuqmB-FvT3L)L6APt}QXfY3XCJ=KOl4G0fY=7j
zM)n)ue-s-8R_7^~mbFPc8*n0g@m99i3WI42Gl#;yRN^0g&dkhwe|dSCn0?~xb1*3;
zm<q8?XPTIqDXlPT)cz?(j;J;$Dk`ERqRy&uoUW8FDJ(3sv9VE1;{NEd|6hS|w%JRL
zkt-7v?rDlcCOy%miZ9Ao2Cj(~6CAN0VmtxH-Vfj=M5;-9Zc$kTo=tk(MYLI(no29$
zX8|w$w6unAgwh<}bHj95@E4tZ9QE|{*g~3fgZ5&q>h0X$yx9{aAtCu}>AQaSe81(O
z=86A#=bpD}>K~=brVVC8Jw05jb(?g{<azBJ>3Vg8NyK7{k4B5n0qPwd(aO<V?#mSN
zE`@HOCk8Jb%Tc)8M_3k5GENUvxvnZ9*yY&{eM6a-6W(DCzSq~+e|fH_=X`yN)|qYg
z+PzE_G;`hf!K9I=Xe8?W$JlAE?g3$!y0OmBFCROKifl599W-*^{vz4F+RRh+@GwTc
zcV2%-#HQfobv8ZLO(L!(`Xj!uxw-jlZ*LDBd|sOe3%)(cTRnoh*c>(QR(40Q2N9!;
z#i`eE0O}&V^ofOqYZY)-7j`DUxNVK)m!6Hk+?gnQW^kqq=w5aDeL3cxoSbaax3mnt
zIo(G4)?sxa5J<YXBmJADR$pPybvwivfk<(C`)%-2F!tuhyh}&U<mB09atq#P)p%40
z4qlbpnu>j915@Wy1O&k>J~;mK=kZkF#UihPzCN@*o-m0!zqC|MOItfg&NOf<mUihf
zJUl$!XKzm2YvG%lu2BH+Z8e-_Y-(ys&)obbUpF;3cWLuShG>gn<%?OLxjKh`P0}S?
z*eKX!iILM}BUf1nh>M{iy>rt#{leR|*fy0ToR@<s4-&Y`m^xd=cb+1j-(oPBdazm}
zSr9m(<Ll_?2aF1CZV-Kg#U94LG>1<}Y)5l*4u2=>Nay+OlmY%vOzH04T}A5zE}@gS
z_pA`&i{N!H*M)<lE|&a-2itblbakm|Xla8ZJghRGXd@r_%d(BKf)%KZiH=SesjmBx
z4uOjVT)N_$kTh}F{z%6Gup6$D{cA@r!2w)?Hv$>Qqy(GVz1lfZ_B=5u373=f>a&As
z$&S0bdqQI3JK>IN8lbeW@ORdm`G%(2+FG~ELn}IZdcuzv9fk&XksY_q>%wC2JB<tO
zWJyU$oD%fuqIPi`p3>8v7`#79e#ytYO^f@>OJ39F*I<oe7fe^cWsTyBmn|@NAK-ay
zZoar$xrHb%j{<v*2dsRKmn(oJ|F_2??P>qDyuAO%kDlKH$ui=<N{WkrE%_hx>I7q+
zQ&EG%v>It5U5>tk*D1@ULrBfDYiTjL?KuU!v_MW11olQkicu(35P!ehW$M?pCEv{)
zXyBMDo`RX#{1Ln_&PLdz1|OJP`}M2cRyw@ZO$(asF@ibYn|A@{#p&<)Uh2{`SnF!r
zVP+pVe2sdDoiGGlqI00Gt}e~kWOFf|l@k1qbm0|2TR=iaMwGbY)L2gxEz1j`=|#Xo
zLrsmiiO|&0@SFt@job<}NsZxfV!Hwf0-k;1e$(Lfvk=B7AmD@rE3nnraU<yH<aCFJ
zSs^G$uEAxw65N|dtTNu8nwy!mOKM%m3zXTT_vn;oiC<O*{rxB~)O~t<_wZ^r1Ttl8
zYRXL2-|jS9V}PiRIGv{lW;%kgEZ_iGz6{l;rlzV4Vp8XqmVz#CE|wdwm!e~09>~eH
zi%Cgc!G@IDLM`AY(^FHoj>^hm>#_W>q{Bge<X9*Pt%XO^izdJ#yb5o3w8m!WRtZYE
zGZcJ6r|iqSuxy7|XPJgt+xrb3u6ECcle2vFrtJ<V@2)g&nK(T??UQg`*s7?kBm}-K
z?!Vk0C|2c#e^us_;FX8|zH=^}eImQsVBzvNio>o~sOb&ZReO8;$ORgOJh?#ElVOSE
z?$xT>cc+|wF~=8PO)u6g0*;i2a5d6|ddKpg#upY94ZoNB8TRVxc-=?@WqWm3=Na8P
zks<*gf^rXagg>y`Xb=2*IB8^Qvct7`&vEMO_&tg~Gz<nS0_I|+wb1Xcw$drwpw>d{
z5L6GxIb-nswm^j>0a#LxiL)jMNHeEfygIo7Z@~ej@@m%FjjDi4R1sJ<{<y7mO26K5
zR?)cBHIU59)rg;vmKLELLtmDWks<&7)3f|BvAtO;gQ2GbBB+|MT_nz@;^K|(Ub|CZ
zPgcx$m>)aMl=bxV@c1P*WpKgtEV1W^YU|axg>etbd#^A_&x*@0FXHezlXx^Jo*HX`
z$^;YfEb!*<GWK>2WFXCPK~9?9-d<De?TwKM{g%xs={mBaBJfi|L6^H_baeC>h^QTa
zT+D=_Zi*!5BT7G!RDQ4j@TqYCszk=uZ|M{a{roWLu`Cj%d;jgXU04*Bl<-Sl5Quk_
zLg}c+l%T~jwZ#s_$9Ym78~pjQDGv62Ntm|2S`@*itaV(lfdSTWC{@tj(UEMj5bx&i
zMPDH-nYhzZfaFxk@53?WKDuOdCCxHuwx*NSXCdF#+WNYscOzZ|B?;a>H7UtG_8CKC
zz|}FoQh&y0k<Du$#LQ=ZA!=^UR6|(Wx}WNW@A^mJ@clD^*M<sIAe)}9OK^5l(bAs8
zjuA!|;FE>uP|fL+trz1U9p=`*V=z6mI(L{KS*w}a<-R`I7=8*Csbz~XJy@68YyHBn
zP1&r`xxO`D93-;e8ymQC>*-Y6b}OClF1WcbPv1itHuEFc%D+po``c%p>)f{(%r<_6
zI?s`G`;|X3)9th5%lrEE>k-_32~1L2+UCH(fTFfGMK}ek^h5_Ti92I(R7&EbWvY!Z
z{7<%>nWknHEwi%!(hu4mM%uljPwy^15R&^DCULhOp;!!;*)~S=khXSq$OeHivM7w6
z9f&6#hWh%(h7YySuGg1tLa?9OHC1DB9vhlv;Eo3o_Yor;g?=SJ!b-gp{Hg#_^QdzZ
zVxq4<@!P%0UFO8|wWH%xO-;nfF0vzNp0DK=v)fdSQ{pfu{>ofMg|K6%{7WlJTY!4<
zvdzW76*)4wj0Y&>^}FZq;jCg<P%{QVCnFg%adKLkgv}Z%_Ry~_b;%4wo^VR`N}MV=
z#jP-?*%dM}Hg@>!Uj4KH*`LK020S7PvBwUaHD0@hJt)-s$krMGBmtm>URud!8Dtk>
zb{`Rz@J?rfn|1`<*gDVFgn6O9oF4VD_pQatj{u=H<HOP;QgQ6^m26V(J^C*@Qg~Lf
z{UiHv0O!V*?tV)H1Do96N>Jklr`ZRJ`*2Q7wFN`M(VH90Ss)oHX*Q+Y<)`%vaLz(O
zM5_SBx*g6TXqxT<8#KD~)b%2$Taa*qw>#p;=Ur1ie!Pi{)NDzEs6gqeEVQA?I3XTv
z@N3#@D}=AO*2&iN9-!YAO`G^U-dsG0#<_X>ziCiAz4iC+A;>!ET6YIY-?_7PRE`Wa
z!}fV$+w-<}?MMK<Y*bLd2Lr|FP>}`l;?aoK6DJpE=XRv%e>!#<k8DUmkl9}Ai_dCk
z<%Y4QSYq=S@5iw|YJ?@FAj{k1Ga*w}mmAr^oD&4lgtLR?j@GiWvghscC!3>2qN1XC
zpc-c1JM&wn=RH7Fa|2=EthmnB*wkmAkW)m!bNbe1DLYp^rBy*HJpzP?L?R=90^Hjt
zHMPJ9;3|sBykkyExVZp>Vi~^1K{oDliW{>A==2+-W-N%Phw)#sx!)U15@DNO6(Hv%
z-8NdY9AWGR!SrYb9v^n?&oG!R<>C6fpL**gDp+)oLD-_zQkU*-Na2MeVQAC?_z%SB
z@W6mWY;3I7e8U^F#<SYe(nwHr<l$A#@SRBbGs2zMYA-aR3F7;bc>_#j?!1VKijs-F
zqN9dI7xWC&I8_2?yVJ;*U^P?!N?Uc|e|sTxG5C?+><QZ_8=!c>dMbCpQxL`$Z<jwS
z)xlBt3`3)xhVTQhjKx9%(9@Put+yT?9;-)h52wsryyhJjKr&YuQ)v+x623HuDJgov
zYbb)!d~QEcs_TR<)>=IGbeGNnRR{%0p-wTzmB{fds>E-J(^m1FE<TOj;mciNWV`pj
zxv3?cKFyc58vCTklrvi`^zfn5^XF)a_`Z`4D!M$#c|JFcl6KtVkY{G^Op*~E%u`Ss
zwC<)j$E*>W`;1m=5%!P}i0r?Q4|hC#b6D4z*89l{)Q#|m4<CkS$6plR1qGDrq=Avu
zWVr!A<;1i`mOT{mcm!D~zrykn+-kW$b971^(8c-n^=DawgM)_ok}D@X1-7f(S?fj;
z3XD7-1heWDbYd&ZcO-#%oKN-jUgzVVRoy@k<KTQJd5>bjd;ZOwhH#tMV*l&>_%VKU
z4UIHXEo@O;-RVPEQYw&+Zy7HA`2+r^*vK8JP2Q-|xJbmQ(7kr+b~nsHf`=aGYdb_3
zvlN`lud)co-VV{W#wRFPfj@?hihVVjErq`BBD?+IW?!t67Y723oP7@4A9A4Be?O9%
z>kxGB`4tth+^}Z($Ql2`8+b@(GKDD4GI|^Itx1z5$=tBFr{k*Q$h=W*%JbgGKWIPa
zJulYGM<5WB&W$n}rDV^7I$Grig1mmE-G7;t4KY-OKETvBjT;ylUChkYI|{Z*bTW8v
zo%vlIt@ZU@d`?MC6*_S-0|gaM2=3bLMF%$U{m}X`Jw3hmDA%cM<kaiY;pKpn*gCt>
z+<w7TGB%SI?}`ogrd!%B=C<!3FI`cJi;F*pvLr@Ud2DI}mz~R@W4^4NT$p;Svm+^h
zxF<!!^4O^=d-WBl*e|a}gPr3FyCW!({r&wS)3focGO59*TjRK$o0$P;lSc9c%iIS(
zRDX=HurC(gb6Z5zJbw*h<P=M;cNCxzIE=;P3O7Ec-rnA~dAFy$8VBUS{<k#>QR8rk
zN_qLi=mI`NYX$*hsvN#65vcN&qod=2Sw~Qt4dqCdb2ABa0)J)c<=F=!N)=`0-Y-D$
zl|jACJ&NFn$3SO)BA1V$L58YL_3`mBB!)rwmiTb5&V2;p{##AJxQZkF?X!*HtcbwB
z=c~gK%lLp3xMK&R@A7NPUw{f#b4siN03svJL0cMwkdEkfi#jYMHeRQ4zr<&`N)8jY
zuWH2_NJ=0faZ)+8{uj>P;Fvjv@nC9dod_n;!wC87?@yr-tQ39bph4CpQ~X0(09n<7
zX=$}pf<Op586Ix#P|Z7JK#hP7(V=XJw>h=8+Xzzd!2^;VH)CVtnGr_OJtqSL7s8N|
zydVq>=c}g?6v|p!<Z_rTE{#A$Y-}%xMRhlS1O0WNp+mwQt=-YF^Lv$#E6LNyR?m9r
zB5plIK7H2v+rpc50j1N-TBhCk3n+lD`6kEB4)i*Nptq0vX9%l7vBF}Zr{}KAFGt0?
zo_7V3k?4~JAx@CY`S|!gef#z;5>+NJgcTU7NrupK4Y_apEYj#!v7t(IXk})a$;`?^
z;sms$=jg_jJufM!sHj*vyjjgo?g;eXE=uz@CeWqp)i(_cT-eg+>_<A7R=6&HFR}ED
zT+1ekDV@77%XH8GV!usRT-?jkrs%B90-PHgYwH&i`*&_nza8gEx)nTU%dWK@Rsz)k
z#8Y-$M4(2%Y`)}R3r|!D8<>IKhJuVNU5hXI_V8t0Lql{lgUI|@qko$PQc_o3;+y0q
zPUS~XiEuS{=ya@{10%kjrJO^@51yb|01i31pz$o1c9Jhlyg$)sw{CKY&Q(|A;1`zo
zr*+46MI|McvrLUEzka;}VF#n-<Eerc^N2`@B;4xg`@Ojd2L)#82Sb2Sh_2X<hdOL7
zN34U6BI2oRWS6GJmr)n#6<5i2y1C53N<Q_ZVuuY)d2#Wx=fNg7E}5CR+1avz|8U;t
z>*h#K4Cr<P$JX%M`N8`xH-r0bNRfYbb~ats_Yq)Bd9;I{S=`3CfO-&}qz?7Hy1Lr>
zLBp|fa-Uh`r9zNOxbPh?V0u{iGvJ}rJqq-==4iPs)e4l3g~g1&&PGK)wY;1wR5tgt
z6OR(#E8YgNM-+lU-1+vRvS&C;!Yt5{Pe^DAbGCbduz42~%4WVN<$L`5L(WlR258y;
zg(ng+GBR5OVGM)E>q8y-biHIZ9xK^8cw_QlGL_?HCke(kU|MAYgOO0&lMD$DC!|=p
zkM*YI)fQ`9Cc4Au${!G+wle34Y@3)-)>czfyGRTCov1o-m*24S5PfyI7GFz7Miwu5
zFYbO9jlG&jyvMD4X0aCQ6F;#A=f!9+R(Pf*laQ4a<F<yvVQ?E$=kwFMiYP2DrU(ER
zm;l*A(BHj(2-27?i(5bD<0-C{#m2ypw&f{(bT)12gQ2W2uEqu9sa}xH5|fjYTR|=<
zxtVtz$$;n?85j&#mX~J|TzdD#YE>2&7gOKXfQzl`lj4WEQF&}Oo<cxCfKUim_K8NU
zFn$;Qp<`wPVJA`r!T8SdX2&RX8Lbm^ObaH(*b2*zpeeM$3+~hO<Hp9u(O?k$1X~C;
z!FAFTNsVu57`|^!>A4<pp!SLEcuCg#4<lR9%#Rn&>n>rh;i+J=&!0YZnwgtdC{fmo
zi@hNZ!JhcF;e`#iCA_<?5y-==v14aeJf+QLy#G{<39>g2oaC6UL$)AUSTOa;aVG<5
zxoaC;;=`e28&0O2#66xbFu8lCWMEKO7%C%GYS(l&Wi~!H*WA5!l)j5a;pcb=5zggN
z{O2O#_Nxc^_|2TPRLrSOnt6C@tL)v*;5^Gwe~BkW*KqKGmZq(H6nq;{;j-LrxaK*^
zVqh@+)Ri0T-{sC1qzGtFMD(5vy=h!5E-os1q66KaDJ^zDp$AX*cne%{P(Q(p=~!m1
z{VP$0(>p4Bta*WIN=I4QcHTpNesG2?L5x+?&~PMrd2<zzyVbtO>a7fhOJN`Rjb3+$
zU**Y<pMa?pX;V`ZbI2Pi*~e0wCJG9vQLbco(-Pw1y=^z=^H!PJA0Xl2J{1Qw;-3*r
zuci*4{Iu9!+=vt7wn?I8NR`0Mu%}wR4;abBPwxg^f1s3mcF?rR_U%P#T*n^$2Dk+q
z8XBg7Y#T&IvbN%OFJE~=?J1ax1Xq@pCVZ9NHuo47SJTw=#Cv;k?YH!IJBs9>YGPud
zrzF=;y?&=f-tW|&o}C^0*LgoJ3dG8MzQHF@&kQzH6F0c$VStQ=hDM(6MuwfrJxSM)
z9>4{b#0~dSF)+|Vi@8hQQ?X7r*}$4+dkDd3(DMptvAY1&1UdbMSv@l^FaG!M-`JnM
z%JEujEDp|J%gUJ_!9YLNJX>q$IBo8e!?QO!GGdFU_99LmJ$+Ten}X#CVUJ^#c`Wy8
z$U_XM$`!09OR%|eSJoB6<6y&H*@Cd8ir3%zE1JJD<ghT{sFz{-OL-;^09t<}10CJ9
zE$HaY@`-fsFg>#Fy*ygO!-Y3GFZyA@)#U=VO4`{R&N7<#`7^1?_r%tNwXL+&o^a%W
zIT_Gx2pMMPR3`vX>FCP>e2+IGTcFvc#GG!gu{Tmt;En}adAEh+n(nmn$w5t0<w<nU
z1g|&PBS5=|(<$;qmVkg@ULJex;c<HVD@OP+7{khOd|m)gg#M!%7sLqSRRx~yOkM?@
z<UixbD>mtt(g`0e6thIHx(3|a*b5~6o;Fa-z+KTC2}xFmplXaNOh5idhz12qjdXfK
zd3kYsY@(Zqrz=-Mf^GO#H4N$&U4WqHno(+UnaA%lyglhVo#f>-($I);&=W!7E@Y73
zqfq@Yri}|Ar{{I}$fO3Q#VXXl#ZHR73FTmD<Kht3b6S@VeoQi*_tZFpvml|NvDo34
zDI9O5_9m=m(aPdE;;U5>ca&v{xs|^oZAiuSW_)RtNoKK4c<F8kdYjJ2id;wAO-9Q4
zr(U2=R|-RNERH07L*rwdnZe*(wIuFvKHGe_P)-PkJ6_}bBEmyv5aLJb1qqS+8iOm1
znXu$};S;mD>%(MrHA-t>pu9dxM_H?oaC)E6FC~Mq>?5wF1<Qv79dcGTE)7}BPZ|`z
z{>oYLV|_V?+-U=Rd2l)vq43Zhwa-<I^6AlWO&G2wikOX92O$W`skS5;?1NS0fBnX5
z?;(b?g%y!y*V!kUo}Rjq*5~-Ft5I7g#O{xS{@;kgZKLLMaMCPCWb)KV-1T?dm<P}%
zEk>vH4iP91gZz-1ZM?(uZt~)tRXIKNFyZ$ptn{M7^TyqVw`5#f_Pef<oH;7a8wXYh
z8>Lb5a$5HyH9L9SoZ+q}@tIKYbdT)c;mNIcT1pC(6riX4=$#KA$*m%49jFN)Y#-A|
z{1hQJ6AG4(jH8FUwtKemKGj`W^38?h?^5w%$9Sxw5A1=4(AV~~%w|`@Kna>jpgOSU
zhx@OnokN1rtleuc1ReZNfu&fvd#PF2XKm8J+p?)xM_JfXYEoyf`=NmE6~+aaaa7d5
zw|Ek^D_SF<ia47XrOa}uNPC=LrFu)YiTp*rd5z3xW)?v~*BS7_grnC2+WEn$S-oZs
zNxc2z0w!{?>CI+nvGG6D$s=>OQcof)t{EZ)hKO+Pz!8htNlC|C(A+<``5zZdX`W{Z
zeLqf=d2Ak2z$XY?kM;&?r>+M_sRXyj&u|5w5;NX(7qL}u`#G)0v*EB<L#_K(&N;v%
zruf%b+>xfe<mC@DgX~Xmy(4&Fq-tKT(1HIxp8s9UGi`nA#%*MuB?KNMZXG?A-r!th
wDhdj4ss1RhzGam#y3^<kd?}d8IpD!kVv_PlNvw%?!P8{`rmPLERC@XTe;Txhr2qf`

literal 0
HcmV?d00001

diff --git a/public/fetlogo2.png b/public/fetlogo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5c01219bd1313ebb23dbfde06c22f296e0213fd
GIT binary patch
literal 5338
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
QgXfR{QbP|>anCO5e>3z;WB>pF

literal 0
HcmV?d00001


From 699ef383eb7b07143c4f910406247904c348c935 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:17:02 +0100
Subject: [PATCH 19/56] raute dateien ignorieren (emacs)

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3bc8802..80ac5e3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,4 @@ Gemfile.lock
 console
 /server
 /public/uploads/
-
+*#

From c9fb304a784f6156f3c9d6c77ae8929eb2a6ec64 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:24:43 +0100
Subject: [PATCH 20/56] =?UTF-8?q?Das=20Wort=20Semester=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/semester.rb        | 2 +-
 config/locales/studien.de.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/semester.rb b/app/models/semester.rb
index 2adb3aa..1f556b6 100755
--- a/app/models/semester.rb
+++ b/app/models/semester.rb
@@ -22,7 +22,7 @@ class Semester < ActiveRecord::Base
     if self.nummer == 0
       return I18n.t("ohnezuordnung") + " (" + self.studium.name + ")"
     else
-      return self.nummer.to_s + ". " + self.studium.name
+      return self.nummer.to_s + "."+I18n.t("semester.semester")+", " + self.studium.name
     end
   end
   def name_kurz
diff --git a/config/locales/studien.de.yml b/config/locales/studien.de.yml
index b379a90..fda3633 100644
--- a/config/locales/studien.de.yml
+++ b/config/locales/studien.de.yml
@@ -31,6 +31,7 @@ de:
     list: "Alle Lvas"
   semester:
     ohne: "Ohne Semesterzuordnung"
+    semester: "Semester"
   modulgruppe:
     typ: "Typ"
     edit: "Modulgruppe bearbeiten"

From 94778f0fa74e844c38c7c3b4ef52b851e872c58f Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 14:55:18 +0100
Subject: [PATCH 21/56] Issue #71 Tisslink in neuem Tab

Issue #71 closed
---
 app/views/lecturers/_lec_lva.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb
index 83cc332..1b498f7 100644
--- a/app/views/lecturers/_lec_lva.html.erb
+++ b/app/views/lecturers/_lec_lva.html.erb
@@ -5,7 +5,7 @@
   <div class="media-body">
     <h4><%= link_to lec_lva.name, lec_lva %></h4>
 	  	Email: <%= mail_to lec_lva.email %><br>
-    TISS: <%= link_to lec_lva.name, lec_lva.link %>
+    TISS: <%= link_to lec_lva.name, lec_lva.link, target: "_blank"  %>
   </div>
 </div>
 

From cbec643b96958d9effbf669dbbdd074329600553 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Mar 2014 15:28:22 +0100
Subject: [PATCH 22/56] #114 closed

---
 app/controllers/themengruppen_controller.rb |  4 ++++
 app/views/lecturers/_lec_lva.html.erb       |  2 +-
 app/views/themengruppen/faqs.html.erb       | 17 +++++++++++++++++
 app/views/themengruppen/index.html.erb      |  1 +
 config/routes.rb                            |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 app/views/themengruppen/faqs.html.erb

diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb
index 07c0a06..223881d 100644
--- a/app/controllers/themengruppen_controller.rb
+++ b/app/controllers/themengruppen_controller.rb
@@ -12,6 +12,10 @@ class ThemengruppenController < ApplicationController
       format.json { render json: @themengruppen }
     end
   end
+  def faqs
+    @themengruppen = Themengruppe.order(:priority).includes(:themen,{themen: :fragen})
+    
+  end
 
   # GET /themengruppen/1
   # GET /themengruppen/1.json
diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb
index 1b498f7..283646e 100644
--- a/app/views/lecturers/_lec_lva.html.erb
+++ b/app/views/lecturers/_lec_lva.html.erb
@@ -3,7 +3,7 @@
     <img class="media-object img" src="<%= lec_lva.picture.thumb.url  unless lec_lva.picture.nil? %>"/>
   </a>
   <div class="media-body">
-    <h4><%= link_to lec_lva.name, lec_lva %></h4>
+    <h4><%= lec_lva.name %></h4>
 	  	Email: <%= mail_to lec_lva.email %><br>
     TISS: <%= link_to lec_lva.name, lec_lva.link, target: "_blank"  %>
   </div>
diff --git a/app/views/themengruppen/faqs.html.erb b/app/views/themengruppen/faqs.html.erb
new file mode 100644
index 0000000..24fcb5a
--- /dev/null
+++ b/app/views/themengruppen/faqs.html.erb
@@ -0,0 +1,17 @@
+<% @themengruppen.each do |tg| %>
+
+<h2><%= tg.title%></h2>
+<ul>
+<% tg.themen.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>
+<% end %>
diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb
index bb3f49f..95ae611 100644
--- a/app/views/themengruppen/index.html.erb
+++ b/app/views/themengruppen/index.html.erb
@@ -1,4 +1,5 @@
 <div class="content-wrap content-column">
+<p>  <%= link_to "FAQS", faqs_themengruppen_path %></p>
 <ul class="unstyled linkbox-list">
   <li>  
     <% @themengruppen.each do |themengruppe| %>
diff --git a/config/routes.rb b/config/routes.rb
index 9b08b5d..cf8f6f9 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -115,6 +115,7 @@ end
      resources :themengruppen do
        get :verwalten 
        get :verwalten_all,:on=>:collection
+       get :faqs, :on=>:collection
        post :sort_themen
        post :sort_themengruppen, :on=>:collection
        resources :themen, :only=>[:new, :show]

From 1f886cc99a5a4533692dc96d6536d7999832156d Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Tue, 18 Mar 2014 09:56:12 +0100
Subject: [PATCH 23/56] fixed nil error Studium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wenn Beschreibung leer, dann leeren String als Kurzbeschreibung
zurückgeben
---
 app/models/studium.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/studium.rb b/app/models/studium.rb
index 4cd722d..22dd5ab 100755
--- a/app/models/studium.rb
+++ b/app/models/studium.rb
@@ -65,7 +65,11 @@ class Studium < ActiveRecord::Base
 
    def desc_first_words
     md = /<p>(?<text>[\w\s,\.!\?]*)/.match self.desc
-    md[:text].split(" ")[0..100].join(" ")+ " ..." unless md.nil?
+     unless md.nil?
+       md[:text].split(" ")[0..100].join(" ")+ " ..." 
+     else
+       ""
+     end
   end
 
 end

From 01977cef20025ebabec85ec08cf6d1033d4aa013 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Tue, 18 Mar 2014 10:05:30 +0100
Subject: [PATCH 24/56] =?UTF-8?q?Infofile=20f=C3=BCrblue1=20added?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/themes/blue1/info.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 app/views/themes/blue1/info.txt

diff --git a/app/views/themes/blue1/info.txt b/app/views/themes/blue1/info.txt
new file mode 100644
index 0000000..7a75999
--- /dev/null
+++ b/app/views/themes/blue1/info.txt
@@ -0,0 +1 @@
+Blue1 hat eine optisch schlankereKopfzeile und hat ein zentriertes Layout

From 52d24d463f72cce90d649a8f3988669e9e45d265 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Tue, 18 Mar 2014 17:38:31 +0100
Subject: [PATCH 25/56] inti debuguser

---
 db/initdebug.rb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 db/initdebug.rb

diff --git a/db/initdebug.rb b/db/initdebug.rb
new file mode 100644
index 0000000..c9890af
--- /dev/null
+++ b/db/initdebug.rb
@@ -0,0 +1,4 @@
+u=User.new
+u.email="peter@fet.at"
+u.password="schlechter"
+u.save

From 82d591a116bc6d429383e845f39559e382004b37 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Tue, 18 Mar 2014 17:38:46 +0100
Subject: [PATCH 26/56] gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 80ac5e3..56919f1 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/db/.#initdebug.rb
 /usergroup.ldif
 /newuser.ldif
 /passwd.ldif

From 8f4528f99413e861f54f1cff18f106cadb24c644 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 23 Mar 2014 21:02:16 +0100
Subject: [PATCH 27/56] studienansicht zentralisisert

immer show template mit unterschiedlichen partials statt komplett
unterschiedlichen templates
---
 app/controllers/studien_controller.rb         | 21 +++++----
 app/views/modulgruppen/_modulgruppe.html.erb  |  2 +-
 app/views/moduls/_kurz.html.erb               | 15 ++++++-
 app/views/studien/_infoansicht.html.erb       |  9 ++++
 .../studien/_modulgruppenansicht.html.erb     | 22 +++++++++
 app/views/studien/_semesteransicht.html.erb   | 34 ++++++++++++++
 app/views/studien/_studium.html.erb           |  2 +-
 app/views/studien/infoansicht.html.erb        | 26 +++++++++++
 app/views/studien/semesteransicht.html.erb    | 10 ++++-
 app/views/studien/show.html.erb               | 45 ++++++++-----------
 10 files changed, 147 insertions(+), 39 deletions(-)
 create mode 100644 app/views/studien/_infoansicht.html.erb
 create mode 100644 app/views/studien/_modulgruppenansicht.html.erb
 create mode 100644 app/views/studien/_semesteransicht.html.erb
 create mode 100644 app/views/studien/infoansicht.html.erb

diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index 3b2fe05..da5d9da 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -34,15 +34,20 @@ 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)},
-                       {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }]
+                       {: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)},
                              {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}]
-    
-    if params[:ansicht] != 'modulgruppenansicht'
+    case params[:ansicht]
+    when 'semesteransicht'
       @text = 'Zu Modulansicht wechseln'
       @flip = 'modulgruppenansicht'
-      render 'semesteransicht'
+   #   render 'semesteransicht'
+   
+    when 'infoansicht'
+      @text = 'Zu Modulansicht wechseln'
+      @flip = 'modulgruppenansicht'
+
     else
       @text = 'Zu Semesteransicht wechseln'
       @flip = 'semesteransicht'
@@ -242,14 +247,14 @@ class StudienController < ApplicationController
   end
 
   def default_url_options
-    {:ansicht=> params[:ansicht],
+   
+    super.merge({:ansicht=> params[:ansicht],
       :std_verw=> params[:std_verw],
       :mg_verw=> params[:mg_verw],
       :m_verw=>params[:m_verw],
       :lva_verw=>params[:lva_verw],
       :b_verw=>params[:b_verw],
-      :lec_verw=>params[:lec_verw]}.merge(super)
-    
-
+      :lec_verw=>params[:lec_verw]})
   end
+
 end
diff --git a/app/views/modulgruppen/_modulgruppe.html.erb b/app/views/modulgruppen/_modulgruppe.html.erb
index 503dc7b..9c598eb 100755
--- a/app/views/modulgruppen/_modulgruppe.html.erb
+++ b/app/views/modulgruppen/_modulgruppe.html.erb
@@ -2,7 +2,7 @@
   <h2><%=  link_to modulgruppe.name, modulgruppe_path(modulgruppe) %> 
   </h2> 
 
-  <%= modulgruppe.desc%><ul>
+  <%= modulgruppe.desc%><ul class="unstyled">
   <%= render :partial=>'moduls/kurz', :collection=>modulgruppe.moduls, :as=>:modul%>
   </ul>
   <br>
diff --git a/app/views/moduls/_kurz.html.erb b/app/views/moduls/_kurz.html.erb
index 793dd3f..071a302 100755
--- a/app/views/moduls/_kurz.html.erb
+++ b/app/views/moduls/_kurz.html.erb
@@ -1,6 +1,19 @@
-<li><p>
+<li>
+<div class="contentbox">
+<p>
   <b><% if !modul.name.nil? %><%= link_to "Modul "+ modul.name , modul_path(modul) %> <%end%></b>
 </p>
+<ul>
+<% modul.lvas.each do |lva| %>
+<li> 	      <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
+
+</li>
+<% end %>
+
+
+</ul>
+
 <% link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_modul_path(modul) %>
+</div>
 </li>
 
diff --git a/app/views/studien/_infoansicht.html.erb b/app/views/studien/_infoansicht.html.erb
new file mode 100644
index 0000000..30ea4c5
--- /dev/null
+++ b/app/views/studien/_infoansicht.html.erb
@@ -0,0 +1,9 @@
+
+<div class="container-fluid">
+  <div class="row-fluid">
+       <div class="span12">
+	<%= raw(@studium.desc) %>
+      </div>
+    </div>
+
+  </div>
diff --git a/app/views/studien/_modulgruppenansicht.html.erb b/app/views/studien/_modulgruppenansicht.html.erb
new file mode 100644
index 0000000..d2867d9
--- /dev/null
+++ b/app/views/studien/_modulgruppenansicht.html.erb
@@ -0,0 +1,22 @@
+<div class="container-fluid">
+
+  <div class="row-fluid">
+    <% if params[:info].true? %>
+    <%= raw(@studium.desc) %>
+    <% else %>
+    <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
+    <% end %>
+
+
+    <% @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 %>
+  </div>
diff --git a/app/views/studien/_semesteransicht.html.erb b/app/views/studien/_semesteransicht.html.erb
new file mode 100644
index 0000000..416e667
--- /dev/null
+++ b/app/views/studien/_semesteransicht.html.erb
@@ -0,0 +1,34 @@
+
+<div class="container-fluid">
+    <% if params[:info].true? %>
+    <%= raw(@studium.desc) %>
+    <% else %>
+    <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
+    <% end %>
+
+    <% @studium.semester.each do |sem| %>
+    <div class="row-fluid">
+      <div class="span12">
+	<div class="contentbox">
+	  <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 I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>
+		</div>
+	      </div>
+	    </div>
+	    <% sem.lvas.each do |lva| %>
+	    <div class="row-fluid">
+	      <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
+	    </div>
+	    <% end %>
+	  </div>
+	</div>
+      </div>
+    </div>
+    <% end %>
+
+  <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
+</div>
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
index f7b116d..3aca56d 100644
--- a/app/views/studien/_studium.html.erb
+++ b/app/views/studien/_studium.html.erb
@@ -1,4 +1,4 @@
-<%= link_to studium_path(studium, :ansicht=>'semesteransicht') ,{:class=>"linkbox"} do %>
+<%= link_to studium_path(studium, {:ansicht=>'semesteransicht'}) ,{:class=>"linkbox"} do %>
 <div class="media">
   <div class="pull-left">
     <%= image_tag studium.picture.big_thumb.url %>
diff --git a/app/views/studien/infoansicht.html.erb b/app/views/studien/infoansicht.html.erb
new file mode 100644
index 0000000..153ae0a
--- /dev/null
+++ b/app/views/studien/infoansicht.html.erb
@@ -0,0 +1,26 @@
+    <%= render 'studien/tabs' %>
+	<div class="content-wrap content-column">
+
+<div class="container-fluid">
+  <div class="row-fluid">
+
+    <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" %>
+	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>'infoansicht'), :class=>"btn" unless params[:ansicht]=='infoansicht'%>
+
+      </div>
+    </div>
+
+    <div class="row-fluid">
+      <div class="span12"x>
+
+	<%= raw(@studium.desc) %>
+      </div>
+    </div>
+
+  </div>
+  </div>
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
index 0ed3300..5ea2bde 100644
--- a/app/views/studien/semesteransicht.html.erb
+++ b/app/views/studien/semesteransicht.html.erb
@@ -2,8 +2,14 @@
 <div class="container-fluid">
   <div class="row-fluid">
     <%= 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 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" %>
+	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>'infoansicht'), :class=>"btn" unless params[:ansicht]=='infoansicht'%>     
+ </div>
     </div>
   </div>
 
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 8b5e6fc..18646e0 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -1,32 +1,25 @@
-<div class="container-fluid">
-  <div class="row-fluid">
-    <%= render 'studien/tabs' %>
+<%= render 'studien/tabs' %>
+<div class="content-wrap content-column">
+  <p id="notice"><%= notice %></p>
+  <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
+  <p>
+      <div class="pull-right">
+	<%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %>
+	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" %>
+      </div>
+  </p>
+  <% if params[:ansicht]=='modulgruppenansicht' %>
+  <%= render partial: 'modulgruppenansicht' %>
+  <% else if params[:ansicht]=='infoansicht' %>
+    <%= render partial: 'infoansicht' %>
+  <% else %>
+    <%= render partial: 'semesteransicht' %>
+ 
 
-    <p id="notice"><%= notice %></p>
-    <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 class="row-fluid">
-    <% if params[:info].true? %>
-    <%= raw(@studium.desc) %>
-    <% else %>
-    <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
-    <% end %>
+  <% end %>
 
+ <% end %>
 
-    <% @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 %>
-  </div>
   <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
   <%= render 'layouts/pretty_toolbar' %>
 </div>

From c235619e319e83ee8c69704708a6122a51f57ea8 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 23 Mar 2014 21:02:47 +0100
Subject: [PATCH 28/56] diverse fixed

---
 app/controllers/application_controller.rb  |  2 +-
 app/controllers/rubriken_controller.rb     | 13 ++++++-------
 app/controllers/themen_controller.rb       |  5 +++--
 app/helpers/application_helper.rb          | 10 ++++++----
 app/models/calentry.rb                     |  5 +++--
 app/views/layouts/application.html.erb     | 14 ++++++++++----
 app/views/themen/_verw_liste.html.erb      |  3 +++
 app/views/themen/update.js.erb             |  4 +++-
 app/views/themengruppen/verwalten.html.erb |  4 +---
 config/routes.rb                           | 18 ++++++++++--------
 10 files changed, 46 insertions(+), 32 deletions(-)
 create mode 100644 app/views/themen/_verw_liste.html.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f7c7c86..cdd3a1f 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -22,6 +22,6 @@ else
 end
 end
   def default_url_options
-    {locale: I18n.locale, theme: theme_name}
+    {locale: I18n.locale, theme: theme_name, ansicht: nil}
   end
 end
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 79e1d6b..0ff05ff 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -11,13 +11,12 @@ class RubrikenController < ApplicationController
     @rubrik = Rubrik.find(params[:id])
     @moderatoren=User.with_role(:newsmoderator,@rubrik)
     if can?(:showunpublished, Neuigkeit)
-    @neuigkeiten = @rubrik.neuigkeiten
-else
-    @neuigkeiten = @rubrik.neuigkeiten.published
-end
-@toolbar_elements << {:text=>I18n.t('neuigkeit.new.title'),:path=> new_rubrik_neuigkeit_path(@rubrik),:hicon=>'icon-plus-sign'} if can? :verwalten, @rubrik
-
-@toolbar_elements << {:text=>I18n.t('common.verwalten'),:path=>verwalten_rubrik_path(@rubrik),:icon=>:pencil} if can? :verwalten, @rubrik
+      @neuigkeiten = @rubrik.neuigkeiten
+    else
+      @neuigkeiten = @rubrik.neuigkeiten.published
+    end
+    @toolbar_elements << {:text=>I18n.t('neuigkeit.new.title'), :path=> new_rubrik_neuigkeit_path(@rubrik),:hicon=>'icon-plus-sign'} if can? :verwalten, @rubrik
+    @toolbar_elements << {:text=>I18n.t('common.verwalten'), :path=>verwalten_rubrik_path(@rubrik),:icon=>:pencil} if can? :verwalten, @rubrik
       
 
 
diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb
index 566aa4b..9b84e0a 100644
--- a/app/controllers/themen_controller.rb
+++ b/app/controllers/themen_controller.rb
@@ -51,7 +51,8 @@ class ThemenController < ApplicationController
   # POST /themen.json
   def create
     @thema = Thema.new(params[:thema])
-
+   
+      @themen = @thema.themengruppe.themen.order(:priority).reverse
     respond_to do |format|
       if @thema.save
         format.html { redirect_to @thema, notice: 'Thema was successfully created.' }
@@ -75,7 +76,7 @@ class ThemenController < ApplicationController
   # PUT /themen/1.json
   def update
     @thema = Thema.find(params[:id])
-
+  @themen = @thema.themengruppe.themen.order(:priority).reverse
     respond_to do |format|
       if @thema.update_attributes(params[:thema])
         format.html { redirect_to @thema, notice: 'Thema was successfully updated.' }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f34ec3d..b2acb74 100755
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,9 +1,11 @@
 module ApplicationHelper
-  def current_url(overwrite={})
-    url_for  :params => params.merge(overwrite).except(:controller,:action)
-  end
+ def current_url1(overwrite={})
+     url_for  :params => params.merge(overwrite).except(:controller,:action,:ansicht)
+ end
+
+
   def switch_locale_url(target_locale)
-    current_url({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/"
+    current_url1({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/"
    
   end
   def toolbar_html(elemente)
diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index 1689d1d..f7f0699 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -21,6 +21,7 @@ class Calentry < ActiveRecord::Base
   validates :typ, :presence => true
   before_save :get_public
   belongs_to :object, polymorphic: true # Objekt zu dem der Calentry gehört (derzeit ein Newsartikel)
+
   scope :upcoming, ->{ where("start >= ?", Time.now).order(:start)}
   scope :recent,-> {  where("start <= ?", Time.now).order(:start).reverse_order}
   validate do |entry|
@@ -31,8 +32,8 @@ class Calentry < ActiveRecord::Base
   
   resourcify
   def get_public
-  self.public = (self.try(:object).nil?)? (self.calendar.try(:public)) : object.try(:public)
-  true
+    self.public = (self.try(:object).nil?)? (self.calendar.try(:public)) : object.try(:public)
+    true
   end
   def start_time
     start
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1531dfd..030adb2 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,21 +36,27 @@
 	   </div>
 	 </div>     
        </div>
+
        <div class="span1 "></div>
      </div>
-     
-
      <div class="row-fluid">
        <div class="span1">
        </div>	
        <div class="span10" id="contentdiv">
 	 <%= yield %>
-	 <span class="pull-right">  <%= render 'layouts/login' %></span> 
+       </div>
+       <div class="span1">
+       </div>
+     </div>    
+     <div class="row-fluid">
+       <div class="span1">
+       </div>	
+       <div class="span10" id="contentdiv">
+	 <span class="pull-right">  <%= render 'layouts/login' %></span> Version 0.0.3
        </div>
        <div class="span1">
        </div>
      </div>
-
    </div>
   
  </body>
diff --git a/app/views/themen/_verw_liste.html.erb b/app/views/themen/_verw_liste.html.erb
new file mode 100644
index 0000000..6f83076
--- /dev/null
+++ b/app/views/themen/_verw_liste.html.erb
@@ -0,0 +1,3 @@
+<% verw_liste.each do |thema| %>
+<li id="themen_<%= thema.id %>" class="sort"  ><div class="contentbox handle" ><h2><%= thema.title %></h2>  </div> <%= link_to edit_thema_path(thema),:remote=>true do %> Edit <% end %>  <%= link_to thema_fragen_path(thema),:remote=>true do %> Fragen <% end %></li>
+<% end %>
diff --git a/app/views/themen/update.js.erb b/app/views/themen/update.js.erb
index 018bad4..82e2ffb 100644
--- a/app/views/themen/update.js.erb
+++ b/app/views/themen/update.js.erb
@@ -1,2 +1,4 @@
-alert('t'); 
+
 $("#themaview").html("<%= escape_javascript(raw("<h2>Bearbeiten</h2>")+render(:partial=>"themen/small", :object=>@thema) )%>");
+
+$("#themen").html("<%= escape_javascript(render(:partial=>"themen/verw_liste", :object=>@themen) )%>");
diff --git a/app/views/themengruppen/verwalten.html.erb b/app/views/themengruppen/verwalten.html.erb
index 5957c50..5522f5f 100644
--- a/app/views/themengruppen/verwalten.html.erb
+++ b/app/views/themengruppen/verwalten.html.erb
@@ -7,9 +7,7 @@
 <div class="span4">
 
 <ul id="themen" class="sort" >
-<% @themen.each do |thema| %>
-<li id="themen_<%= thema.id %>" class="sort"  ><div class="contentbox handle" ><h2><%= thema.title %></h2>  </div> <%= link_to edit_thema_path(thema),:remote=>true do %> Edit <% end %>  <%= link_to thema_fragen_path(thema),:remote=>true do %> Fragen <% end %></li>
-<% end %>
+  <%= render partial:"themen/verw_liste", object: @themen %>
 </ul>
 <%= link_to new_themengruppe_thema_path(@themengruppe),:remote=>true do %> New Thema <% end %>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index cf8f6f9..4e45e02 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,10 +7,10 @@
    #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
    scope '(:locale)/admin' do
      resources :users, :only=>[]  do 
-collection do
-       get :index
-       post :all_update
-end
+       collection do
+         get :index
+         post :all_update
+       end
      end
      get 'users/:id/add_role/:role', :controller=>:users, :action=>:add_role, :as=>'user_add_role'
      get 'users/:id/do_confirm', :controller=>:users, :action=>:do_confirm, :as=>'user_do_confirm'
@@ -20,10 +20,12 @@ end
 
    devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
 
-   scope '(:locale)' do
-     
-     resources :studien, :only=>[:new,:edit,:update,:destroy]
+   scope ':locale' do
+     scope '(t/:theme)' do
+     # Studien 
+    
      scope '(:ansicht)' do
+       resources :studien, :only=>[:new,:edit,:update,:destroy]
        resources :studien, :only=>[:show]
      end
      
@@ -126,7 +128,7 @@ end
      
      resources :calentries
    end
-
+end
    # The priority is based upon order of creation:
    # first created -> highest priority.
 

From 5186f06cddf46b3f21a9beb57622a2d2dabc73b5 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 23 Mar 2014 21:28:55 +0100
Subject: [PATCH 29/56] links in studienansicht fixed

---
 app/controllers/studien_controller.rb | 10 +---------
 app/views/studien/show.html.erb       | 11 ++++++-----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index da5d9da..53cd602 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -40,17 +40,9 @@ class StudienController < ApplicationController
                              {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}]
     case params[:ansicht]
     when 'semesteransicht'
-      @text = 'Zu Modulansicht wechseln'
-      @flip = 'modulgruppenansicht'
-   #   render 'semesteransicht'
-   
     when 'infoansicht'
-      @text = 'Zu Modulansicht wechseln'
-      @flip = 'modulgruppenansicht'
-
     else
-      @text = 'Zu Semesteransicht wechseln'
-      @flip = 'semesteransicht'
+      params[:ansicht]="modulgruppenansicht"
     end
   end
 
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 18646e0..e28287c 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -4,21 +4,22 @@
   <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
   <p>
       <div class="pull-right">
-	<%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %>
-	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" %>
+	<%= link_to "Semesteransicht", studium_path(@studium, :ansicht=>"semesteransicht"), :class=>"btn" unless params[:ansicht]=='semesteransicht' %>
+	<%= link_to "Modulgruppenansicht", studium_path(@studium, :ansicht=>"modulgruppenansicht"), :class=>"btn" unless params[:ansicht]=='modulgruppenansicht' %>
+	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" unless params[:ansicht]=='infoansicht' %>
       </div>
   </p>
   <% if params[:ansicht]=='modulgruppenansicht' %>
   <%= render partial: 'modulgruppenansicht' %>
   <% else if params[:ansicht]=='infoansicht' %>
     <%= render partial: 'infoansicht' %>
-  <% else %>
+    <% else %>
     <%= render partial: 'semesteransicht' %>
  
 
-  <% end %>
+    <% end %>
 
- <% end %>
+    <% end %>
 
   <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
   <%= render 'layouts/pretty_toolbar' %>

From 6f3c172ea1dc24b96db84f10c6e6c2ef9039036e Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 23 Mar 2014 21:48:30 +0100
Subject: [PATCH 30/56] Ansichtlinks translated

---
 app/views/studien/show.html.erb | 6 +++---
 config/locales/studien.de.yml   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index e28287c..b109933 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -4,9 +4,9 @@
   <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
   <p>
       <div class="pull-right">
-	<%= link_to "Semesteransicht", studium_path(@studium, :ansicht=>"semesteransicht"), :class=>"btn" unless params[:ansicht]=='semesteransicht' %>
-	<%= link_to "Modulgruppenansicht", studium_path(@studium, :ansicht=>"modulgruppenansicht"), :class=>"btn" unless params[:ansicht]=='modulgruppenansicht' %>
-	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" unless params[:ansicht]=='infoansicht' %>
+	<%= link_to I18n.t("studien.ansicht.semester"), studium_path(@studium, :ansicht=>"semesteransicht"), :class=>"btn" unless params[:ansicht]=='semesteransicht' %>
+	<%= link_to I18n.t("studien.ansicht.modulgruppe"), studium_path(@studium, :ansicht=>"modulgruppenansicht"), :class=>"btn" unless params[:ansicht]=='modulgruppenansicht' %>
+	<%= link_to I18n.t("studien.ansicht.info"), studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" unless params[:ansicht]=='infoansicht' %>
       </div>
   </p>
   <% if params[:ansicht]=='modulgruppenansicht' %>
diff --git a/config/locales/studien.de.yml b/config/locales/studien.de.yml
index fda3633..5b15360 100644
--- a/config/locales/studien.de.yml
+++ b/config/locales/studien.de.yml
@@ -14,6 +14,10 @@ de:
       <li>Klick auf den Namen eines Objektes führt zu dessen Ansicht, ein Klick auf edit direkt zum Bearbeitungsformular</li>
       <li>Per Dropdown-Menü kann nach einzelnen Objekten gefiltert werden. Die Filter können kombiniert werden, wobei nur erlaubte Kombinationen möglich sind. <b>Solange validation-Fehler (im Log rot und fett) auftreten, keine Filter verwenden</b></li>
       </ul>"
+    ansicht:
+      modulgruppe: "Modulgruppenansicht"
+      semester: "Semesteransicht"
+      info: "Infoansicht"
   modul:
     edit: "Modul bearbeiten"
     list: "Alle Module"

From 1857566b70dabec048ee73d45b6add603c5d0e70 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 23 Mar 2014 21:48:38 +0100
Subject: [PATCH 31/56] modulgruppenansicht

---
 app/views/modulgruppen/show.html.erb | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/modulgruppen/show.html.erb b/app/views/modulgruppen/show.html.erb
index 869a431..d466a07 100755
--- a/app/views/modulgruppen/show.html.erb
+++ b/app/views/modulgruppen/show.html.erb
@@ -1,18 +1,23 @@
-</ul><p id="notice"><%= notice %></p>
+<%= render 'studien/tabs' %>
+<div class="content-wrap content-column">
+<p id="notice"><%= notice %></p>
+
 <h1>
   <%= @modulgruppe.name %>
 </h1>
 <p>
  <!-- <b><%= link_to "Studium: "+@modulgruppe.studium.name, studium_path(@modulgruppe.studium) %></b>-->
   
-</p><p>
+</p>
+<p>
   <b><%= I18n.t "modulgruppe.typ"%>:</b>
   <%= @modulgruppe.typ %>
 </p>
-
-
-<% @modulgruppe.moduls.each do |modul| %>
-<%= render 'moduls/kurz', :modul=>modul%>
-<% end %>
+<ul class="unstyled">
+  <% @modulgruppe.moduls.each do |modul| %>
+  <%= render 'moduls/kurz', :modul=>modul%>
+  <% end %>
+</ul>
 
 <%= render 'layouts/pretty_toolbar' %>
+</div>

From 69111eb8e7c849416e3d95623a9fb8d1aab4d782 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 24 Mar 2014 14:40:54 +0100
Subject: [PATCH 32/56] versions link fix

---
 app/views/layouts/_pretty_toolbar.html.erb | 16 +++++++++++-----
 app/views/neuigkeiten/show.html.erb        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_pretty_toolbar.html.erb b/app/views/layouts/_pretty_toolbar.html.erb
index 1a1f7c2..8922e02 100644
--- a/app/views/layouts/_pretty_toolbar.html.erb
+++ b/app/views/layouts/_pretty_toolbar.html.erb
@@ -17,13 +17,19 @@ Verwendung: Aufruf mit
 	Versionen<span class="caret"></span>
       </a>
       <ul class="dropdown-menu">
+	<li>	<%= link_to "active", t[:path]  %>
+	</li>
 	<% t[:versions].each_with_index do |v,i| %>
 	<li>
-<% 
-uri= URI.parse(t[:path]);
-uri.query= URI.encode_www_form(URI.decode_www_form(uri.query)<<["version",i.to_s])
-%>
-	  <%= link_to v[:created_at],uri.to_s ,:version=>v[:id]%>
+	  <% unless t[:path].nil?
+	     uri= URI.parse(t[:path]);
+	     q=[];
+	     q= q.merge(URI.decode_www_form(uri.query)) unless uri.query.nil?
+	    
+	     uri.query= URI.encode_www_form(q<<["version",i.to_s])
+									      %>
+	  <%= link_to I18n.l(v[:created_at]).to_s,uri.to_s ,:version=>v[:id] %>
+<% end %>
 	</li>
 	<% end %>    
       </ul>
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 9781e9f..aade7be 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -11,7 +11,7 @@
 </span>
 <div class="media">
   <div class="pull-left" href="#">
-    <p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.url  %>
+    <p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.try(:url)  %>
     </p>
   </div>
   <div class="media-body">

From 1257d55403eab13f628790d7ee6942d86304d8e4 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 24 Mar 2014 14:41:08 +0100
Subject: [PATCH 33/56] modul view fixed

---
 app/views/moduls/_modul.html.erb | 53 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/app/views/moduls/_modul.html.erb b/app/views/moduls/_modul.html.erb
index edaa5c6..4782baa 100755
--- a/app/views/moduls/_modul.html.erb
+++ b/app/views/moduls/_modul.html.erb
@@ -5,31 +5,32 @@
 
 <div class="row-fluid">
   <div class="span8">
-<h2><%=I18n.t("modul.desc")%></h2>    
-<p>
-  <%= raw(@modul.desc) %>
-</p>
+    <h2><%=I18n.t("modul.lvas")%></h2>
+    <% @modul.lvas.each_slice(3) do |row| %>
+    <ul>
+      <% row.each do |lv| %>
+      <li>
+	<%= render 'lvas/lva_semester', :lva=>lv%>
+      </li>
+      <% end %>
+    </ul>
+    <% end %>
+    <h2><%=I18n.t("modul.desc")%></h2>    
+    <p>
+      <%= raw(@modul.desc) %>
+    </p>
+  </div>
+  <div class="span4">
+    <div class="lva-sidebar">
+      <h2><%=I18n.t("modul.mgs")%></h2>
+      <ul>
+	<% @modul.modulgruppen.each do |mg| %>
+	<li>
+	  <%= render 'modulgruppen/kurz', :modulgruppe=>mg %>
+	</li>
+	<% end %>
+      </ul>
 
+    </div>
+  </div>
 </div>
-<div class="span4">
-  <div class="lva-sidebar">
-  <h2><%=I18n.t("modul.mgs")%></h2>
-  <ul>
-<% @modul.modulgruppen.each do |mg| %>
-<li>
-<%= render 'modulgruppen/kurz', :modulgruppe=>mg %>
-</li>
-<% end %>
-</ul>
-<h2><%=I18n.t("modul.lvas")%></h2>
-<% @modul.lvas.each_slice(3) do |row| %>
-<ul>
-<% row.each do |lv| %>
-<li>
-<%= render 'lvas/lva_semester', :lva=>lv%>
-</li>
-<% end %>
-</ul>
-<% end %>
-</div>
-  </div></div>

From 1e342cb66aba6666b444dfaef6a4ea0d68ddf85b Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 25 Mar 2014 16:14:21 +0100
Subject: [PATCH 34/56] v0.0.3a

---
 app/views/layouts/application.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 030adb2..5f41239 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -52,7 +52,7 @@
        <div class="span1">
        </div>	
        <div class="span10" id="contentdiv">
-	 <span class="pull-right">  <%= render 'layouts/login' %></span> Version 0.0.3
+	 <span class="pull-right">  <%= render 'layouts/login' %></span> Version 0.0.3a
        </div>
        <div class="span1">
        </div>

From 1d2d3e791b689c3f9e737c8ce23ae019a096378d Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 25 Mar 2014 19:41:48 +0100
Subject: [PATCH 35/56] Qualifikation #129

#129 closed
---
 app/controllers/studien_controller.rb            | 1 +
 app/models/studium.rb                            | 4 ++--
 app/views/studien/_form.html.erb                 | 9 +++++++++
 app/views/studien/_infoansicht.html.erb          | 1 +
 app/views/studien/show.html.erb                  | 9 +++++++--
 db/migrate/20140324185709_add_info_to_studien.rb | 7 +++++++
 6 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20140324185709_add_info_to_studien.rb

diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index 53cd602..35f80d3 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -41,6 +41,7 @@ class StudienController < ApplicationController
     case params[:ansicht]
     when 'semesteransicht'
     when 'infoansicht'
+    when 'qualifikationsprofil'
     else
       params[:ansicht]="modulgruppenansicht"
     end
diff --git a/app/models/studium.rb b/app/models/studium.rb
index 22dd5ab..a2813df 100755
--- a/app/models/studium.rb
+++ b/app/models/studium.rb
@@ -27,7 +27,7 @@
 #  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
+  attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache, :qualifikation,:struktur, :jobmoeglichkeiten
   has_many :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy
   has_many :semester, :dependent => :destroy
   validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
@@ -35,7 +35,7 @@ class Studium < ActiveRecord::Base
   validates :name, :uniqueness => true, :presence=>true
   validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true 
   mount_uploader :picture, PictureUploader
-  translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true
+  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/studien/_form.html.erb b/app/views/studien/_form.html.erb
index bd49e55..d9ad5a0 100755
--- a/app/views/studien/_form.html.erb
+++ b/app/views/studien/_form.html.erb
@@ -15,6 +15,15 @@
   <div class="row-fluid">
     <%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
   </div>
+ <div class="row-fluid">
+    <%= f.input :qualifikation, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
+  </div>
+ <div class="row-fluid">
+    <%= f.input :struktur, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
+  </div>
+ <div class="row-fluid">
+    <%= f.input :jobmoeglichkeiten, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
+  </div>
   <div class="row-fluid">
     <div class="span12">
 
diff --git a/app/views/studien/_infoansicht.html.erb b/app/views/studien/_infoansicht.html.erb
index 30ea4c5..c427778 100644
--- a/app/views/studien/_infoansicht.html.erb
+++ b/app/views/studien/_infoansicht.html.erb
@@ -2,6 +2,7 @@
 <div class="container-fluid">
   <div class="row-fluid">
        <div class="span12">
+<p><%= link_to "Qualifikationsprofil", studium_path( @studium, :ansicht=>"qualifikationsprofil")%> </p>
 	<%= raw(@studium.desc) %>
       </div>
     </div>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index b109933..5ec47b1 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -13,13 +13,18 @@
   <%= render partial: 'modulgruppenansicht' %>
   <% else if params[:ansicht]=='infoansicht' %>
     <%= render partial: 'infoansicht' %>
+  <% else if params[:ansicht]== 'qualifikationsprofil' %>
+   <h2>Qualifikationsprofil</h2>
+<p>
+<%= raw(@studium.qualifikation) %>
+</p>
     <% else %>
     <%= render partial: 'semesteransicht' %>
  
 
-    <% end %>
+    
 
-    <% end %>
+    <% end %>  <% end %>  <% end %>
 
   <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
   <%= render 'layouts/pretty_toolbar' %>
diff --git a/db/migrate/20140324185709_add_info_to_studien.rb b/db/migrate/20140324185709_add_info_to_studien.rb
new file mode 100644
index 0000000..f310a20
--- /dev/null
+++ b/db/migrate/20140324185709_add_info_to_studien.rb
@@ -0,0 +1,7 @@
+class AddInfoToStudien < ActiveRecord::Migration
+  def change
+    add_column :studium_translations, :qualifikation, :text
+    add_column :studium_translations, :struktur, :text
+    add_column :studium_translations, :jobmoeglichkeiten, :text20
+  end
+end

From a8401391a6ad3dbf5cf94395df35bbe77311b6e6 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 11:30:46 +0100
Subject: [PATCH 36/56] Neuigkeiten Link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Querverweise für Neuigkeiten
---
 app/controllers/neuigkeiten_controller.rb     | 58 ++++++++++++++-----
 app/controllers/themengruppen_controller.rb   |  7 +--
 app/models/gallery.rb                         |  7 +++
 app/models/gremium.rb                         |  4 +-
 app/models/lva.rb                             |  7 ++-
 app/models/neuigkeit.rb                       |  3 +
 app/models/nlink.rb                           | 10 ++++
 app/models/thema.rb                           |  2 +-
 app/views/galleries/_nlink.html.erb           | 21 +++++++
 app/views/galleries/index.html.erb            | 21 +++++++
 app/views/home/search.html.erb                |  2 +-
 app/views/lvas/_nlink.html.erb                |  3 +
 app/views/neuigkeiten/_nlink_list.html.erb    | 11 ++++
 .../neuigkeiten/_nlink_list_search.html.erb   | 12 ++++
 app/views/neuigkeiten/show.html.erb           | 22 +++++--
 app/views/themen/_nlink.html.erb              |  1 +
 app/views/themengruppen/show.html.erb         |  7 ++-
 .../themes/2003/themengruppen/show.html.erb   | 25 --------
 config/routes.rb                              |  2 +
 db/migrate/20140328200432_create_nlinks.rb    | 13 +++++
 spec/factories/nlinks.rb                      | 11 ++++
 spec/models/nlink_spec.rb                     |  5 ++
 22 files changed, 199 insertions(+), 55 deletions(-)
 create mode 100644 app/models/nlink.rb
 create mode 100644 app/views/galleries/_nlink.html.erb
 create mode 100644 app/views/lvas/_nlink.html.erb
 create mode 100644 app/views/neuigkeiten/_nlink_list.html.erb
 create mode 100644 app/views/neuigkeiten/_nlink_list_search.html.erb
 create mode 100644 app/views/themen/_nlink.html.erb
 delete mode 100644 app/views/themes/2003/themengruppen/show.html.erb
 create mode 100644 db/migrate/20140328200432_create_nlinks.rb
 create mode 100644 spec/factories/nlinks.rb
 create mode 100644 spec/models/nlink_spec.rb

diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index df2bd33..575bb09 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -1,28 +1,16 @@
 class NeuigkeitenController < ApplicationController
-  before_filter {@toolbar_elements=[]}
+  before_filter :load_toolbar_elements, :only=>[:show,:find_link]
   load_and_authorize_resource
 
   def show
-  @neuigkeit = Neuigkeit.find(params[:id])
+    @neuigkeit = Neuigkeit.find(params[:id])
     @rubrik=@neuigkeit.rubrik    
+
     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 })
-                                   
-      # @neuigkeit=Neuigkeit.find(params[:id])
     end 
     @calentries1=@neuigkeit.calentries
 
-      @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>"Sure?" } if can? :publish, @neuigkeit
-      @toolbar_elements << {:hicon=>'icon-minus', :text=> I18n.t('neuigkeit.unpublish'),:path => unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>"Sure?" } if can?(:unpublish, @neuigkeit) && !@neuigkeit.published?
-     
- @toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:icon=>:pencil} if can? :edit, @neuigkeit.rubrik
-      @versions= @neuigkeit.translation.versions.select([:created_at]).reverse
-      @toolbar_elements <<{:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:method=>:versions,:versions=>@versions}
-     
-      @toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>'Sure?' } if can? :delete, @neuigkeit
-#      @toolbar_elements << {:path=> add_calentry_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :text=>"Add Calentry", :icon=>:plus}
-
-
   end
   
   def new
@@ -45,7 +33,7 @@ class NeuigkeitenController < ApplicationController
     @neuigkeit.calentry=ce
     @neuigkeit.save
     
-     render 'edit'
+    render 'edit'
   end
 
   def unpublish
@@ -74,6 +62,24 @@ class NeuigkeitenController < ApplicationController
     @calentries<<  Calentry.new 
 
   end
+  def find_link
+    @rubrik=@neuigkeit.rubrik    
+    @calentries1=@neuigkeit.calentries
+    @nlink_search = Neuigkeit::LINKTYPES.clone
+    
+    @nlink_search.collect!{|t| t.constantize}
+    @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
+
+
+@nlink_search.flatten!
+    
+    render action:"show"
+  end
+  def create_link
+    Nlink.create(:link=>params[:link_type].constantize.find(params[:link_id]),:neuigkeit=>Neuigkeit.find(params[:id]))
+
+    redirect_to action:"show"
+  end
 
   def create
     @neuigkeit = Neuigkeit.new(params[:neuigkeit])
@@ -111,4 +117,24 @@ class NeuigkeitenController < ApplicationController
       
     end
   end
+
+private
+  def load_toolbar_elements
+    @neuigkeit=Neuigkeit.find(params[:id])
+    @toolbar_elements=[]
+    @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>'Sure?' } if can?(:publish, @neuigkeit) && @neuigkeit.published?
+    @toolbar_elements << {:hicon=>'icon-minus', :text=> I18n.t('neuigkeit.unpublish'),:path => unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>'Sure?' } if can?(:unpublish, @neuigkeit) && !@neuigkeit.published?
+    @toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:icon=>:pencil} if can? :edit, @neuigkeit.rubrik
+    @versions= @neuigkeit.translation.versions.select([:created_at]).reverse
+
+    @toolbar_elements <<{:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:method=>:versions,:versions=>@versions}
+     
+      @toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>'Sure?' } if can? :delete, @neuigkeit
+
+  end
+  
+
+
+
+ 
 end
diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb
index 223881d..6506015 100644
--- a/app/controllers/themengruppen_controller.rb
+++ b/app/controllers/themengruppen_controller.rb
@@ -21,14 +21,13 @@ class ThemengruppenController < ApplicationController
   # GET /themengruppen/1.json
   def show
     @themengruppe = Themengruppe.find(params[:id])
-  @themen = @themengruppe.themen.order(:priority).reverse
+    @themen = @themengruppe.themen.order(:priority).reverse
  
     @toolbar_elements = []
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('thema.add'), :path=>new_themengruppe_thema_path(@themengruppe)} if can? :new, Themengruppe
     @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('themengruppe.edit'), :path=>edit_themengruppe_path(@themengruppe)} if can? :edit, @themengruppe
-  @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.manage"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe
-  @toolbar_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('themengruppe.remove'), :path=>themengruppe_path(@themengruppe), :method=>:delete,:confirm=>I18n.t('themengruppe.sure')} if can? :delete, @themengruppe
-
+    @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.manage"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe
+    @toolbar_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('themengruppe.remove'), :path=>themengruppe_path(@themengruppe), :method=>:delete,:confirm=>I18n.t('themengruppe.sure')} if can? :delete, @themengruppe
 
     respond_to do |format|
       format.html # show.html.erb
diff --git a/app/models/gallery.rb b/app/models/gallery.rb
index ae4afde..bddea61 100644
--- a/app/models/gallery.rb
+++ b/app/models/gallery.rb
@@ -14,4 +14,11 @@ class Gallery < ActiveRecord::Base
   WORD_COUNT = 20
   attr_accessible :datum, :desc, :name
   has_many :fotos
+  has_many :nlinks, as: :link
+    scope :search, ->(query) {where("name like ? or desc like ?", "%#{query}%", "%#{query}%")}
+
+  def title
+    name
+  end
 end
+   
diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index ebc571d..c119b55 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -23,7 +23,9 @@ class Gremium < ActiveRecord::Base
 
   belongs_to :thema # Gehört zu einem Thema
   scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) } # Gremien die in Tabs angezeigt werden (Alle Anderen nur in der Liste
-  # Gremium im 2. Fall für die Konstruktion "Mitglied des ... / der ... " 
+ scope :search, ->(query) {where("name like ? or desc like ?", "%#{query}%", "%#{query}%")} 
+
+ # Gremium im 2. Fall für die Konstruktion "Mitglied des ... / der ... " 
   accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:fetprofile_id].blank?}
   def fall2 
     Gremium::ART2FALL[self.geschlecht.to_i].to_s+" "+ self.name.to_s+ ((self.geschlecht.to_i==1||self.geschlecht.to_i==0)? "s":"") 
diff --git a/app/models/lva.rb b/app/models/lva.rb
index e963d0d..34b6ab0 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -44,6 +44,7 @@ class Lva < ActiveRecord::Base
   has_many :beispiele , :class_name => "Beispiel"
   has_and_belongs_to_many :lecturers
   translates :desc,:pruefungsinformation,  :fallbacks_for_empty_translations => true, :versioning=>true
+  scope :search, ->(query) {where("name like ? or 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 
   validates_presence_of :ects  # ECTS vorhanden?
@@ -52,6 +53,11 @@ 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
+  end
   def full_name
     return self.typ + ' ' + self.name
     end
@@ -69,7 +75,6 @@ class Lva < ActiveRecord::Base
     
   end
  
-
   ##
   # Lade Daten aus TISS und füge diese in die Datenbank ein. 
   def tisshash(semester)
diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index 1660869..ab3bdd9 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -28,8 +28,11 @@ class Neuigkeit < ActiveRecord::Base
   scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
   scope :public, ->{includes(:rubrik).where("rubriken.public"=>:true)}
   scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
+  LINKTYPES=["Thema", "Gallery", "Lva"]
   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/nlink.rb b/app/models/nlink.rb
new file mode 100644
index 0000000..c3130f9
--- /dev/null
+++ b/app/models/nlink.rb
@@ -0,0 +1,10 @@
+class Nlink < ActiveRecord::Base
+  attr_accessible :link_id, :link_type, :neuigkeit_id, :neuigkeit,:link, :sort, :title
+  belongs_to :neuigkeit
+  belongs_to :link, :polymorphic=>true
+  validates :neuigkeit, :presence=>true
+  validates :link, :presence=>true
+validates :link_id, :uniqueness=>{:scope=>[:neuigkeit_id]}
+
+
+end
diff --git a/app/models/thema.rb b/app/models/thema.rb
index 58097ac..c11e5f7 100644
--- a/app/models/thema.rb
+++ b/app/models/thema.rb
@@ -19,6 +19,6 @@ class Thema < ActiveRecord::Base
   validates :themengruppe, :presence => true
   validates :title, :presence => true
   scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
-
+  has_many :nlinks, as: :link
   translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
 end
diff --git a/app/views/galleries/_nlink.html.erb b/app/views/galleries/_nlink.html.erb
new file mode 100644
index 0000000..72f2216
--- /dev/null
+++ b/app/views/galleries/_nlink.html.erb
@@ -0,0 +1,21 @@
+    <div class="media gallery-block">
+      <div class="pull-left" href="#">
+	<%= if(nlink.fotos.empty?)
+	    image_tag "no_image_128.png", {:class => "img-rounded"}
+	    else
+	    image_tag nlink.fotos.sample.datei.big_thumb.url, {:class => "img-rounded"}
+	    end %>
+      </div>
+      <div class="media-body">
+	<small class="pull-left"><%= nlink.fotos.size.to_s + " " + I18n.t('fotos.bilder')%> </small>
+	<small class="pull-right"><%=I18n.l(nlink.try(:datum).try(:to_date)) unless nlink.try(:datum).try(:to_date).nil? %></small></br>
+	<h1><%= nlink.name %></h1>
+	<p>
+	  <%= if nlink.desc.split.size > Gallery::WORD_COUNT
+	  nlink.desc.split[0..Gallery::WORD_COUNT].join(" ") + " ..."
+	  else
+	  nlink.desc
+	  end%>
+	</p>
+      </div>
+    </div>
diff --git a/app/views/galleries/index.html.erb b/app/views/galleries/index.html.erb
index 68a8a8f..ed4bb87 100644
--- a/app/views/galleries/index.html.erb
+++ b/app/views/galleries/index.html.erb
@@ -25,6 +25,27 @@
 	</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 -->
diff --git a/app/views/home/search.html.erb b/app/views/home/search.html.erb
index a22bf16..f0a0f2f 100644
--- a/app/views/home/search.html.erb
+++ b/app/views/home/search.html.erb
@@ -1,6 +1,6 @@
 <div class="content-wrap content-column">
 <%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form", :method=>'get'} do |f| %>
-<%= f.input :query, :input_html => { :name => 'query' } %>
+<%= f.input :query, :input_html => { :name => 'query' } , :label=>false %>
 <% end %>
 <script>
 $( document ).ready(function() {
diff --git a/app/views/lvas/_nlink.html.erb b/app/views/lvas/_nlink.html.erb
new file mode 100644
index 0000000..d5b1a2b
--- /dev/null
+++ b/app/views/lvas/_nlink.html.erb
@@ -0,0 +1,3 @@
+<h2><%= nlink.title %></h2>
+<% render :partial=>  "lvas/lva", :object=>nlink %>
+=
diff --git a/app/views/neuigkeiten/_nlink_list.html.erb b/app/views/neuigkeiten/_nlink_list.html.erb
new file mode 100644
index 0000000..abbed76
--- /dev/null
+++ b/app/views/neuigkeiten/_nlink_list.html.erb
@@ -0,0 +1,11 @@
+  <li>
+    <%= link_to nlink_list.link do  %>
+<div class="contentbox" >
+    <% p = nlink_list.link_type.downcase.pluralize+"/nlink" %>
+    <%= raw(strip_links(render :partial=>p, :object=>nlink_list.link )) %>
+</div>  
+<% end %>
+</li>
+
+
+
diff --git a/app/views/neuigkeiten/_nlink_list_search.html.erb b/app/views/neuigkeiten/_nlink_list_search.html.erb
new file mode 100644
index 0000000..b8521af
--- /dev/null
+++ b/app/views/neuigkeiten/_nlink_list_search.html.erb
@@ -0,0 +1,12 @@
+
+<li>
+  <%= link_to nlink_list_search.title, nlink_list_search %>
+<%= link_to "add:"+nlink_list_search.title, create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit, :link_id=>nlink_list_search.id, :link_type=>nlink_list_search.class.to_s) %>
+  <div class="contentbox" >
+    <% p = nlink_list_search.class.to_s.downcase.pluralize+"/nlink" %>
+    <%= render :partial=>p, :object=>nlink_list_search %>
+  </div>  
+</li>
+
+
+
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index aade7be..a2b040c 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -16,17 +16,31 @@
   </div>
   <div class="media-body">
     <h1>
-<%=  @neuigkeit.title%>
-
-</h1>
+      <%=  @neuigkeit.title%>
+      
+    </h1>
     <%= raw(@neuigkeit.text) %>
     <p></p>
   </div>
 </div>
-
 <% @calentries1.each do |ce|%>
 <%= render ce unless ce.nil? %>
 <% end %>
 <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 </div>
+
+Siehe auch: 
+<ul>
+  <div id="nlink_list">
+    <%= render partial: "nlink_list", collection: @neuigkeit.nlinks %>
+  </div>
+  <div id="nlink_list_search">
+    <%= render partial: "nlink_list_search", collection: @nlink_search %>
+  </div>
+</ul>
+
+<%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} do |f| %>
+<%= f.input :query, :input_html => { :name => 'query' },:label=>false %>
+<% end %>
+
 </div>
diff --git a/app/views/themen/_nlink.html.erb b/app/views/themen/_nlink.html.erb
new file mode 100644
index 0000000..1685d5d
--- /dev/null
+++ b/app/views/themen/_nlink.html.erb
@@ -0,0 +1 @@
+<%= raw(strip_links(render :partial=>  "themen/small", :object=>nlink)) %>
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index ffed011..cf9f599 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -1,5 +1,5 @@
 <div class="content-wrap content-column" >
-
+<h2>sdffs</h2>
 <h1><%= @themengruppe.title %></h1>
 <p>
   <%= @themengruppe.text %>
@@ -8,7 +8,7 @@
   <% @themengruppe.themen.each do |thema| %>
   <li>
     <div class="contentbox">		  
-      <a href="#<%=thema.id%>">
+      <a name="<%=thema.id%>" href="#<%=thema.id%>">
 	<h2><%= thema.title %></h2>
       </a>
       <% unless thema.gremium.nil? %>
@@ -17,6 +17,9 @@
       </p>
       <% end %>		
       <%= render :partial => 'themen/small', :object => thema %>
+      <% thema.nlinks.each do |l| %> 
+      <%= render l.neuigkeit %>
+      <% end %>
     </div>
   </li>
   <% end %>
diff --git a/app/views/themes/2003/themengruppen/show.html.erb b/app/views/themes/2003/themengruppen/show.html.erb
deleted file mode 100644
index ca514a6..0000000
--- a/app/views/themes/2003/themengruppen/show.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="content-wrap content-column" >
-<h1><%= @themengruppe.title %></h1>
-<p>
-  <%= @themengruppe.text %>
-</p>
-<ul class="unstyled linkbox-list" >
-  <% @themen.each do |thema| %>
-  <li>
-    <div class="contentbox">		  
-      <a href="#<%=thema.id%>">
-	<h2><%= thema.title %></h2>
-      </a>
-      <% unless thema.gremium.nil? %>
-      <p>
-	<%= link_to "Zu dem Gremium ..." , thema.gremium %>
-      </p>
-      <% end %>		
-      <%= render :partial => 'themen/small', :object => thema %>
-    </div>
-  </li>
-  <% end %>
-</ul>
-
-<%= render :partial=>'layouts/pretty_toolbar' unless @toolbar_elements.empty?%>
-</div>
diff --git a/config/routes.rb b/config/routes.rb
index 4e45e02..b3af66c 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -92,6 +92,8 @@
            get 'unpublish'
            get 'add_calentry'
            get 'rm_calentry'
+           get 'create_link'
+           get 'find_link'
          end
        end
      end
diff --git a/db/migrate/20140328200432_create_nlinks.rb b/db/migrate/20140328200432_create_nlinks.rb
new file mode 100644
index 0000000..789f1e7
--- /dev/null
+++ b/db/migrate/20140328200432_create_nlinks.rb
@@ -0,0 +1,13 @@
+class CreateNlinks < ActiveRecord::Migration
+  def change
+    create_table :nlinks do |t|
+      t.string :title
+      t.integer :sort
+      t.integer :neuigkeit_id
+      t.integer :link_id
+      t.string :link_type
+
+      t.timestamps
+    end
+  end
+end
diff --git a/spec/factories/nlinks.rb b/spec/factories/nlinks.rb
new file mode 100644
index 0000000..9cec3a7
--- /dev/null
+++ b/spec/factories/nlinks.rb
@@ -0,0 +1,11 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :nlink do
+    title "MyString"
+    sort 1
+    neuigkeit_id 1
+    link_id 1
+    link_type "MyString"
+  end
+end
diff --git a/spec/models/nlink_spec.rb b/spec/models/nlink_spec.rb
new file mode 100644
index 0000000..79f9141
--- /dev/null
+++ b/spec/models/nlink_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Nlink do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 07f53c59bcb62297480ea967a4f7112fd41cf839 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 12:43:08 +0100
Subject: [PATCH 37/56] thema verwalten added

---
 Gemfile                               |  4 ++--
 app/controllers/themen_controller.rb  | 19 +++++++++++++++----
 app/views/lvas/show.html.erb          | 23 +++++++++++++++--------
 app/views/neuigkeiten/show.html.erb   |  2 +-
 app/views/themen/_small.html.erb      |  2 +-
 app/views/themen/show.html.erb        | 21 +++------------------
 app/views/themengruppen/show.html.erb | 13 +++++++++++--
 config/routes.rb                      |  7 +++++--
 8 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8a0a201..9bde7ec 100755
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem 'jquery-rails'
 # Use unicorn as the app server
 # gem 'unicorn'
 
-# Deploy with Capistrano
+# Deploy with Capistran
 # gem 'capistrano'
 
 # To use debugger
@@ -87,7 +87,7 @@ gem 'rmagick'
 gem 'bootstrap-addons-rails'
 gem "jquery-fileupload-rails"
 gem "jquery-ui-rails","~> 4.1.1" 
-
+gem "font-awesome-rails"
 # gem "jquery-sortable-rails"
 gem "seed_dump", "~> 0.5.3"
 #gem "themes_for_rails" ,:git =>'git://github.com/tkriplean/themes_for_rails.git'
diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb
index 9b84e0a..4e63f18 100644
--- a/app/controllers/themen_controller.rb
+++ b/app/controllers/themen_controller.rb
@@ -16,16 +16,27 @@ class ThemenController < ApplicationController
   # GET /themen/1.json
   def show
     @thema = Thema.find(params[:id])
+    redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> params[:id].to_s
     @fragen=@thema.fragen
+    @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>"Verwalten", :path=>verwalten_thema_path(@thema)}]
+
     @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
     @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('thema.remove'), :path=>thema_path(@thema), :method=>:delete, :confirm=>I18n.t('thema.sure')}
 
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @thema }
-    end
+  #  respond_to do |format|
+  #    format.html # show.html.erb
+  #    format.json { render json: @thema }
+  #  end
   end
+  def verwalten
+    @thema = Thema.find(params[:id])
+    @fragen=@thema.fragen
+    @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>"Verwalten", :path=>verwalten_thema_path(@thema)}]
 
+    @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('thema.remove'), :path=>thema_path(@thema), :method=>:delete, :confirm=>I18n.t('thema.sure')}
+    
+  end
   # GET /themen/new
   # GET /themen/new.json
   def new
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index 69667d5..5735a58 100755
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -4,10 +4,12 @@
   <div class="row-fluid">
     <div class="span8">
       <h1><%=@lva.typ.to_s + ' ' +  @lva.name %></h1>
+      
       <h2>Prüfungsinformation</h2>
       <div class="">
 	<%= @lva.pruefungsinformation.html_safe %>
       </div>
+
       <h2>Lernaufwand</h2>
       <div class="">
 	<%= @lva.lernaufwand %>
@@ -16,14 +18,19 @@
       <div class="">
 	<%= @lva.desc.to_s.html_safe %>
       </div>
-      <div class="row-fluid">
-	<h2>Beispiele</h2>
-	  <% @lva.beispiele.each do |b| %>
-	    <%= render b%>
-
-	  <% end %>
-
-      </div>
+      
+      <h2>Beispiele</h2>
+      <% @lva.beispiele.each do |b| %>
+      <%= render b%>
+      <% end %>
+      
+      <% unless @lva.nlinks.empty? %> 
+      <h2>Neuigkeiten</h2>
+      <% @lva.nlinks.each do |l| %> 
+      <%= render l.neuigkeit %>
+      <% end %>
+      <% end %>
+   
     </div>
     <div class="span4">
       <div class="contentbox">
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index a2b040c..2dcb846 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -30,7 +30,7 @@
 </div>
 
 Siehe auch: 
-<ul>
+<ul class="unstyled">
   <div id="nlink_list">
     <%= render partial: "nlink_list", collection: @neuigkeit.nlinks %>
   </div>
diff --git a/app/views/themen/_small.html.erb b/app/views/themen/_small.html.erb
index 58c03bd..e6b9d4a 100644
--- a/app/views/themen/_small.html.erb
+++ b/app/views/themen/_small.html.erb
@@ -14,4 +14,4 @@
 @small_elements = []
 @small_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>small} if can? :edit, small 
 @small_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('thema.remove'), :path=>small, :method=>:delete,:confirm=>I18n.t('thema.sure')} if can? :delete, small %>
-<%= render :partial=>'layouts/pretty_toolbar', :object=>@small_elements unless @small_elements.empty? %>
+<% render :partial=>'layouts/pretty_toolbar', :object=>@small_elements unless @small_elements.empty? %>
diff --git a/app/views/themen/show.html.erb b/app/views/themen/show.html.erb
index 041efab..aa8912a 100644
--- a/app/views/themen/show.html.erb
+++ b/app/views/themen/show.html.erb
@@ -1,24 +1,9 @@
 <p id="notice"><%= notice %></p>
+<%= link_to "Zurück", @thema.themengruppe %>
+<br> 
+<%= render :partial=>"themen/small", :object=>@thema %>
 
-<h1><%= @thema.title %></h1>
-<p>
-  <%= raw(@thema.text) %>
-</p>
-
-<!--
-<%= link_to 'Edit', edit_thema_path(@thema) %> |
-<%= link_to 'Back', themengruppe_path(@thema.themengruppe) %>
--->
 <%= render :partial=>'layouts/pretty_toolbar' %>
 
-<%= render :partial=>'themen/fragen' %>
-<!--
-<%= link_to 'Neue Frage', new_frage_path %> <br/>
--->
-<br/>
-
-<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} %>
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index cf9f599..1268b61 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -1,5 +1,5 @@
 <div class="content-wrap content-column" >
-<h2>sdffs</h2>
+<h2>sdffs2</h2>
 <h1><%= @themengruppe.title %></h1>
 <p>
   <%= @themengruppe.text %>
@@ -13,10 +13,19 @@
       </a>
       <% unless thema.gremium.nil? %>
       <p>
-	<%= link_to "Zu dem Gremium ..." , thema.gremium %>
+	<%= link_to fa_icon("users 2x")+" Zu dem Gremium ..." , thema.gremium %>
       </p>
       <% end %>		
       <%= 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? %>
+
+
       <% thema.nlinks.each do |l| %> 
       <%= render l.neuigkeit %>
       <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index b3af66c..69cc67e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -112,8 +112,11 @@
     end
     
      resources :themen do
-       get :fragen
-       resources :attachments
+         member do
+           get :fragen
+           get :verwalten
+         end
+         resources :attachments
      end
 	 
      resources :themengruppen do

From 95370d4ae8680d68d8b6dc46ebf9b173c1615b28 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 12:43:24 +0100
Subject: [PATCH 38/56] verwalten template

---
 app/views/themen/verwalten.html.erb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 app/views/themen/verwalten.html.erb

diff --git a/app/views/themen/verwalten.html.erb b/app/views/themen/verwalten.html.erb
new file mode 100644
index 0000000..041efab
--- /dev/null
+++ b/app/views/themen/verwalten.html.erb
@@ -0,0 +1,24 @@
+<p id="notice"><%= notice %></p>
+
+<h1><%= @thema.title %></h1>
+<p>
+  <%= raw(@thema.text) %>
+</p>
+
+<!--
+<%= link_to 'Edit', edit_thema_path(@thema) %> |
+<%= link_to 'Back', themengruppe_path(@thema.themengruppe) %>
+-->
+<%= render :partial=>'layouts/pretty_toolbar' %>
+
+<%= render :partial=>'themen/fragen' %>
+<!--
+<%= link_to 'Neue Frage', new_frage_path %> <br/>
+-->
+<br/>
+
+<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} %>

From 5a083cf30a7a64156eeed87e642c46a48598a120 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 12:43:37 +0100
Subject: [PATCH 39/56] awesome font icons added

---
 app/assets/stylesheets/application.css.scss                 | 1 +
 app/assets/stylesheets/themes/2003/application.css.scss     | 2 +-
 app/assets/stylesheets/themes/blue1/application.css.scss    | 2 +-
 app/assets/stylesheets/themes/darkblue/application.css.scss | 2 +-
 app/assets/stylesheets/themes/white_1/application.css.scss  | 2 +-
 app/views/gremien/show.html.erb                             | 6 +++++-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 9b7217f..2927c7e 100755
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -42,6 +42,7 @@ $sansFontFamily: Helvetica, Arial;
 @import 'bootstrap-responsive';
 @import 'bootstrap/image-gallery';
 
+@import 'font-awesome';
 
 h1 { 
   font-size: 23px
diff --git a/app/assets/stylesheets/themes/2003/application.css.scss b/app/assets/stylesheets/themes/2003/application.css.scss
index c21efd0..d45d70e 100755
--- a/app/assets/stylesheets/themes/2003/application.css.scss
+++ b/app/assets/stylesheets/themes/2003/application.css.scss
@@ -58,7 +58,7 @@ $sansFontFamily: Helvetica, Arial;
 @import 'bootstrap/image-gallery';
 
 @import 'neuigkeiten';
-
+@import 'font-awesome';
 
 div.header { 
   display: block; 
diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss
index c733110..fe7a383 100755
--- a/app/assets/stylesheets/themes/blue1/application.css.scss
+++ b/app/assets/stylesheets/themes/blue1/application.css.scss
@@ -56,7 +56,7 @@ $sansFontFamily: Helvetica, Arial;
 @import 'bootstrap';
 @import 'bootstrap-responsive';
 @import 'bootstrap/image-gallery';
-
+@import 'font-awesome';
 @import 'neuigkeiten';
 
 
diff --git a/app/assets/stylesheets/themes/darkblue/application.css.scss b/app/assets/stylesheets/themes/darkblue/application.css.scss
index 36fce0c..2057e79 100755
--- a/app/assets/stylesheets/themes/darkblue/application.css.scss
+++ b/app/assets/stylesheets/themes/darkblue/application.css.scss
@@ -56,7 +56,7 @@ $sansFontFamily: Helvetica, Arial;
 @import 'bootstrap';
 @import 'bootstrap-responsive';
 @import 'bootstrap/image-gallery';
-
+@import 'font-awesome';
 @import 'neuigkeiten';
 
 
diff --git a/app/assets/stylesheets/themes/white_1/application.css.scss b/app/assets/stylesheets/themes/white_1/application.css.scss
index 99793a5..8cbca33 100644
--- a/app/assets/stylesheets/themes/white_1/application.css.scss
+++ b/app/assets/stylesheets/themes/white_1/application.css.scss
@@ -41,7 +41,7 @@ $sansFontFamily: Helvetica, Arial;
 @import 'bootstrap';
 @import 'bootstrap-responsive';
 @import 'bootstrap/image-gallery';
-
+@import 'font-awesome';
 @import 'neuigkeiten';
 
 div.header { 
diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb
index fe7b2e2..c52afda 100644
--- a/app/views/gremien/show.html.erb
+++ b/app/views/gremien/show.html.erb
@@ -11,7 +11,11 @@
       <%= @gremium.desc.html_safe %>
     </p>
 <% unless @gremium.thema.nil? %>
- <p><%= link_to "Mehr zum Gremium lesen ..." ,themengruppe_path(@gremium.thema.themengruppe , {:thema=>@gremium.thema.id})%></p>
+ <p>
+<%= link_to thema_path(@gremium.thema) do%>
+<%= fa_icon "book 2x" %> Mehr zum Gremium lesen ...
+<% end %>
+</p>
 <% end %>
   </div>
  

From f533adc956e1b3930e5765319f770f4bad696ef1 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 12:43:51 +0100
Subject: [PATCH 40/56] gemfilelock

---
 Gemfile.lock | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index c2a82fc..5267261 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,6 +80,8 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
+    font-awesome-rails (4.0.3.1)
+      railties (>= 3.2, < 5.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
     formtastic-bootstrap (2.1.3)
@@ -239,6 +241,7 @@ DEPENDENCIES
   devise (~> 2.2.3)
   execjs (~> 1.4.0)
   factory_girl_rails
+  font-awesome-rails
   formtastic (~> 2.2.1)
   formtastic-bootstrap (~> 2.1.3)
   git

From 7f9b0b996e15b72ab99b705403bc258d0a6252d5 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 12:53:49 +0100
Subject: [PATCH 41/56] nice Gremium - Themen Links

---
 app/models/gremium.rb                 |  7 ++++++-
 app/views/gremien/show.html.erb       |  2 +-
 app/views/themengruppen/show.html.erb | 18 ++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index c119b55..a88f890 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -14,7 +14,8 @@
 class Gremium < ActiveRecord::Base
   TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell",4=>"inoffiziell-tempo", 11=> "berufungskommission"} # Kategorien, im Wesentlichen wichtig für Listung oder nicht Listung
   GESCHLECHT={0=>"saechlich", 1 => "maennlich", 2 => "weiblich"} # Geschlecht des Gremiums zur richtige Deklination
-  ART2FALL={0=>"des", 1=>"des",2=>"der"} # Artikel 2.Fall abhängig vom Geschlecht
+ ART2FALL={0=>"des", 1=>"des",2=>"der"} # Artikel 2.Fall abhängig vom Geschlecht 
+ ART4FALL={0=>"das", 1=>"den",2=>"die"} # Artikel 2.Fall abhängig vom Geschlecht
   FILTER={11=>I18n.t("gremium.filter.berufung.title")}
   TEXT={11=>I18n.t("gremium.filter.berufung.text")}
 
@@ -30,5 +31,9 @@ class Gremium < ActiveRecord::Base
   def fall2 
     Gremium::ART2FALL[self.geschlecht.to_i].to_s+" "+ self.name.to_s+ ((self.geschlecht.to_i==1||self.geschlecht.to_i==0)? "s":"") 
   end
+  def fall4 
+    Gremium::ART4FALL[self.geschlecht.to_i].to_s+" "+ self.name.to_s+ ((self.geschlecht.to_i==1||self.geschlecht.to_i==0)? "":"") 
+  end
   
 end
+
diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb
index c52afda..21482e5 100644
--- a/app/views/gremien/show.html.erb
+++ b/app/views/gremien/show.html.erb
@@ -13,7 +13,7 @@
 <% unless @gremium.thema.nil? %>
  <p>
 <%= link_to thema_path(@gremium.thema) do%>
-<%= fa_icon "book 2x" %> Mehr zum Gremium lesen ...
+<%= fa_icon "book 2x" %> Mehr über <%=@gremium.fall4 %> erfahren
 <% end %>
 </p>
 <% end %>
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index 1268b61..973ef43 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -11,11 +11,6 @@
       <a name="<%=thema.id%>" href="#<%=thema.id%>">
 	<h2><%= thema.title %></h2>
       </a>
-      <% unless thema.gremium.nil? %>
-      <p>
-	<%= link_to fa_icon("users 2x")+" Zu dem Gremium ..." , thema.gremium %>
-      </p>
-      <% end %>		
       <%= render :partial => 'themen/small', :object => thema %>
 tools:
       <% 
@@ -24,11 +19,18 @@ tools:
 
    %>
 	<%= 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| %> 
-      <%= render l.neuigkeit %>
+<li><%= render l.neuigkeit %></li>
       <% end %>
+</ul>
     </div>
   </li>
   <% end %>

From 5134e25b811a627df4bb3b631a2c403cde478f74 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 13:10:41 +0100
Subject: [PATCH 42/56] FIXED themengruppe verwalten + faqs order

---
 app/controllers/themen_controller.rb        | 2 +-
 app/controllers/themengruppen_controller.rb | 2 +-
 app/views/themen/_verw_liste.html.erb       | 2 +-
 app/views/themengruppen/faqs.html.erb       | 6 ++++--
 app/views/themengruppen/show.html.erb       | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb
index 4e63f18..520f2be 100644
--- a/app/controllers/themen_controller.rb
+++ b/app/controllers/themen_controller.rb
@@ -77,7 +77,7 @@ class ThemenController < ApplicationController
     end
   end
  def fragen
-    @thema = Thema.find(params[:thema_id])
+    @thema = Thema.find(params[:id])
     @fragen=@thema.fragen
     respond_to do |format|
       format.js
diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb
index 6506015..f639b42 100644
--- a/app/controllers/themengruppen_controller.rb
+++ b/app/controllers/themengruppen_controller.rb
@@ -13,7 +13,7 @@ class ThemengruppenController < ApplicationController
     end
   end
   def faqs
-    @themengruppen = Themengruppe.order(:priority).includes(:themen,{themen: :fragen})
+    @themengruppen = Themengruppe.order("themengruppen.priority").includes(:themen,{themen: :fragen}).order("themen.priority").reverse
     
   end
 
diff --git a/app/views/themen/_verw_liste.html.erb b/app/views/themen/_verw_liste.html.erb
index 6f83076..cceba04 100644
--- a/app/views/themen/_verw_liste.html.erb
+++ b/app/views/themen/_verw_liste.html.erb
@@ -1,3 +1,3 @@
 <% verw_liste.each do |thema| %>
-<li id="themen_<%= thema.id %>" class="sort"  ><div class="contentbox handle" ><h2><%= thema.title %></h2>  </div> <%= link_to edit_thema_path(thema),:remote=>true do %> Edit <% end %>  <%= link_to thema_fragen_path(thema),:remote=>true do %> Fragen <% end %></li>
+<li id="themen_<%= thema.id %>" class="sort"  ><div class="contentbox handle" ><h2><%= thema.title %></h2>  </div> <%= link_to edit_thema_path(thema),:remote=>true do %> Edit <% end %>  <%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
 <% end %>
diff --git a/app/views/themengruppen/faqs.html.erb b/app/views/themengruppen/faqs.html.erb
index 24fcb5a..d48b1fd 100644
--- a/app/views/themengruppen/faqs.html.erb
+++ b/app/views/themengruppen/faqs.html.erb
@@ -2,8 +2,10 @@
 
 <h2><%= tg.title%></h2>
 <ul>
-<% tg.themen.each do |t| %>
-<li> <%= t.title %>
+<% tg.themen.order(:priority).reverse.each do |t| %>
+<li><a name="themengruppe_<%=t.id.to_s%>">  <%= t.title %> &nbsp;</a>
+
+
 
 <ul>
 <% t.fragen.each do |f| %>
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index 973ef43..c38e245 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -1,5 +1,6 @@
 <div class="content-wrap content-column" >
-<h2>sdffs2</h2>
+<%= 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 %>

From ddb230604cff3d39a374e737c4b2659cc4b0cdd9 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 14:05:33 +0100
Subject: [PATCH 43/56] small fixes

removed beispiel show action
beautified search url
anchors for faqs fixed
---
 app/controllers/beispiele_controller.rb |  6 +-----
 app/controllers/themen_controller.rb    |  2 +-
 app/views/beispiele/show.html.erb       | 18 ------------------
 app/views/gremien/show.html.erb         |  2 +-
 app/views/home/search.html.erb          |  4 ++--
 app/views/themen/_form.html.erb         |  3 ++-
 app/views/themen/_small.html.erb        |  5 +++++
 app/views/themengruppen/faqs.html.erb   |  6 +++---
 config/routes.rb                        |  6 ++++--
 9 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100755 app/views/beispiele/show.html.erb

diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb
index ef93f78..d1bf706 100755
--- a/app/controllers/beispiele_controller.rb
+++ b/app/controllers/beispiele_controller.rb
@@ -16,11 +16,7 @@ class BeispieleController < ApplicationController
   def show
     # @lva = params([:lva]) unless params([:lva]).nil?
     @beispiel = Beispiel.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @beispiel }
-    end
+redirect_to @beispiel.lva
   end
 
   # GET /beispiele/new
diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb
index 520f2be..2f5fa51 100644
--- a/app/controllers/themen_controller.rb
+++ b/app/controllers/themen_controller.rb
@@ -16,7 +16,7 @@ class ThemenController < ApplicationController
   # GET /themen/1.json
   def show
     @thema = Thema.find(params[:id])
-    redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> params[:id].to_s
+    redirect_to :controller=>'themengruppen', :id=>@thema.themengruppe.id, :action=>:show, :anchor=> "thema_"+params[:id].to_s
     @fragen=@thema.fragen
     @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>"Verwalten", :path=>verwalten_thema_path(@thema)}]
 
diff --git a/app/views/beispiele/show.html.erb b/app/views/beispiele/show.html.erb
deleted file mode 100755
index 49501a7..0000000
--- a/app/views/beispiele/show.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @beispiel.name %>
-</p>
-
-<p>
-  <b>Desc:</b>
-  <%= @beispiel.desc %>
-  <%= @beispiel.beispieldatei.url %>
-</p>
-<p>
-  <%= @beispiel.lva.name %>
-  </p>
-
-<%= link_to 'Edit', edit_beispiel_path(@beispiel) %> |
-<%= link_to 'Back', beispiele_path %>
diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb
index 21482e5..5880e93 100644
--- a/app/views/gremien/show.html.erb
+++ b/app/views/gremien/show.html.erb
@@ -13,7 +13,7 @@
 <% unless @gremium.thema.nil? %>
  <p>
 <%= link_to thema_path(@gremium.thema) do%>
-<%= fa_icon "book 2x" %> Mehr über <%=@gremium.fall4 %> erfahren
+<%= fa_icon "book 2x border" %> Mehr über <%=@gremium.fall4 %> erfahren
 <% end %>
 </p>
 <% end %>
diff --git a/app/views/home/search.html.erb b/app/views/home/search.html.erb
index f0a0f2f..e45c142 100644
--- a/app/views/home/search.html.erb
+++ b/app/views/home/search.html.erb
@@ -1,6 +1,6 @@
 <div class="content-wrap content-column">
-<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form", :method=>'get'} do |f| %>
-<%= f.input :query, :input_html => { :name => 'query' } , :label=>false %>
+<%= semantic_form_for :search,:remote=>true, :url=>search_home_index_path, :html=>{:id=>"search_form",:class=>"navbar-search", :method=>'get'} do |f| %>
+<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %>
 <% end %>
 <script>
 $( document ).ready(function() {
diff --git a/app/views/themen/_form.html.erb b/app/views/themen/_form.html.erb
index 759daf2..b1d62dd 100644
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -21,7 +21,8 @@
 </div>
 
 <%= f.actions do %>
-<%= f.action :submit, :as => :input %>
+<%= f.action :submit, :as => :button, :label=>"Sdf"+raw(fa_icon("save"))%> 
+
 <%= f.action :cancel, :as => :link %>
 <% end %> 
 <% end %><% end %>
diff --git a/app/views/themen/_small.html.erb b/app/views/themen/_small.html.erb
index e6b9d4a..61eb45e 100644
--- a/app/views/themen/_small.html.erb
+++ b/app/views/themen/_small.html.erb
@@ -1,3 +1,8 @@
+
+	  
+      <a name="thema_<%=small.id%>" href="#<%=small.id%>">
+	<h2><%= small.title %></h2>
+      </a>
 <%= raw(small.text) %>
 <br/>
 <%= raw("<b>FAQs:</b>")  unless small.fragen.empty? %>
diff --git a/app/views/themengruppen/faqs.html.erb b/app/views/themengruppen/faqs.html.erb
index d48b1fd..c38f315 100644
--- a/app/views/themengruppen/faqs.html.erb
+++ b/app/views/themengruppen/faqs.html.erb
@@ -1,9 +1,9 @@
 <% @themengruppen.each do |tg| %>
-
-<h2><%= tg.title%></h2>
+<a name="themengruppe_<%=tg.id.to_s%>">
+<h2><%= tg.title%></h2></a>
 <ul>
 <% tg.themen.order(:priority).reverse.each do |t| %>
-<li><a name="themengruppe_<%=t.id.to_s%>">  <%= t.title %> &nbsp;</a>
+<li><%= t.title %>
 
 
 
diff --git a/config/routes.rb b/config/routes.rb
index 69cc67e..f9c125e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@
   themes_for_rails
    devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
    resources :home, :only=>[:index] do
-     get :search, :on=>:collection
+
    end
    #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
    scope '(:locale)/admin' do
@@ -103,7 +103,9 @@
      # get 'rubriken/verwalten',:controller=>:rubriken,:action=>:alle_verwalten, :as=>'rubriken_verwalten'
      
      resources :home, :only=>[:index] do
-       collection do
+      get :search, :on=>:collection
+         collection do
+           
          get 'dev'
          get 'startdev'
          get 'linksnotimplemented'

From 341f6db268b472f5a5954ab612882254e8137ada Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 29 Mar 2014 14:06:44 +0100
Subject: [PATCH 44/56] themengruppen show small fix

---
 app/assets/stylesheets/application.css.scss | 2 +-
 app/controllers/beispiele_controller.rb     | 2 +-
 app/views/lvas/_nlink.html.erb              | 1 -
 app/views/themengruppen/show.html.erb       | 5 +----
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 2927c7e..9cd5a40 100755
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -44,7 +44,7 @@ $sansFontFamily: Helvetica, Arial;
 
 @import 'font-awesome';
 
-h1 { 
+h1 {
   font-size: 23px
 }
 
diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb
index d1bf706..286e91e 100755
--- a/app/controllers/beispiele_controller.rb
+++ b/app/controllers/beispiele_controller.rb
@@ -16,7 +16,7 @@ class BeispieleController < ApplicationController
   def show
     # @lva = params([:lva]) unless params([:lva]).nil?
     @beispiel = Beispiel.find(params[:id])
-redirect_to @beispiel.lva
+    redirect_to @beispiel.lva
   end
 
   # GET /beispiele/new
diff --git a/app/views/lvas/_nlink.html.erb b/app/views/lvas/_nlink.html.erb
index d5b1a2b..029de7f 100644
--- a/app/views/lvas/_nlink.html.erb
+++ b/app/views/lvas/_nlink.html.erb
@@ -1,3 +1,2 @@
 <h2><%= nlink.title %></h2>
 <% render :partial=>  "lvas/lva", :object=>nlink %>
-=
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index c38e245..0cf1a92 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -8,10 +8,7 @@
 <ul class="unstyled linkbox-list" >
   <% @themengruppe.themen.each do |thema| %>
   <li>
-    <div class="contentbox">		  
-      <a name="<%=thema.id%>" href="#<%=thema.id%>">
-	<h2><%= thema.title %></h2>
-      </a>
+    <div class="contentbox">	
       <%= render :partial => 'themen/small', :object => thema %>
 tools:
       <% 

From 2c0f3ff0b85373c114b3530eff2ba87d3539fdac Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 30 Mar 2014 20:09:02 +0200
Subject: [PATCH 45/56] THEMA TESTS

---
 spec/factories/themengruppen.rb  |  2 +-
 spec/models/thema_spec.rb        | 18 +++++++++++++++++-
 spec/models/themengruppe_spec.rb |  8 +++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/spec/factories/themengruppen.rb b/spec/factories/themengruppen.rb
index 868dca7..5a4f413 100644
--- a/spec/factories/themengruppen.rb
+++ b/spec/factories/themengruppen.rb
@@ -1,7 +1,7 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do
-  factory :themagruppen, :class => 'Themengruppe' do
+  factory :themengruppe, :class => 'Themengruppe' do
     title "MyString"
     text "MyText"
   end
diff --git a/spec/models/thema_spec.rb b/spec/models/thema_spec.rb
index b006262..6bcdc81 100644
--- a/spec/models/thema_spec.rb
+++ b/spec/models/thema_spec.rb
@@ -1,5 +1,21 @@
 require 'spec_helper'
 
 describe Thema do
-  pending "add some examples to (or delete) #{__FILE__}"
+  
+  [:text, :title].each do |attr|
+    it "should not be valid without #{attr}" do
+      tg=FactoryGirl.build(:themengruppe)
+      t = FactoryGirl.build(:thema, attr=>nil)
+      t.themengruppe=tg
+      t.should_not be_valid
+    end
+  end
+    it "should not be valid without Themengruppe" do
+      tg=FactoryGirl.build(:themengruppe)
+      t = FactoryGirl.build(:thema)
+       t.should_not be_valid
+    end
+  
+
+
 end
diff --git a/spec/models/themengruppe_spec.rb b/spec/models/themengruppe_spec.rb
index cf5341f..d504f19 100644
--- a/spec/models/themengruppe_spec.rb
+++ b/spec/models/themengruppe_spec.rb
@@ -1,5 +1,11 @@
 require 'spec_helper'
 
 describe Themengruppe do
-  pending "add some examples to (or delete) #{__FILE__}"
+ [:text, :title].each do |attr|
+    it "should not be valid without #{attr}" do
+      tg=FactoryGirl.build(:themengruppe, attr=>nil)
+      tg.should_not be_valid
+    end
+  end
+ 
 end

From 1bf09408628a66941b608e263f107260874488c4 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 30 Mar 2014 20:09:40 +0200
Subject: [PATCH 46/56] ability show thema

---
 app/models/ability.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 38a73c6..055bbb5 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -37,6 +37,8 @@ class Ability
     can [:show, :index], Lva
     can [:show,:index], Gallery
     can [:show, :index], Themengruppe
+    can [:show], Thema
+
     can [:show, :index], Fetprofile
     can [:show, :index],Gremium
     # Rechteverwaltung fuer Studien Modul

From 46f5f713ce09f94baed464bc7a4d0f882a20e60d Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 30 Mar 2014 20:09:53 +0200
Subject: [PATCH 47/56] thema validations

---
 app/models/thema.rb        | 3 ++-
 app/models/themengruppe.rb | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/thema.rb b/app/models/thema.rb
index c11e5f7..c81f1d7 100644
--- a/app/models/thema.rb
+++ b/app/models/thema.rb
@@ -16,9 +16,10 @@ class Thema < ActiveRecord::Base
   has_many :attachments
   belongs_to :themengruppe, :foreign_key => "themengruppe_id"
   has_one :gremium
+  has_many :nlinks, as: :link
   validates :themengruppe, :presence => true
   validates :title, :presence => true
+  validates :text, :presence => true
   scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
-  has_many :nlinks, as: :link
   translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
 end
diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb
index 5a6b973..ca42007 100644
--- a/app/models/themengruppe.rb
+++ b/app/models/themengruppe.rb
@@ -10,12 +10,14 @@
 
 class Themengruppe < ActiveRecord::Base
   WORD_COUNT = 50
-  attr_accessible :text, :title, :picture,:priority
+  attr_accessible :text, :title, :picture, :priority
   has_many :themen, class_name: 'Thema'
   has_many :fragen, through: :themen
+
   mount_uploader :picture, PictureUploader
   
   validates :title, :presence => true
+  validates :text, :presence => true
 
   translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
 end

From 69b5ebdaec25f1e62d250bf7f412ffea9357e1ab Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 30 Mar 2014 20:41:12 +0200
Subject: [PATCH 48/56] LVA template update

---
 app/views/lvas/show.html.erb | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index 5735a58..d5bb9cb 100755
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -24,12 +24,6 @@
       <%= render b%>
       <% end %>
       
-      <% unless @lva.nlinks.empty? %> 
-      <h2>Neuigkeiten</h2>
-      <% @lva.nlinks.each do |l| %> 
-      <%= render l.neuigkeit %>
-      <% end %>
-      <% end %>
    
     </div>
     <div class="span4">
@@ -63,7 +57,30 @@
       </div>
     </div>
   </div>
+  <div class="row-fluid">
+    <div class="span12">
+      <% unless @lva.nlinks.empty? %> 
+      <h2>Neuigkeiten</h2>
+      <% @lva.nlinks.each do |l| %> 
+      <%= render l.neuigkeit %>
+      <% end %>
+      <% end %>
+
+    </div>
+  </div>
+
+ <div class="row-fluid">
+    <div class="span12">
+      <%= render 'layouts/pretty_toolbar' %>
+    </div>
+  </div>
+ <div class="row-fluid">
+    <div class="span12">
+      <%= render 'beispiele/form_bulk' %>
+    </div>
+  </div>
+
+
 
-  <%= render 'layouts/pretty_toolbar' %>
 </div>
-<%= render 'beispiele/form_bulk' %>
+

From fcdbb2248afef0196b173853021bca543bead389 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 30 Mar 2014 20:41:22 +0200
Subject: [PATCH 49/56] =?UTF-8?q?Rechte=20f=C3=BCr=20alle=20zum=20Beispiel?=
 =?UTF-8?q?upload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/ability.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 055bbb5..055e2c7 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -38,7 +38,7 @@ class Ability
     can [:show,:index], Gallery
     can [:show, :index], Themengruppe
     can [:show], Thema
-
+    can [:create], Beispiel
     can [:show, :index], Fetprofile
     can [:show, :index],Gremium
     # Rechteverwaltung fuer Studien Modul
@@ -51,16 +51,16 @@ class Ability
     can [:show], Calentry
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
       can :manage,:all
-    can :manage, Modulgruppe
+      can :manage, Modulgruppe
 
-    can [:show,:index], Calendar
-    can  [:edit, :update,:new,:create,:verwalten], Calendar
-    can  [:edit, :update,:new,:create,:verwalten], Calentry
+      can [:show,:index], Calendar
+      can  [:edit, :update,:new,:create,:verwalten], Calendar
+      can  [:edit, :update,:new,:create,:verwalten], Calentry
+    end
+    if( user.has_role?("fetadmin"))
+      can [:delete],Calendar
+      can [:delete],Calentry
     end
-	if( user.has_role?("fetadmin"))
-	can [:delete],Calendar
-	can [:delete],Calentry
-	end
  
     # Rechteverwaltung fuer Neuigkeiten
 

From 3afa8aa7f18ef04a1e438ec5c0ff12f57e9a58fb Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 31 Mar 2014 13:19:00 +0200
Subject: [PATCH 50/56] lvacontroller toolbar ausgelagert

---
 app/controllers/lvas_controller.rb         | 44 +++++++++-------------
 app/controllers/modulgruppen_controller.rb |  3 +-
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb
index 2c96802..dd6781e 100755
--- a/app/controllers/lvas_controller.rb
+++ b/app/controllers/lvas_controller.rb
@@ -1,6 +1,6 @@
 class LvasController < ApplicationController
   # GET /lvas
- before_filter {@toolbar_elements =[]} 
+  before_filter :load_toolbar, :only => [:show]
   load_and_authorize_resource
   def index
     @lvas = Lva.all
@@ -14,13 +14,7 @@ class LvasController < ApplicationController
 
   def show
     @lva = Lva.find_by_id(params[:id])
-   @beispiel=Beispiel.new
-#    @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)}
-     @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
-    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('common.delete'), :path=> lva_path(@lva), :method=>:delete, :confirm=>'Sure?' }
-    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>"Tissvergleichladen", :path=> lva_compare_tiss_path(@lva)}
-
-
+    @beispiel=Beispiel.new
   end
 
   # GET /lvas/new
@@ -36,12 +30,10 @@ class LvasController < ApplicationController
   def edit
     @lva = Lva.find(params[:id])
     @semester =  @lva.modul.map(&:modulgruppen).flatten.map(&:studium).map(&:semester).flatten.uniq
-
-
   end
 
   def compare_tiss
-    @lva = Lva.find_by_id(params[:lva_id])
+    @lva = Lva.find_by_id(params[:id])
     @lvatiss = Lva.new
     @lvatiss.lvanr=@lva.lvanr
     @lvatiss.load_tissdata("-2013W")
@@ -49,7 +41,7 @@ class LvasController < ApplicationController
   end
   
   def load_tiss
-    @lva = Lva.find_by_id(params[:lva_id])
+    @lva = Lva.find_by_id(params[:id])
     @lva.load_tissdata("-2013W")
     if @lva.save
       redirect_to @lva , notice: 'Lva von TISS geleaden.'
@@ -58,10 +50,6 @@ class LvasController < ApplicationController
     end
   end
 
-
-
-  # POST /lvas
-  # POST /lvas.json
   def create
     @lva = Lva.new(params[:lva])
  
@@ -69,40 +57,44 @@ class LvasController < ApplicationController
       if @lva.save
         @lva.add_semesters
         format.html { redirect_to @lva, notice: 'Lva was successfully created.' }
-        
       else
         format.html { render action: "new" }
-        
       end
     end
   end
 
-  # PUT /lvas/1
-  # PUT /lvas/1.json
   def update
     @lva = Lva.find(params[:id])
-    
     respond_to do |format|
       if @lva.update_attributes(params[:lva])
         @lva.add_semesters
         format.html { redirect_to @lva, notice: 'Lva was successfully updated.' }
- 
       else
         format.html { render action: "edit" }
-
       end
     end
   end
 
-  # DELETE /lvas/1
-  # DELETE /lvas/1.json
   def destroy
     @lva = Lva.find(params[:id])
     @lva.destroy
 
     respond_to do |format|
       format.html { redirect_to lvas_url }
-   
     end
   end
+
+private
+  def load_toolbar
+    @lva = Lva.find_by_id(params[:id])
+    @toolbar_elements =[]
+    @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)} if can? :edit, @lva
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>"Tissvergleichladen", :path=> lva_compare_tiss_path(@lva)} if can? :compare_tiss, @lva
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('common.delete'), :path=> lva_path(@lva), :method=>:delete, :confirm=>'Sure?' } if can? :delete, @lva
+
+
+
+
+  end
+
 end
diff --git a/app/controllers/modulgruppen_controller.rb b/app/controllers/modulgruppen_controller.rb
index 42d0502..6c2e6f8 100755
--- a/app/controllers/modulgruppen_controller.rb
+++ b/app/controllers/modulgruppen_controller.rb
@@ -24,7 +24,7 @@ class ModulgruppenController < ApplicationController
     @toolbar_elements = [ {:text=>'Zurück', :path=>studium_path(@studium, :ansicht=>:modulgruppenansicht)}]
     @toolbar_elements << {:hicon=>'icon-plus-sign', :text=>I18n.t('modulgruppe.addmodul'), :path=>new_modul_path(@modulgruppe)}
     @toolbar_elements << {:hicon=>'icon-pencil', :text=>I18n.t('modulgruppe.edit'), :path=>edit_modulgruppe_path(@modulgruppe)}
-    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium, :ansicht=>:modulgruppenansicht), :method=> :delete,:confirm=>"Sure?" }
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium, :ansicht=>:modulgruppenansicht), :method=> :delete,:confirm=>'Sure?' }
   end
 
   # GET /modulgruppen/new
@@ -71,7 +71,6 @@ class ModulgruppenController < ApplicationController
 
   def update
     @modulgruppe = Modulgruppe.find(params[:id])
-
     respond_to do |format|
       if @modulgruppe.update_attributes(params[:modulgruppe])
         format.html { redirect_to @modulgruppe, notice: 'Modulgruppe was successfully updated.' }

From b36c8ddb7c4f0b7d555f21c76440c0133e52dd7e Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 31 Mar 2014 13:19:11 +0200
Subject: [PATCH 51/56] modul form fixed

---
 app/views/moduls/_form.html.erb | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/views/moduls/_form.html.erb b/app/views/moduls/_form.html.erb
index db03f9d..c21d7c3 100755
--- a/app/views/moduls/_form.html.erb
+++ b/app/views/moduls/_form.html.erb
@@ -4,18 +4,27 @@
   <%= f.inputs do %>
   <div class="row-fluid">
     <div class="span9">
-      <%= f.input :name ,:hint=>true%>
-       <div class="row-fluid">
-    <div class="span8">
-      <%= f.input :desc, :as=>:tinymce_text %>
-    </div>
-    <div class="span4">
-      <%= f.input :depend %>
-    </div>
-  </div>
+      <div class="container-fluid">
+	<div class="row-fluid">
+	  <div class="span12">
+	    <%= f.input :name ,:hint=>true%>
+	  </div>
+	</div>
+
+	<div class="row-fluid">
+	  <div class="span12">
+	    <%= f.input :desc, :as=>:tinymce_text %>
+	  </div>
+	</div>
+	<div class="row-fluid">
+	  <div class="span12">
+	    <%= f.input :depend %>
+	  </div>
+	</div>
+      </div>
     </div>
     <div class="span3">
-      <%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
+	<%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
     </div>
   </div>
  

From 16799c57b6df841c50afe926a18145e9bed19b36 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 31 Mar 2014 13:19:31 +0200
Subject: [PATCH 52/56] calender icon awesome font

---
 app/controllers/neuigkeiten_controller.rb    | 13 +++++++++++--
 app/views/calentries/_calentry.html.erb      |  4 +++-
 app/views/calentries/_nested_fields.html.erb |  3 ++-
 app/views/neuigkeiten/_compact.html.erb      |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index 575bb09..31d371e 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -1,5 +1,9 @@
 class NeuigkeitenController < ApplicationController
   before_filter :load_toolbar_elements, :only=>[:show,:find_link]
+  before_filter :load_toolbar_elements_edit, :only=>[:edit]
+ 
+
+
   load_and_authorize_resource
 
   def show
@@ -57,7 +61,7 @@ class NeuigkeitenController < ApplicationController
 
   def edit
     @neuigkeit = Neuigkeit.find(params[:id])
-    @toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit
+
     @calentries= @neuigkeit.calentries
     @calentries<<  Calentry.new 
 
@@ -134,7 +138,12 @@ private
   end
   
 
-
+  def load_toolbar_elements_edit
+    @neuigkeit = Neuigkeit.find(params[:id])
+    @toolbar_elements=[]
+    @toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit
+    
+  end
 
  
 end
diff --git a/app/views/calentries/_calentry.html.erb b/app/views/calentries/_calentry.html.erb
index 7d2ec02..a187212 100644
--- a/app/views/calentries/_calentry.html.erb
+++ b/app/views/calentries/_calentry.html.erb
@@ -1,5 +1,7 @@
 <div class="contentbox">
-<%= image_tag("/iconnavy/time.png")  %>
+<% image_tag("/iconnavy/time.png")  %>
+<%= fa_icon("calendar 2x") %>
+
 <% if calentry.start.to_date == calentry.ende.to_date 
 format=:timeonly
 else
diff --git a/app/views/calentries/_nested_fields.html.erb b/app/views/calentries/_nested_fields.html.erb
index b29f4fe..e4fc987 100644
--- a/app/views/calentries/_nested_fields.html.erb
+++ b/app/views/calentries/_nested_fields.html.erb
@@ -1,6 +1,7 @@
 <div class="row-fluid">
 <div class="span1"></div><div class="span1">
-<%= image_tag("/icon_kalender_small.png")  %>
+<%= fa_icon("calendar 2x") %>
+
 </div>
 <div class="span4">
   <%= f.input :start, :as => :datepicker  %></div><div class="span4">
diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb
index a954385..b82f795 100644
--- a/app/views/neuigkeiten/_compact.html.erb
+++ b/app/views/neuigkeiten/_compact.html.erb
@@ -16,7 +16,7 @@
   </div>
   <% if neuigkeit.has_calentries? %>
     <div class="pull-right" href="#">
-      <%= image_tag("/iconnavy/time.png")  %>
+      <%= fa_icon("calendar 2x")  %>
       <% unless neuigkeit.calentries.upcoming.empty? %>
       <%=  neuigkeit.calentries.upcoming.first.text %>
       <% else unless neuigkeit.calentries.recent.empty? %>

From d9cfe567f7614e1388f40574ac0793a0478ccfc0 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 31 Mar 2014 13:19:40 +0200
Subject: [PATCH 53/56] =?UTF-8?q?routes=20f=C3=BCr=20neugikeiten=20fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/routes.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index f9c125e..2b0edc5 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,9 +66,12 @@
      end
      resources :beispiele#, :only=>[:show,:index,:create]
      resources :lvas  do 
-       get 'compare_tiss'
-       get 'load_tiss'
-       resources :beispiele#, :only=>[:show,:index,:create]
+         member do
+           get 'compare_tiss'
+           get 'load_tiss'
+         end
+         resources :beispiele#, :only=>[:show,:index,:create]
+
      end 
      
      resources :fragen

From e7b43ab0255793dc7d03bc8144b6501862e41045 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Mon, 31 Mar 2014 16:20:36 +0200
Subject: [PATCH 54/56] datentyp fix

---
 db/migrate/20140324185709_add_info_to_studien.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20140324185709_add_info_to_studien.rb b/db/migrate/20140324185709_add_info_to_studien.rb
index f310a20..283283e 100644
--- a/db/migrate/20140324185709_add_info_to_studien.rb
+++ b/db/migrate/20140324185709_add_info_to_studien.rb
@@ -2,6 +2,6 @@ class AddInfoToStudien < ActiveRecord::Migration
   def change
     add_column :studium_translations, :qualifikation, :text
     add_column :studium_translations, :struktur, :text
-    add_column :studium_translations, :jobmoeglichkeiten, :text20
+    add_column :studium_translations, :jobmoeglichkeiten, :text
   end
 end

From c8f6d0ddaee8a8a3fab8bd79b91f31b1e1e7253e Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Mon, 31 Mar 2014 17:10:30 +0200
Subject: [PATCH 55/56] mysql bug

---
 app/models/gallery.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/gallery.rb b/app/models/gallery.rb
index bddea61..ac5855c 100644
--- a/app/models/gallery.rb
+++ b/app/models/gallery.rb
@@ -15,7 +15,7 @@ class Gallery < ActiveRecord::Base
   attr_accessible :datum, :desc, :name
   has_many :fotos
   has_many :nlinks, as: :link
-    scope :search, ->(query) {where("name like ? or desc like ?", "%#{query}%", "%#{query}%")}
+    scope :search, ->(query) {where("name like ? or galleries.desc like ?", "%#{query}%", "%#{query}%")}
 
   def title
     name

From 0beda737a3e080f116ff8c3b053304b1fed51d9b Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Mon, 31 Mar 2014 17:10:55 +0200
Subject: [PATCH 56/56] mysl bug

---
 app/models/lva.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/lva.rb b/app/models/lva.rb
index 34b6ab0..a63d94c 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -44,7 +44,7 @@ class Lva < ActiveRecord::Base
   has_many :beispiele , :class_name => "Beispiel"
   has_and_belongs_to_many :lecturers
   translates :desc,:pruefungsinformation,  :fallbacks_for_empty_translations => true, :versioning=>true
-  scope :search, ->(query) {where("name like ? or desc like ?", "%#{query}%", "%#{query}%")} 
+  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 
   validates_presence_of :ects  # ECTS vorhanden?