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

app/views/documents/_search_results.html.erb

@@ -1,4 +1,5 @@
 <% unless search_results.nil? %>
+<%= search_results  %>
 <ul>
 	<% search_results.each_hit_with_result  do |hit,result| %>
 		<li> <%= link_to result.parent.title+": " + result.name, document_path(result) %>
@@ -7,7 +8,7 @@
 			<% end 	%>
 			<%  %>
 			<%  hit.highlights(:text).each do |hlgt| %>
-				<%=  "text:" + raw(hlgt.format {|word| "*#{word}*" })%> 
+				<%=  "text:" + raw(hlgt.format {|word| raw("<b>#{word}</b>") })%> 
 			<%  end %>
 			<%  hit.highlights(:meeting).each do |hlgt| %>
 				<%=  "text:" + raw(hlgt.format {|word| "*#{word}*" })%> 

app/views/rubriken/index.html.erb

@@ -39,7 +39,7 @@
 				<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
 					<%= render 'calendars/calentries', :object=>@calentries %>
 				<% end %>      
-				<% if current_user.has_role?(:fetuser) %>
+				<% if !current_user.nil? and current_user.has_role?(:fetuser) %>
 				<%= link_to calendars_url(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid) , calendars_path(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid)%>
 					<% end %>
 			</div>

app/views/rubriken/show.html.erb

@@ -52,7 +52,7 @@
 <%= render 'calendars/calentries', :object=>@calentries %>
 <% end %>
 <% end %>
-<% if current_user.has_role?(:fetuser) %>
+<% if !current_user.nil? and current_user.has_role?(:fetuser) %>
 	<%= link_to calendar_url(@rubrik.calendar,:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid) , calendars_path(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid)%>
 <% end %>