From 5f2aa37c7c3c6cedc52873c872ef08680300bba8 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 17:47:25 +0200
Subject: [PATCH 1/9] fetprofile list

---
 app/assets/stylesheets/fetprofiles.css.scss | 4 ++++
 app/views/fetprofiles/index.html.erb        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/fetprofiles.css.scss b/app/assets/stylesheets/fetprofiles.css.scss
index 03ed414..501950b 100644
--- a/app/assets/stylesheets/fetprofiles.css.scss
+++ b/app/assets/stylesheets/fetprofiles.css.scss
@@ -1,3 +1,7 @@
 // Place all the styles related to the fetprofiles controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+ul.fetprofile_list li a {
+display:block
+}
\ No newline at end of file
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index 861cb3e..95f04fc 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -5,7 +5,7 @@
   <%=	I18n.t 'fetprofiles.active' if params[:filter].nil? || params[:filter]== "active"
 	%>
 </h1>
-<ul class="unstyled">
+<ul class="unstyled fetprofile_list">
 <% @fetprofiles.each do |fetprofile| %>
 <li>
 <%= link_to fetprofile do %>

From 19140f4c2f7a51891ff71e7f16843c5eb80fb9cd Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 21:40:41 +0200
Subject: [PATCH 2/9] stacked container no padding

---
 app/assets/stylesheets/application.css.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index ebdf98f..20524f0 100755
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -99,3 +99,6 @@ box-shadow:none;
 #contentdiv{
   background: #FFFFFF
 }
+#contentdiv .container-fluid
+{ padding:0;
+}
\ No newline at end of file

From f067d5564f06b104e90a88c1debe866142c16fbc Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 22:14:17 +0200
Subject: [PATCH 3/9] neuigkeitem block shadow

---
 app/assets/stylesheets/neuigkeiten.css.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/neuigkeiten.css.scss b/app/assets/stylesheets/neuigkeiten.css.scss
index 9324374..b4ac790 100755
--- a/app/assets/stylesheets/neuigkeiten.css.scss
+++ b/app/assets/stylesheets/neuigkeiten.css.scss
@@ -8,4 +8,7 @@ border: 1px solid #ccc;
 background: white;
 padding:10px;
 
+}
+div .neuigkeit_block:hover {
+box-shadow: 1px 1px 2px 2px lightgray;
 }
\ No newline at end of file

From 4b484c8d762a8babf79f6caf39988d1dafbc4767 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 22:14:29 +0200
Subject: [PATCH 4/9] gremien tabs

---
 app/controllers/fetprofiles_controller.rb |  2 +-
 app/controllers/gremien_controller.rb     | 11 +++++++++--
 app/models/gremium.rb                     |  5 +++--
 config/routes.rb                          |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb
index 79242f4..3790511 100644
--- a/app/controllers/fetprofiles_controller.rb
+++ b/app/controllers/fetprofiles_controller.rb
@@ -5,7 +5,7 @@ class FetprofilesController < ApplicationController
     
     @fetprofiles = Fetprofile.active.order(:vorname,:nachname)
     @fetprofiles = Fetprofile.order(:vorname,:nachname) if params[:filter]== "all"
-	@gremientabs=Gremium.order(:typ)
+	@gremientabs=Gremium.tabs
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @fetprofiles }
diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb
index 042bafc..597b83a 100644
--- a/app/controllers/gremien_controller.rb
+++ b/app/controllers/gremien_controller.rb
@@ -4,7 +4,7 @@ class GremienController < ApplicationController
  before_filter {@toolbar_elements=[]}
   def verwalten
     @gremien = Gremium.all
-    @gremientabs=Gremium.all
+    @gremientabs=Gremium.tabs
     @toolbar_elements << {:text=>I18n.t('common.new'),:path=>new_gremium_path() ,:icon=>:plus} if can? :new, Gremium
     respond_to do |format|
       format.html # index.html.erb
@@ -12,11 +12,18 @@ class GremienController < ApplicationController
     end
   end
 
