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

app/inputs/checkbox_autocomplete_input.rb

@@ -1,4 +1,4 @@
-class CheckboxAutocompleteInput < FormtasticBootstrap::Inputs::CheckboxInput
+class CheckboxAutocompleteInput < FormtasticBootstrap::Inputs::CheckBoxesInput
 	def input_html_options
 		super
 		#super.merge(:class => "input-append date")

app/views/neuigkeiten/_neuigkeit_edit.html.erb

@@ -29,15 +29,17 @@
 		</div>    
   <% end %>
   <div class="media">
-    <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %>
+
 			<div class="pull-left" href="#" style="width:200px">
-				<p><br><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url)  %>
+				<p><br>
+    <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url)  %>
+    <% end %>
 	<%= f.input :picture, as: :uploader %>
 					<%= f.hidden_field :picture_cache %>
 
 				</p>
 			</div>
-    <% end %>
+
     <div class="media-body" style="border: dashed black thin">
 			<h1 itemprop="name" class="editable_simple" data-target="#neuigkeit_title">
 				<%=  raw(@neuigkeit.title) %>

app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb

@@ -4,7 +4,7 @@
 	<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
   
 	<div>
-<% cache("menu_neuigkeit"+ can?(:edit,@neuigkeit).to_s + can?(:find_link, @neuigkeit).to_s + can?(:new, Survey::Question).to_s + can?(:publish, @neuigkeit).to_s + can?(:unpublish, @neuigkeit).to_s + @neuigkeit.published?.to_s ) do %>
+<% cache("menu_neuigkeit"+ @neuigkeit.id.to_s + can?(:edit,@neuigkeit).to_s + can?(:find_link, @neuigkeit).to_s + can?(:new, Survey::Question).to_s + can?(:publish, @neuigkeit).to_s + can?(:unpublish, @neuigkeit).to_s + @neuigkeit.published?.to_s ) do %>
 		<%= render partial: "menu" %>		
 <%  end %>
 	</div>