From e7a7be8333f967db90615563e948f8f55330b873 Mon Sep 17 00:00:00 2001
From: HausdorffHimself <andreas@X220.(none)>
Date: Mon, 19 Aug 2013 18:51:23 +0200
Subject: [PATCH 1/4] =?UTF-8?q?CHANGE:=20keine=20borders=20f=C3=BCr=20Them?=
 =?UTF-8?q?en?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/themengruppen.css.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/themengruppen.css.scss b/app/assets/stylesheets/themengruppen.css.scss
index 5ea80bc..5aa1f26 100644
--- a/app/assets/stylesheets/themengruppen.css.scss
+++ b/app/assets/stylesheets/themengruppen.css.scss
@@ -4,8 +4,8 @@
 div.themengruppe
 {padding:10px;
 margin:2px;
-border-radius:10px;
+border-radius: 10px;
 min-width:13em;
-border: #91B4FF solid 2px;
+border: #91B4FF solid 0px;
 height: 90%
 }

From a5d694cc7ec5e0bdb4612d77d366cb92bcf990b3 Mon Sep 17 00:00:00 2001
From: HausdorffHimself <andreas@X220.(none)>
Date: Mon, 19 Aug 2013 18:53:23 +0200
Subject: [PATCH 2/4] CHANGE: no link

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

diff --git a/app/views/themen/_thema.html.erb b/app/views/themen/_thema.html.erb
index 50cbe00..ede7bb2 100644
--- a/app/views/themen/_thema.html.erb
+++ b/app/views/themen/_thema.html.erb
@@ -1,2 +1,2 @@
-  <%= link_to thema.title,themengruppe_thema_path(thema.themengruppe,thema)%>
+  <%= thema.title%>
 

From bb42e3b3a00fc53ada38da61cae4add50219856b Mon Sep 17 00:00:00 2001
From: HausdorffHimself <andreas@X220.(none)>
Date: Mon, 19 Aug 2013 18:53:52 +0200
Subject: [PATCH 3/4] =?UTF-8?q?CHANGE:=20keine=20jQuery=20f=C3=BCr=20gleic?=
 =?UTF-8?q?he=20H=C3=B6he=20mehr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/themengruppen/index.html.erb | 28 ++++++++++++++------------
 app/views/themengruppen/show.html.erb  |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb
index 9976ad2..b1ae6d9 100644
--- a/app/views/themengruppen/index.html.erb
+++ b/app/views/themengruppen/index.html.erb
@@ -1,24 +1,26 @@
 <div class="container-fluid">
 
-<% @themengruppen.each_slice(2) do |row| %>
+  <% @themengruppen.each_slice(2) do |row| %>
   <div class="row-fluid"> 
     <% row.each do |themengruppe| %>
-		<div class="span6 equalheight">
-		<div class="themengruppe">
-			<%= render themengruppe %>
-			<p>
-				<%= link_to 'Edit', edit_themengruppe_path(themengruppe) %>
-			</p>
-		</div>
-		</div>
-	<% end %>
+    <div class="span6 equalheight">
+      <div class="themengruppe">
+	<%= render themengruppe %>
+	<p>
+	  <%= link_to 'Edit', edit_themengruppe_path(themengruppe) %>
+	</p>
+      </div>
+    </div>
+    <% end %>
   </div>
-<% end %>
+  <% end %>
 </div>
 <br />
 
-<script>
-make_equal_height();
+<script class="hidden-phone">
+
+<!-- make_equal_height();
+-->
 </script>
 
 <%= link_to 'New Themengruppe', new_themengruppe_path %>
diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb
index 374958f..d4041ca 100644
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -14,7 +14,7 @@
 		</div>
 		<div id="collapse<%=thema.id%>" class="accordion-body collapse">
 		  <div class="accordion-inner">
-			<%= render partial: "themen/small", object: thema %>
+			<%= render :partial => 'themen/small', :object => thema %>
 		  </div>
 		</div>
 	  </div>

From 29388ddcac1ae5c08418c78deea1f6acec539a50 Mon Sep 17 00:00:00 2001
From: HausdorffHimself <andreas@X220.(none)>
Date: Mon, 19 Aug 2013 19:28:53 +0200
Subject: [PATCH 4/4] =?UTF-8?q?CHANGE:=20Beschreibungstext=20wird=20abgesc?=
 =?UTF-8?q?hnitten=20auf=20Themengruppe::WORD=5FCOUNT=20sowie=20locales=20?=
 =?UTF-8?q?f=C3=BCr=20Thema?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/themengruppe.rb                     | 1 +
 app/views/themengruppen/_themengruppe.html.erb | 8 +++++++-
 config/locales/de.yml                          | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb
index 034558f..0966914 100644
--- a/app/models/themengruppe.rb
+++ b/app/models/themengruppe.rb
@@ -1,4 +1,5 @@
 class Themengruppe < ActiveRecord::Base
+  WORD_COUNT = 50
   attr_accessible :text, :title
   has_many :themen, class_name: 'Thema'
   has_many :fragen, through: :themen
diff --git a/app/views/themengruppen/_themengruppe.html.erb b/app/views/themengruppen/_themengruppe.html.erb
index 9fe5849..450e18e 100644
--- a/app/views/themengruppen/_themengruppe.html.erb
+++ b/app/views/themengruppen/_themengruppe.html.erb
@@ -1,8 +1,14 @@
 
 <h3> <%=  link_to themengruppe.title, themengruppe %> </h3>
 <p>
-  <%=themengruppe.text %>
+  <%= 	if themengruppe.text.split.size > Themengruppe::WORD_COUNT
+			themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
+		else
+			themengruppe.text
+		end%>
 </p>
+<br/>
+<b><%= I18n.t("themengruppe.themen") %></b>
 <ul>
 	<% themengruppe.themen.each do |t| %>
 		<li>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2784350..9371d5b 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -122,4 +122,6 @@ de:
       keine: "Keine Fehlermeldungen oder Warnungen"
   support:
     array:
-      two_words_connector: ', '         
+      two_words_connector: ', '  
+  themengruppe:
+    themen: "Themen"