From 8ed5b7287eb28f2c0fce8efff403d6edafe0bf48 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Wed, 26 Aug 2015 09:40:53 +0200 Subject: [PATCH] small fixes --- app/inputs/checkbox_autocomplete_input.rb | 2 +- app/views/neuigkeiten/_neuigkeit_edit.html.erb | 8 +++++--- .../themes/blue2/neuigkeiten/_neuigkeit_view.html.erb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/inputs/checkbox_autocomplete_input.rb b/app/inputs/checkbox_autocomplete_input.rb index c320d72..f90903a 100644 --- a/app/inputs/checkbox_autocomplete_input.rb +++ b/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") diff --git a/app/views/neuigkeiten/_neuigkeit_edit.html.erb b/app/views/neuigkeiten/_neuigkeit_edit.html.erb index 632e127..be71903 100644 --- a/app/views/neuigkeiten/_neuigkeit_edit.html.erb +++ b/app/views/neuigkeiten/_neuigkeit_edit.html.erb @@ -29,15 +29,17 @@ <% end %>
- <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %> +
-


<%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url) %> +


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

- <% end %> +

<%= raw(@neuigkeit.title) %> diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb index 94430d7..f8a855f 100644 --- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb @@ -4,7 +4,7 @@ <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
-<% 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 %>