+  def index 
+    @gremien = Gremium.order(:typ).order(:name)
+    @gremientabs=Gremium.tabs
+  
+  end
+
+
   # GET /gremien/1
   # GET /gremien/1.json
   def show
     @gremium = Gremium.find(params[:id])
-    @gremientabs=Gremium.order(:typ)
+    @gremientabs=Gremium.tabs
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @gremium }
diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index 342f3b0..643286c 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -12,13 +12,14 @@
 #
 
 class Gremium < ActiveRecord::Base
-  TYPEN={1=>"offiziell", 2=>"offiziell-temporaer", 3 => "inoffiziell",4=>"inoffiziell-tempo"}
+  TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell",4=>"inoffiziell-tempo"}
+  TAPS_TYPEN={1=>true,2=>false,3=>true,4=>false}
   GESCHLECHT={0=>"saechlich", 1 => "maennlich", 2 => "weiblich"}
   ART2FALL={0=>"des", 1=>"des",2=>"der"}
   attr_accessible :desc, :name, :typ, :geschlecht,:thema_id
   has_many :memberships
   belongs_to :thema
-  scope :tabs, -> { where(:typ => [1,2]) }
+  scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) }
   
   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/config/routes.rb b/config/routes.rb
index cf4b575..89ec740 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -35,7 +35,7 @@
        resources :fotos
      end
      
-     resources :gremien, :except=>[:index] do 
+     resources :gremien do 
        collection do 
          get 'verwalten'
        end

From 47d410027a5e072ab5b8a234133756034e9b975e Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 22:16:17 +0200
Subject: [PATCH 5/9] Alle Gremien tab

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

diff --git a/app/views/fetprofiles/_tabs.html.erb b/app/views/fetprofiles/_tabs.html.erb
index 2359bc7..902e756 100644
--- a/app/views/fetprofiles/_tabs.html.erb
+++ b/app/views/fetprofiles/_tabs.html.erb
@@ -1,7 +1,7 @@
 <ul class="nav nav-tabs">
  <li <%= (request.fullpath == fetprofiles_path(filter: "active")|| request.fullpath == fetprofiles_path) ? 'class="active"'.html_safe : ''%> >
  <%= link_to "Aktive Mitglieder" , fetprofiles_path( filter: "active") %> </li>
- 
+<li><%= link_to "Alle Gremien und Gruppen", gremien_path %></li> 
 <% for g in @gremientabs %>
   <li <%= (!@gremium.nil? && g == @gremium) ? 'class="active"'.html_safe : '' %> title="<%= g.name %>">
     <%= link_to g.name, g %>

From af3e39822ef7095a1c33f396ddd827a4a867bd9f Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 22:19:22 +0200
Subject: [PATCH 6/9] fetprofile fix media

---
 app/views/fetprofiles/index.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index 95f04fc..2da2a16 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -9,15 +9,17 @@
 <% @fetprofiles.each do |fetprofile| %>
 <li>
 <%= link_to fetprofile do %>
+<div class="media">
 <span class="pull-left">
   <%= image_tag fetprofile.picture.portrait.url %>
 </span>
-<div class="">
+<div class="media-body">
   
   <h2><%= fetprofile.name %></h2>
   <p><%= fetprofile.fetmail %></p>
   <p><%= fetprofile.desc %></p>
   
+</div>
 </div>
 <% end %>
 </li>

From f4c52cb2e00749232c3768627d91f73c11b2d5f3 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 22:22:49 +0200
Subject: [PATCH 7/9] gremien-index template

---
 app/views/gremien/index.html.erb | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 app/views/gremien/index.html.erb

diff --git a/app/views/gremien/index.html.erb b/app/views/gremien/index.html.erb
new file mode 100644
index 0000000..5390cb7
--- /dev/null
+++ b/app/views/gremien/index.html.erb
@@ -0,0 +1,13 @@
+<%= render 'fetprofiles/tabs' %>
+<h1>Alle Gremien</h1>
+
+<ul class="unstyled fetprofile_list">
+  <% @gremien.each do |g| %>
+  <li>
+    <%= link_to g do %>
+    <h2><%= g.name %></h2>
+    <p><%= g.desc %></p>
+    <% end %>
+  </li>
+<% end %>
+</ul>

