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

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

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

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

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

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