bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-30 13:04:23 +02:00
parent e098c0cd36 8ed5b7287e
commit 723d7be980
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/inputs/checkbox_autocomplete_input.rb
View File

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

8
app/views/neuigkeiten/_neuigkeit_edit.html.erb
View File

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

2
app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
View File

@@ -4,7 +4,7 @@
<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %> <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
<div> <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" %> <%= render partial: "menu" %>
<% end %> <% end %>
</div> </div>