From 1951549486549cca20bed58b5f0cccacc2bc3e97 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Wed, 11 Sep 2013 20:07:33 +0200
Subject: [PATCH 8/9] studium frame

---
 app/assets/stylesheets/studien.css.scss |  6 ++++++
 app/views/studien/_studium.html.erb     | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/studien.css.scss b/app/assets/stylesheets/studien.css.scss
index 3d04378..6d21e9b 100755
--- a/app/assets/stylesheets/studien.css.scss
+++ b/app/assets/stylesheets/studien.css.scss
@@ -16,3 +16,9 @@ border-radius:2px;
 border-color: blue;
 margin: 5px;
 }
+a.studium {
+display:block
+}
+a.studium:hover {
+box-shadow: 1px 1px 2px 2px lightgray;
+}
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
index 26b57c7..3d5fb77 100644
--- a/app/views/studien/_studium.html.erb
+++ b/app/views/studien/_studium.html.erb
@@ -1,6 +1,14 @@
-<div class="studium">
-  <h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_path(studium, :ansicht=>'semesteransicht')%></h2>  <p><b><%= studium.typ%> </b></p>
+  <%= link_to studium_path(studium, :ansicht=>'semesteransicht') ,{:class=>"studium"} do %>
+
+  <h2>
+    <%= studium.name + " " + studium.zahl.to_s %>
+  </h2>
+  <p>
+    <b><%= studium.typ%> </b>
+  </p>
   <p><b><%=I18n.t("studien.desc")%>:</b><br>
-      <%= !(studium.desc.to_s == "") ? studium.desc.html_safe :  I18n.t("keine.beschreibung")%></p>
+      <%= !(studium.desc.to_s == "") ? studium.desc.html_safe :  I18n.t("keine.beschreibung")%>
+  </p>
   
-</div>
+
+<% end %>

From 09c182048c941bd67436a74b14b541cca0eb4ed8 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Wed, 11 Sep 2013 20:08:08 +0200
Subject: [PATCH 9/9] =?UTF-8?q?kommentare=20f=C3=BCr=20gremium=20und=20cal?=
 =?UTF-8?q?entry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/calentry.rb | 14 +++++++++-----
 app/models/gremium.rb  | 17 ++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index 94561f3..1b9f245 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # == Schema Information
 #
 # Table name: calentries
@@ -17,14 +18,13 @@ class Calentry < ActiveRecord::Base
   validates :start, :presence => true
   validates :typ, :presence => true
   before_save :get_public
-  belongs_to :object, polymorphic: true
+  belongs_to :object, polymorphic: true # Objekt zu dem der Calentry gehört (derzeit ein Newsartikel)
   
-  validate do |entry|
+validate do |entry|
 	if entry.ende.nil? 
 		errors.add(:ende, "Es muss ein Endzeitpunkt vorhanden sein")
 	end
-  end
-  
+  end  
   
   resourcify
   def get_public
@@ -38,7 +38,11 @@ class Calentry < ActiveRecord::Base
     start.to_date
   end
   def name
-	summary
+    unless self.object.nil?
+      self.object.name
+    else
+      summary
+    end
   end
   scope :public, -> { where(:public => :true) } 
   scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 8.days.from_now) }
diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index 643286c..b3bc9fa 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -12,16 +12,15 @@
 #
 
 class Gremium < ActiveRecord::Base
-  TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell",4=>"inoffiziell-tempo"}
-  TAPS_TYPEN={1=>true,2=>false,3=>true,4=>false}
-  GESCHLECHT={0=>"saechlich", 1 => "maennlich", 2 => "weiblich"}
-  ART2FALL={0=>"des", 1=>"des",2=>"der"}
+  TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell",4=>"inoffiziell-tempo"} # 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
   attr_accessible :desc, :name, :typ, :geschlecht,:thema_id
-  has_many :memberships
-  belongs_to :thema
-  scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) }
-  
-  def fall2
+  has_many :memberships # Mitgliedschaften bei dem Gremium
+  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 ... " 
+  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