Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/views/themen/_form.html.erb

app/views/home/_search_results.html.erb

@@ -27,12 +27,16 @@
 <h2>Themen</h2>
 <% end %>
 
-<% @themen.each do |thema| %>
 <ul class="unstyled content-list" style="max-width:70em">
+
+<% @themen.each do |thema| %>
+<% if can? :show, thema %>
   <li><%= link_to thema.title,thema %>
 <div class="contentbox">
       <%= render :partial=>"themen/small", :object=>thema %>
 </div>
   </li>
-</ul>
 <% end %>
+
+<% end %>
+</ul>

app/views/home/index.html.erb

@@ -5,7 +5,7 @@
 	<li><%= render n if can?(:show, n) %> </li>
 	<% end %>
       </ul>
-<p>
+<p><i class="ffi1-bar1 ffi1"></i>
 <%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
 </p>
   <div class="alert">

app/views/home/intern.html.erb

@@ -2,9 +2,12 @@
 <div class="container-fluid">
   <div class="row-fluid">
     <div class="span6">
-      <%= link_to "Adressliste", internlist_fetprofiles_path %>
-      <%= link_to "Admin" , admin_home_index_path if current_user.has_role?(:fetadmin) %>
-
+<ul class="linklist">
+<li>
+      <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
+ <li>     <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+</li>
+</ul>
       <ul class="unstyled linkbox-list">
 	<li>  
 	  <% @themengruppen.each do |themengruppe| %>