Merge branch 'master' of http://github.com/mleop/fetsite

.gitignore

@@ -29,5 +29,7 @@ Gemfile.lock
 console
 /server
 /public/uploads/
+/vendor/*
 /bak/*
 *#
+

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>
 	   

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 %> 

app/views/themengruppen/faqs.html.erb

@@ -1,19 +1,24 @@
+<div class="content-wrap content-column">
 	<% @themengruppen.each do |tg| %>
-<a name="themengruppe_<%=tg.id.to_s%>">
+		<div class="contentbox">
-<h2><%= tg.title%></h2></a>
+		<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>
 
-
-
-<ul>
-<% t.fragen.each do |f| %>
-<li><b> <%= f.title %></b><p> <%= f.text %></p></li>
 						<% end %>
 				</ul>
 
 			</li>
 			<% end %>
 		</ul>
+
+		</div>
 	<% end %>
+</div>

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| %>

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>
     
-<table>
-  <tr>
-    <th>Title</th>
-    <th>Text</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
     
-<% @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>
+  </li>
+</ul>
 
 <br/>
+</div>
+<script class="hidden-phone">
 
-<%= link_to 'New Themengruppe', new_themagruppen_path %>
+<!-- make_equal_height();
+-->
+</script>
+
+<%= render :partial=>'layouts/pretty_toolbar' %>
+<!--
+<%= link_to 'New Themengruppe', new_themengruppe_path %>
+-->